From 8fa7b924d5975f5d69d8571bc31a04dd15acfb5f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 9 Dec 2017 12:08:50 +0100
Subject: [PATCH 001/386] enhance image using awesome icon

---
 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 9683517f377..ba842682221 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6245,7 +6245,7 @@ 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	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  * 	@return	string				HTML img string with flag.
  */
 function picto_from_langcode($codelang, $moreatt = '')
@@ -6258,7 +6258,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 
 	if ($codelang == 'auto')
 	{
-		return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png', $moreatt);
+		return '<span class="fa fa-globe"></span>';
 	}
 
 	$langtocountryflag = array(

From a33411b8bd5842f1f201aaa03475d596b9c5f233 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Wed, 20 Dec 2017 09:06:11 +0100
Subject: [PATCH 002/386] Create 7.0.0-8.0.0.sql

---
 .../install/mysql/migration/7.0.0-8.0.0.sql   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/7.0.0-8.0.0.sql

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
new file mode 100644
index 00000000000..e9a72ab9360
--- /dev/null
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -0,0 +1,26 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 7.0.0 or higher.
+--
+-- 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 drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- 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 make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE 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.
+
+-- For 8.0
+ALTER TABLE llx_societe ADD COLUMN fk_entrepot int DEFAULT 0;

From e308124ed6d473f6b0694586c3a29b3eb4831320 Mon Sep 17 00:00:00 2001
From: AlainRnet <alainrihs@sunrise.ch>
Date: Wed, 20 Dec 2017 17:41:26 +0100
Subject: [PATCH 003/386] Show total number of records by category

There is so much information missing in these categories and it is also not possible to sort or display other information than currently displayed.
Here is a small hack to display the total number of record(s) in the list header of each category.
---
 htdocs/categories/viewcat.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index daa5ade05b5..255dc4888aa 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -353,7 +353,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ProductsAndServices")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ProductsAndServices")." (".count($prods).")</td></tr>\n";
 
 		if (count($prods) > 0)
 		{
@@ -402,7 +402,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	{
 		print "<br>";
 		print '<table class="noborder" width="100%">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Suppliers")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Suppliers")." (".count($socs).")</td></tr>\n";
 
 		if (count($socs) > 0)
 		{
@@ -451,7 +451,7 @@ if($type == Categorie::TYPE_CUSTOMER)
 	{
 		print "<br>";
 		print '<table class="noborder" width="100%">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Customers")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Customers")." (".count($socs).")</td></tr>\n";
 
 		if (count($socs) > 0)
 		{
@@ -507,7 +507,7 @@ if ($type == Categorie::TYPE_MEMBER)
 	{
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Member")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Member")." (".count($prods).")</td></tr>\n";
 
 		if (count($prods) > 0)
 		{
@@ -558,7 +558,7 @@ if ($type == Categorie::TYPE_CONTACT)
 	{
 		print "<br>";
 		print '<table class="noborder" width="100%">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Contact")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Contact")." (".count($contacts).")</td></tr>\n";
 
 		if (count($contacts) > 0)
 		{
@@ -613,7 +613,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
     {
         print "<br>";
         print "<table class='noborder' width='100%'>\n";
-        print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Account")."</td></tr>\n";
+        print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Account")." (".count($accounts).")</td></tr>\n";
 
         if (count($accounts) > 0)
         {
@@ -666,7 +666,7 @@ if ($type == Categorie::TYPE_PROJECT)
 	{
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Project")."</td></tr>\n";
+		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Project")." (".count($projects).")</td></tr>\n";
 
 		if (count($projects) > 0)
 		{

From a9c7dc48abfaa23a0411535576472daf4cbb1a23 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 24 Dec 2017 17:31:31 +0100
Subject: [PATCH 004/386] New option to force e-mail recipient, helpful for
 test purposes

---
 htdocs/admin/mails.php                | 11 +++++++++++
 htdocs/core/class/CMailFile.class.php |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index d482322a054..677e6099a8d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -70,6 +70,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 if ($action == 'update' && empty($_POST["cancel"]))
 {
 	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS",     GETPOST("MAIN_DISABLE_ALL_MAILS"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO",     GETPOST("MAIN_MAIL_FORCE_SENDTO"),'chaine',0,'',$conf->entity);
 	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE",         GETPOST("MAIN_MAIL_SENDMODE"),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT",        GETPOST("MAIN_MAIL_SMTP_PORT"),'chaine',0,'',$conf->entity);
@@ -238,6 +239,11 @@ if ($action == 'edit')
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
+	
+	// Force e-mail recipient
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>';
+	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO)?$conf->global->MAIN_MAIL_FORCE_SENDTO:'') . '" />';
+	print '</td></tr>';
 
 	// Separator
 
@@ -477,6 +483,11 @@ else
 	// Disable
 
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</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) && ! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
+	print '</td></tr>';
 
 	// Separator
 
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 86a6cb008d3..c79b7ac0cea 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -495,7 +495,7 @@ class CMailFile
 
 		$res=false;
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
+		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
@@ -557,6 +557,12 @@ class CMailFile
 				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
 				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
+			
+			if(!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) {
+				$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
+				$this->addr_cc = '';
+				$this->addr_bcc = '';
+			}
 
 			// Action according to choosed sending method
 			if ($this->sendmode == 'mail')

From d770f732193e97811ec9f94fd3d1e8b6a07ed009 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 26 Dec 2017 16:21:15 +0100
Subject: [PATCH 005/386] Add option translation

---
 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 a4ece445581..e2c39c45a3d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -272,6 +272,7 @@ MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <
 MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required

From 33f6ba19da673faf0bec863cfebcdee5d4a608f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 28 Dec 2017 16:20:08 +0100
Subject: [PATCH 006/386] display weight volume in propal

---
 htdocs/comm/propal/card.php | 16 ++++++++++++++++
 htdocs/commande/card.php    |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index edd2607a11c..78c38c1cc32 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2100,6 +2100,22 @@ 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>';
+    }
+
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
 	{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index bb6d2d78571..32bbdb9d0d8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2268,12 +2268,15 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
-		if ($totalWeight || $totalVolume)
+		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');

From 12e414509ca3bf9c1a956bc11a558a2adee9c035 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Tue, 2 Jan 2018 11:24:28 +0100
Subject: [PATCH 007/386] Add a hook in dol_print_phone

To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...).
Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc
Hope this one will be accepted and usefull for the community.

And happy new year :)
---
 htdocs/core/lib/functions.lib.php | 44 +++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9e7bb7f7ce8..77882d590d6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2172,7 +2172,7 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
  */
 function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$separ="&nbsp;",$withpicto='',$titlealt='',$adddivfloat=0)
 {
-	global $conf,$user,$langs,$mysoc;
+	global $conf, $user, $langs, $mysoc, $hookmanager;
 
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/","",trim($phone));
@@ -2262,23 +2262,33 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		$titlealt=($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone"));
 	}
 	$rep='';
-	$picto = '';
-	if($withpicto){
-		if($withpicto=='fax'){
-			$picto = 'phoning_fax';
-		}elseif($withpicto=='phone'){
-			$picto = 'phoning';
-		}elseif($withpicto=='mobile'){
-			$picto = 'phoning_mobile';
-		}else{
-			$picto = '';
+	
+	if ($hookmanager) {
+            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid);
+            $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
+            $rep.=$hookmanager->resPrint;
+        }
+	 if (empty($reshook))
+        {
+		$picto = '';
+		if($withpicto){
+			if($withpicto=='fax'){
+				$picto = 'phoning_fax';
+			}elseif($withpicto=='phone'){
+				$picto = 'phoning';
+			}elseif($withpicto=='mobile'){
+				$picto = 'phoning_mobile';
+			}else{
+				$picto = '';
+			}
 		}
-	}
-	if ($adddivfloat) $rep.='<div class="nospan float" style="margin-right: 10px">';
-	else $rep.='<span style="margin-right: 10px;">';
-	$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
-	if ($adddivfloat) $rep.='</div>';
-	else $rep.='</span>';
+		if ($adddivfloat) $rep.='<div class="nospan float" style="margin-right: 10px">';
+		else $rep.='<span style="margin-right: 10px;">';
+		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
+		if ($adddivfloat) $rep.='</div>';
+		else $rep.='</span>';
+	 }
+	
 	return $rep;
 }
 

From ab896dc49d50448c6bcd68d0ac76023340fd493e Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Tue, 2 Jan 2018 11:39:00 +0100
Subject: [PATCH 008/386] Update functions.lib.php

---
 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 77882d590d6..06574be96a5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2268,8 +2268,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
             $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
             $rep.=$hookmanager->resPrint;
         }
-	 if (empty($reshook))
-        {
+	
 		$picto = '';
 		if($withpicto){
 			if($withpicto=='fax'){
@@ -2287,7 +2286,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
 		if ($adddivfloat) $rep.='</div>';
 		else $rep.='</span>';
-	 }
+	 
 	
 	return $rep;
 }

From e794a3b321d764fa007ea56532a3412730707dfb Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Tue, 2 Jan 2018 11:44:54 +0100
Subject: [PATCH 009/386] Update functions.lib.php

add more parameters and add if empty
---
 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 06574be96a5..0fa71c97c49 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2264,11 +2264,12 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	$rep='';
 	
 	if ($hookmanager) {
-            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid);
+            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $picto);
             $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
             $rep.=$hookmanager->resPrint;
         }
-	
+	 if (empty($reshook))
+        {
 		$picto = '';
 		if($withpicto){
 			if($withpicto=='fax'){
@@ -2286,7 +2287,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
 		if ($adddivfloat) $rep.='</div>';
 		else $rep.='</span>';
-	 
+	  }
 	
 	return $rep;
 }

From 3438cfb1e7a63231e2d9a025f82ead63d0d619fe Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Tue, 2 Jan 2018 11:48:41 +0100
Subject: [PATCH 010/386] Update functions.lib.php

syntax error $withpicto
---
 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 0fa71c97c49..f69bf3979cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2264,7 +2264,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	$rep='';
 	
 	if ($hookmanager) {
-            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $picto);
+            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $withpicto);
             $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
             $rep.=$hookmanager->resPrint;
         }

From 6ba5ca36c4b7a7a666a997effd2cd6001ac66a8e Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Fri, 5 Jan 2018 08:59:31 +0100
Subject: [PATCH 011/386] Update llx_societe.sql

Goes with https://github.com/Dolibarr/dolibarr/pull/7975
---
 htdocs/install/mysql/tables/llx_societe.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c23ca3a183c..fe20f426094 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -104,5 +104,6 @@ create table llx_societe
   webservices_key          varchar(128),                            	-- supplier webservice key
   
   fk_multicurrency			integer,
-  multicurrency_code		varchar(255)
+  multicurrency_code		varchar(255),
+  fk_entrepot             int             DEFAULT 0                 -- Id de l'entrepôt par défaut (Warehouse ID by default)
 )ENGINE=innodb;

From 30c6891b957bd33579ced61d98033508c2bd8970 Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Wed, 10 Jan 2018 10:24:42 +0100
Subject: [PATCH 012/386] NEW : Add product categories filter on product margin

---
 htdocs/langs/fr_FR/categories.lang |  1 +
 htdocs/margin/productMargins.php   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 10ab0fd65e4..99d1375b28c 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une cat
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
+ChooseCategory=Choisissez les catégories
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 9d52b25de36..ef99e593b82 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -37,6 +37,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+$TSelectedCats=GETPOST('categories', 'array');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
@@ -121,6 +122,16 @@ else {
 
 }
 
+// Categories
+$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 '</td>';
+print '</tr>';
+
 // Start date
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
@@ -177,12 +188,18 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
+if (! empty($TSelectedCats)) {
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+}
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= ' AND f.entity IN ('.getEntity('facture').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
 if ($id > 0)
 	$sql.= " AND d.fk_product =".$id;
+if (! empty($TSelectedCats)) {
+	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+}
 if (!empty($startdate))
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))

From 2c473d35cc7468b15be0082796dc135c04e2df3d Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Wed, 10 Jan 2018 12:11:02 +0100
Subject: [PATCH 013/386] NEW : Add product and product categories filters on
 customer margins

---
 htdocs/margin/customerMargins.php | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index c83ca406347..b216db9d430 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -35,6 +35,9 @@ $langs->load("margins");
 
 // Security check
 $socid = GETPOST('socid','int');
+$TSelectedProducts = GETPOST('products', 'array');
+$TSelectedCats = GETPOST('categories', 'array');
+
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 $result = restrictedArea($user,'margins');
@@ -132,6 +135,29 @@ if (! $sortfield)
 	}
 }
 
+// Products
+$TRes = $form->select_produits_list('','','',20,0,'',1,2,1,0,'', 1);
+
+$TProducts = array();
+foreach($TRes as $prod) {
+	$TProducts[$prod['key']] = $prod['label'];
+}
+
+print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+print '<td class="maxwidthonsmartpone" colspan="4">';
+print $form->multiselectarray('products', $TProducts, $TSelectedProducts, 0, 0, 'minwidth500');
+print '</td></tr>';
+
+// Categories
+$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 '</td>';
+print '</tr>';
+
 // Start date
 print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
@@ -186,6 +212,10 @@ $sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
+if(! empty($TSelectedCats)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
+}
+
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE f.fk_soc = s.rowid";
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
@@ -194,6 +224,12 @@ $sql.= " AND f.fk_statut > 0";
 $sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
+if(! empty($TSelectedProducts)) {
+	$sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
+}
+if(! empty($TSelectedCats)) {
+	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+}
 if (!empty($startdate))
 $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))

From c45e5c91b118dbd985c42c57d91ff898671149ea Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 14 Jan 2018 17:13:42 +0100
Subject: [PATCH 014/386] New hidden option MAIN_DISABLE_FREE_LINES

---
 htdocs/core/tpl/objectline_create.tpl.php | 80 +++++++++++++----------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 2d6178ed79b..2ea5b6899d7 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -142,49 +142,54 @@ else {
 	<td class="nobottom linecoldescription minwidth500imp">
 
 	<?php
-
-	$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
-	if ($object->element == 'contrat')
+	
+	$freelines = false;
+	if(empty($conf->global->MAIN_DISABLE_FREE_LINES))
 	{
-		if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-		else $forceall=0;
-	}
-
-	// Free line
-	echo '<span class="prod_entry_mode_free">';
-	// Show radio free line
-	if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
-	{
-		echo '<label for="prod_entry_mode_free">';
-		echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
-		//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
-		echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : '');
-		echo '> ';
-		// Show type selector
-		echo $langs->trans("FreeLineOfType");
-		echo '</label>';
-		echo ' ';
-	}
-	else
-	{
-		echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
-		// Show type selector
-		if ($forceall >= 0)
+		$freelines = true;
+		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
+		if ($object->element == 'contrat')
 		{
-		    if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
-			else echo $langs->trans("FreeLineOfType");
+			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+			else $forceall=0;
+		}
+	
+		// Free line
+		echo '<span class="prod_entry_mode_free">';
+		// Show radio free line
+		if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+		{
+			echo '<label for="prod_entry_mode_free">';
+			echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
+			//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
+			echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : '');
+			echo '> ';
+			// Show type selector
+			echo $langs->trans("FreeLineOfType");
+			echo '</label>';
 			echo ' ';
 		}
+		else
+		{
+			echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
+			// Show type selector
+			if ($forceall >= 0)
+			{
+			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
+				else echo $langs->trans("FreeLineOfType");
+				echo ' ';
+			}
+		}
+	
+		echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
+	
+		echo '</span>';
 	}
 
-	echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
-
-	echo '</span>';
-
 	// Predefined product/service
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		if ($forceall >= 0) echo '<br>';
+		if ($forceall >= 0 && $freelines) echo '<br>';
 		echo '<span class="prod_entry_mode_predef">';
 		echo '<label for="prod_entry_mode_predef">';
 		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
@@ -592,6 +597,13 @@ jQuery(document).ready(function() {
 		setforpredef();
 		jQuery('#trlinefordates').show();
 	});
+	
+	<?php
+	if(!$freelines) { ?>
+		$("#prod_entry_mode_predef").click();
+	<?php
+	}
+	?>
 
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */
 	$("#idprod, #idprodfournprice").change(function()

From 8088d92bbbe616b785ac1d26d03b8da417c6bd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Labate?= <aurelien@labate.me>
Date: Mon, 15 Jan 2018 00:33:25 +0100
Subject: [PATCH 015/386] NEW Add password_hash as hash algorithm

---
 htdocs/core/lib/security.lib.php         | 30 +++++++++++++++++++++++-
 htdocs/core/login/functions_dolibarr.php |  4 +---
 htdocs/install/step5.php                 |  2 +-
 htdocs/user/passwordforgotten.php        |  3 +--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 71fcdf33bb3..88e6ebb7af5 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -81,6 +81,9 @@ function dol_hash($chain, $type='0')
 {
 	global $conf;
 
+	// No need to add salt for password_hash
+	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash') return password_hash($chain, PASSWORD_DEFAULT);
+
 	// Salt value
 	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
 
@@ -96,6 +99,32 @@ function dol_hash($chain, $type='0')
 	return md5($chain);
 }
 
+/**
+ * 	Compute a hash and compare it to the given one
+ *  For backward compatibility reasons, if the hash is not in the password_hash format, we will try to match against md5 and sha1md5
+ *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function.
+ *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt.
+ *
+ * 	@param 		string		$chain		String to hash
+ * 	@param 		string		$hash		hash to compare
+ * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@return		bool					True if the computed hash is the same as the given one
+ */
+function dol_verifyHash($chain, $hash, $type='0')
+{
+	global $conf;
+
+	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash') {
+		if ($hash[0] == '$') return password_verify($chain, $hash);
+		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+
+		return false;
+	}
+
+	return dol_hash($chain, $type) == $hash;
+}
+
 
 /**
  *	Check permissions of a user to show a page and an object. Check read permission.
@@ -606,4 +635,3 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess
     if ($printfooter && function_exists("llxFooter")) llxFooter();
     exit(0);
 }
-
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index d8cf78747b8..25d5f2dc30c 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -84,7 +84,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
-					if (dol_hash($passtyped) == $passcrypted)
+					if (dol_verifyHash($passtyped, $passcrypted))
 					{
 						$passok=true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
@@ -152,5 +152,3 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 
 	return $login;
 }
-
-
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 8a39faf526a..d271e552dd0 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -181,7 +181,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
     			    // Define default setup for password encryption
     			    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
     			    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
-    			    dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                               // All entities
+    			    dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                         // All entities
     			}
 		    }
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 4412eb621b3..9bc2b57f202 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -78,7 +78,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     }
     else
     {
-        if (dol_hash($edituser->pass_temp) == $passwordhash)
+        if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
             $newpassword=$edituser->setPassword($user,$edituser->pass_temp,0);
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
@@ -238,4 +238,3 @@ $reshook = $hookmanager->executeHooks('getPasswordForgottenPageExtraOptions',$pa
 $moreloginextracontent = $hookmanager->resPrint;
 
 include $template_dir.'passwordforgotten.tpl.php';	// To use native PHP
-

From b86a5d56233d49a2af8d40435d8a0994bdadc790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Labate?= <aurelien@labate.me>
Date: Mon, 15 Jan 2018 11:02:08 +0100
Subject: [PATCH 016/386] FIX add password_hash compatibility test for PHP <
 5.5

---
 htdocs/core/lib/security.lib.php | 5 +++--
 htdocs/install/step5.php         | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 88e6ebb7af5..ed757a16765 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -82,7 +82,8 @@ function dol_hash($chain, $type='0')
 	global $conf;
 
 	// No need to add salt for password_hash
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash') return password_hash($chain, PASSWORD_DEFAULT);
+	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+        return password_hash($chain, PASSWORD_DEFAULT);
 
 	// Salt value
 	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
@@ -114,7 +115,7 @@ function dol_verifyHash($chain, $hash, $type='0')
 {
 	global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash') {
+	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
 		if ($hash[0] == '$') return password_verify($chain, $hash);
 		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
 		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index d271e552dd0..91c517f9644 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -181,7 +181,10 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
     			    // Define default setup for password encryption
     			    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
     			    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
-    			    dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                         // All entities
+                    if (function_exists('password_hash'))
+                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                     // All entities
+                    else
+                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                           // All entities
     			}
 		    }
 

From cd0dc2dbde715c6c8c00299eb851f77ed2724c9b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Jan 2018 16:22:32 +0100
Subject: [PATCH 017/386] Add linked file tab to vat

---
 htdocs/compta/tva/class/tva.class.php |  33 +++++
 htdocs/compta/tva/document.php        | 177 ++++++++++++++++++++++++++
 htdocs/core/lib/vat.lib.php           |  12 ++
 3 files changed, 222 insertions(+)
 create mode 100644 htdocs/compta/tva/document.php

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 5d170faf67e..b0286d456cf 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2018      Philippe Grand       <philippe.grand@atoo-net.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
@@ -669,6 +670,38 @@ class Tva extends CommonObject
 		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
 		return $result;
 	}
+	
+	/**
+     * 	Return amount of payments already done
+     *
+     *	@return		int		Amount of payment already done, <0 if KO
+     */
+    function getSommePaiement()
+    {
+        $table='paiementcharge';
+        $field='fk_charge';
+
+        $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;
+
+            $obj = $this->db->fetch_object($resql);
+            if ($obj) $amount=$obj->amount?$obj->amount:0;
+
+            $this->db->free($resql);
+            return $amount;
+        }
+        else
+        {
+            return -1;
+        }
+    }
 
 	/**
 	 *	Informations of vat payment object
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
new file mode 100644
index 00000000000..2fb7ba272c8
--- /dev/null
+++ b/htdocs/compta/tva/document.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2011      Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2018      Philippe Grand        <philippe.grand@atoo-net.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/compta/tva/document.php
+ *       \ingroup    tax
+ *       \brief      Page with attached files on social contributions
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+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/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';
+}
+
+$langs->load("other");
+$langs->load("companies");
+$langs->load("compta");
+$langs->load("bills");
+
+$id = GETPOST('id','int');
+$action = GETPOST('action','aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', $id, 'vat','charges');
+
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) {
+    $page = 0;
+}
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+
+$object = new Tva($db);
+if ($id > 0) $object->fetch($id);
+
+$upload_dir = $conf->tax->dir_output.'/'.dol_sanitizeFileName($object->ref);
+$modulepart='tax';
+
+
+/*
+ * Actions
+ */
+
+include_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');
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+
+$title = $langs->trans("VATPayment") . ' - ' . $langs->trans("Documents");
+$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
+llxHeader("",$title,$help_url);
+
+if ($object->id)
+{
+	$alreadypayed=$object->getSommePaiement();
+
+    $head=vat_prepare_head($object);
+
+    dol_fiche_head($head, 'documents',  $langs->trans("VATPayment"), -1, 'bill');
+
+	$morehtmlref='<div class="refidno">';
+	// Label of social contribution
+	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+    // 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.='';
+        }
+	}
+	$morehtmlref.='</div>';
+
+	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/tva/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+
+	$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+    // Construit liste des fichiers
+    $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" 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">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+
+    print '<div class="clearboth"></div>';
+
+    dol_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';
+}
+else
+{
+    print $langs->trans("ErrorUnknown");
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index 9355bb1056e..1cb564da4ac 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016	Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2018   Philippe Grand      <philippe.grand@atoo-net.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
@@ -45,6 +46,17 @@ function vat_prepare_head($object)
     // $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';
+	$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);
+	$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">'.($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");

From ce29331c05b959ede8810e6abcdf5bc10a2627ae Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Thu, 18 Jan 2018 12:34:22 +0100
Subject: [PATCH 018/386] NEW Filter export model by user

---
 htdocs/admin/export.php                    | 103 +++++++++++++++++++++
 htdocs/core/class/html.formother.class.php |   4 +-
 htdocs/core/modules/modExport.class.php    |   2 +-
 htdocs/exports/class/export.class.php      |   2 +
 htdocs/exports/export.php                  |   4 +-
 htdocs/langs/fr_FR/exports.lang            |   4 +
 6 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/admin/export.php

diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
new file mode 100644
index 00000000000..58e8a1f6621
--- /dev/null
+++ b/htdocs/admin/export.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2003-2008	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-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011-2015	Philippe Grand			<philippe.grand@atoo-net.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/admin/expedition.php
+ *	\ingroup    expedition
+ *	\brief      Page d'administration/configuration du module Expedition
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+
+$langs->load("admin");
+$langs->load("exports");
+
+$langs->load('other');
+
+if (! $user->admin)
+	accessforbidden();
+
+$action=GETPOST('action','alpha');
+$value=GETPOST('value','alpha');
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+
+/*
+ * View
+ */
+
+$page_name = "ExportSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+    . $langs->trans("BackToModuleList") . '</a>';
+print_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+
+dol_fiche_head(
+    $head,
+    'settings',
+    $langs->trans("ExportsArea"),
+    0,
+    "clialphadiab@clialphadiab"
+);
+
+// Setup page goes here
+$form=new Form($db);
+$var=false;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("ExportModel").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100"></td>'."\n";
+
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("set_EXPORTS_SHARE_MODELS").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_EXPORTS_SHARE_MODELS">';
+echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
+print '</form>';
+print '</td></tr>';
+
+
+print '</table>';
+
+llxFooter();
+
+$db->close();
\ No newline at end of file
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 492565cebc7..af9bd644caf 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -61,13 +61,15 @@ class FormOther
      *    @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          Utilisateur créant le modèle
      *    @return	void
      */
-    function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0)
+    function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0, $fk_user=null)
     {
         $sql = "SELECT rowid, label";
         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
         $sql.= " WHERE type = '".$type."'";
+		if(!empty($fk_user))$sql.=" AND fk_user=".$fk_user;
         $sql.= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 70efc2c165f..4f754711ea1 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -58,7 +58,7 @@ class modExport extends DolibarrModules
 		$this->dirs = array("/export/temp");
 
 		// Config pages
-		$this->config_page_url = array();
+		$this->config_page_url = array("export.php");
 
 		// Dependencies
 		$this->depends = array();
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index b1b9b42adc5..8a662c83dcf 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -697,11 +697,13 @@ class Export
 		$sql.= 'label,';
 		$sql.= 'type,';
 		$sql.= 'field,';
+		$sql.= 'fk_user,';
 		$sql.= 'filter';
 		$sql.= ') VALUES (';
 		$sql.= "'".$this->db->escape($this->model_name)."',";
 		$sql.= "'".$this->db->escape($this->datatoexport)."',";
 		$sql.= "'".$this->db->escape($this->hexa)."',";
+		$sql.= "'".$user->id."',";
 		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
 		$sql.= ")";
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index a21dcdce7a6..92a63afcd0e 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -551,7 +551,8 @@ if ($step == 2 && $datatoexport)
     print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
-    $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    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 '</td></tr></table>';
@@ -1082,6 +1083,7 @@ if ($step == 4 && $datatoexport)
     	$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql.= " WHERE type = '".$datatoexport."'";
+		if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
 		$sql.= " ORDER BY rowid";
 		$resql = $db->query($sql);
 		if ($resql)
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 6cd067822a2..48df77c7641 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -131,3 +131,7 @@ 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
+## setup page
+ExportSetup=Configuration du module Export
+ExportModel = Modèle d'export
+set_EXPORTS_SHARE_MODELS = Partager tous les profils d'export
\ No newline at end of file

From c2ee92d4f193e9b48a80782f0c29c7bede115de7 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Thu, 18 Jan 2018 13:59:05 +0100
Subject: [PATCH 019/386] fix trans

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

diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index 58e8a1f6621..51de27998da 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -69,7 +69,7 @@ dol_fiche_head(
     'settings',
     $langs->trans("ExportsArea"),
     0,
-    "clialphadiab@clialphadiab"
+    "exports"
 );
 
 // Setup page goes here

From 6f248a6590784489904f49f2e44c4975ef210dec Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 20 Jan 2018 16:40:56 +0100
Subject: [PATCH 020/386] New allow to define order min amount

---
 htdocs/comm/card.php                          | 19 ++++++++++++
 htdocs/fourn/card.php                         | 19 ++++++++++++
 .../install/mysql/migration/7.0.0-8.0.0.sql   | 29 +++++++++++++++++++
 htdocs/install/mysql/tables/llx_societe.sql   |  2 ++
 htdocs/societe/class/societe.class.php        | 10 +++++++
 5 files changed, 79 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/7.0.0-8.0.0.sql

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 8fb590d61b4..ee05d0a2456 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -176,6 +176,15 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
+	
+	// update order min amount
+	if ($action == 'setorder_min_amount')
+	{
+		$object->fetch($id);
+		$object->order_min_amount=GETPOST('order_min_amount');
+		$result=$object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
 
 	if ($action == 'update_extras') {
         $object->fetch($id);
@@ -401,9 +410,19 @@ if ($id > 0)
 	    print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 	    //if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
 
+	    print '</td>';
+	    print '</tr>';
+		
+		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>';
 	}
+	
 
 	// Multiprice level
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6f473f8deb3..9856b4f95b2 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -101,6 +101,15 @@ if (empty($reshook))
 		$result=$object->setPaymentMethods(GETPOST('mode_reglement_supplier_id','int'));
 		if ($result < 0) dol_print_error($db,$object->error);
 	}
+	
+	// update supplier order min amount
+	if ($action == 'setsupplier_order_min_amount')
+	{
+		$object->fetch($id);
+		$object->supplier_order_min_amount=GETPOST('supplier_order_min_amount');
+		$result=$object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 
@@ -230,6 +239,16 @@ if ($object->id > 0)
 	}
 	print "</td>";
 	print '</tr>';
+	
+	print '<tr class="nowrap">';
+	print '<td>';
+	print $form->editfieldkey("OrderMinAmount",'supplier_order_min_amount',$object->supplier_order_min_amount,$object,$user->rights->societe->creer);
+	print '</td><td>';
+	$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+	print $form->editfieldval("OrderMinAmount",'supplier_order_min_amount',$object->supplier_order_min_amount,$object,$user->rights->societe->creer,$limit_field_type,($object->supplier_order_min_amount != '' ? price($object->supplier_order_min_amount) : ''));
+	
+	print '</td>';
+	print '</tr>';
 
 	// Categories
 	if (! empty($conf->categorie->enabled))
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
new file mode 100644
index 00000000000..dd549e684f2
--- /dev/null
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -0,0 +1,29 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 8.0.0 or higher.
+--
+-- 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 drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- 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 make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE 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.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+
+ALTER TABLE llx_societe ADD COLUMN order_min_amount double(24,8) DEFAULT NULL AFTER outstanding_limit;
+ALTER TABLE llx_societe ADD COLUMN supplier_order_min_amount double(24,8) DEFAULT NULL AFTER order_min_amount;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c23ca3a183c..0556f77b951 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -96,6 +96,8 @@ create table llx_societe
   fk_barcode_type          integer NULL   DEFAULT 0,                    -- barcode type
   price_level              integer NULL,                        		-- level of price for multiprices
   outstanding_limit	       double(24,8)   DEFAULT NULL,					-- allowed outstanding limit
+  order_min_amount	       double(24,8)   DEFAULT NULL,					-- min amount for orders
+  supplier_order_min_amount	       double(24,8)   DEFAULT NULL,			-- min amount for supplier orders
   default_lang             varchar(6),									-- default language
   logo                     varchar(255)   DEFAULT NULL,
   canvas				   varchar(32)    DEFAULT NULL,	                -- type of canvas if used (null by default)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index cd4b66a23a1..dc91e7f668c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -334,6 +334,12 @@ class Societe extends CommonObject
 	 */
 	var $price_level;
 	var $outstanding_limit;
+	
+	/**
+	 * Min order amounts
+	 */
+	var $order_min_amount;
+	var $supplier_order_min_amount;
 
 	/**
 	 * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
@@ -785,6 +791,8 @@ class Societe extends CommonObject
 		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
 		$this->prefix_comm	= trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
+		$this->order_min_amount = price2num($this->order_min_amount);
+		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
@@ -955,6 +963,8 @@ class Societe extends CommonObject
 			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
 			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
 			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
+			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
+			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
 			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");

From 9899a026302a211837f36fbe2f09cbe92a1374f9 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 20 Jan 2018 20:11:30 +0100
Subject: [PATCH 021/386] Display alert if order total is under order min
 amount

---
 htdocs/commande/card.php       | 6 +++++-
 htdocs/fourn/commande/card.php | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2d4d138f61a..1c236eda1dd 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2388,8 +2388,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 
 		// Total HT
+		$alert = '';
+		if($object->total_ht < $object->thirdparty->order_min_amount) {
+			$alert = ' ' . img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->order_min_amount));
+		}
 		print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td>';
+		print '<td>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . $alert . '</td>';
 
 		// Total VAT
 		print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 617039f25da..81ea1a0f951 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2052,8 +2052,12 @@ elseif (! empty($object->id))
 	}
 
 	// Total
+	$alert = '';
+	if($object->total_ht < $object->thirdparty->supplier_order_min_amount) {
+		$alert = ' ' . img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->supplier_order_min_amount));
+	}
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
-	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
+	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).$alert.'</td>';
 	print '</tr>';
 
 	// Total VAT

From 53e6da8c7c32ad21b7e816a54034cb763c4e3bdf Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 20 Jan 2018 21:57:36 +0100
Subject: [PATCH 022/386] Missing fetch and translation

---
 htdocs/langs/en_US/companies.lang      | 1 +
 htdocs/societe/class/societe.class.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7cff22df092..04528266b64 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -405,6 +405,7 @@ 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 numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index dc91e7f668c..675dd2a3123 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1142,6 +1142,7 @@ class Societe extends CommonObject
 		$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';
 		$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';
 		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
 		$sql .= ', fj.libelle as forme_juridique';
 		$sql .= ', e.libelle as effectif';
@@ -1289,6 +1290,8 @@ class Societe extends CommonObject
 				$this->webservices_key = $obj->webservices_key;
 
 				$this->outstanding_limit		= $obj->outstanding_limit;
+				$this->order_min_amount			= $obj->order_min_amount;
+				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
 
 				// multiprix
 				$this->price_level = $obj->price_level;

From 496ac644eb1cfc9977144b7bee49fed0e4924e83 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Thu, 25 Jan 2018 16:10:04 +0000
Subject: [PATCH 023/386] Updated label and added new translation for label

---
 htdocs/contact/card.php           | 20 ++++++++++++++++++--
 htdocs/langs/en_US/companies.lang |  1 +
 htdocs/langs/pt_PT/companies.lang |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bc0031b5992..87189528d5a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -607,7 +607,15 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2))
+                {
+                    print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+                }
+                else
+                {
+                    print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+                }
+
                 if ($object->country_id)
                 {
                     print $formcompany->select_state(GETPOST("state_id",'alpha')?GETPOST("state_id",'alpha'):$object->state_id,$object->country_code,'state_id');
@@ -852,7 +860,15 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2))
+                {
+                    print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+                }
+                else
+                {
+                    print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+                }
+
                 print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id,'state_id');
                 print '</td></tr>';
             }
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7cff22df092..c5bc84acaf8 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -56,6 +56,7 @@ Address=Address
 State=State/Province
 StateShort=State
 Region=Region
+Region-State=Region - State
 Country=Country
 CountryCode=Country code
 CountryId=Country id
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 4875dc8e3de..8f797802925 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -56,6 +56,7 @@ Address=Direcção
 State=Distrito
 StateShort=Estado
 Region=Região
+Region-State=Distrito - Concelho
 Country=País
 CountryCode=Código país
 CountryId=ID país

From a13866f091bfa94fd8eabbcb0a19603fa857df7c Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Thu, 25 Jan 2018 16:14:39 +0000
Subject: [PATCH 024/386] Changed MAIN_SHOW_REGION_IN_STATE to
 MAIN_SHOW_REGION_IN_STATE_SELECT for clarity

---
 htdocs/contact/card.php                      | 4 ++--
 htdocs/core/class/html.formcompany.class.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 87189528d5a..9c35714dcd5 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -607,7 +607,7 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2))
+                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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
                 }
@@ -860,7 +860,7 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2))
+                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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                 }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index c434202ba2e..d3990acc9c8 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -266,10 +266,10 @@ class FormCompany
 							$out.= '<option value="'.$obj->rowid.'">';
 						}
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 2) {
+						if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2) {
 							$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 						}
-						else if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1) {
+						else if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 							$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 						}
 						else {

From 9e0a548eff89bd74fa41bf0127a4b2c6ad75091d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 25 Jan 2018 17:42:25 +0100
Subject: [PATCH 025/386] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d71277a77ee..06b34ccb8b3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2016      Bahfir abbes         <dolipar@dolipar.org>
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2018      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
@@ -4503,11 +4504,11 @@ abstract class CommonObject
 	 *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
 	 *  This function delete record with all extrafields and insert them again from the array $this->array_options.
 	 *
-	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
+	 *  @param	bool        $notrigger      false=launch triggers after, true=disable triggers
 	 *  @param	User		$userused		Object user
 	 *  @return int 						-1=error, O=did nothing, 1=OK
 	 */
-	function insertExtraFields($trigger='',$userused=null)
+	function insertExtraFields($notrigger=false, $userused=null)
 	{
 		global $conf,$langs,$user;
 
@@ -4648,7 +4649,7 @@ abstract class CommonObject
 				{
 					// Call trigger
 					$this->context=array('extrafieldaddupdate'=>1);
-					$result=$this->call_trigger($trigger, $userused);
+					$result=$this->call_trigger(strtoupper(get_class($this)) . '_EXTRAFIELDS_MODIFY', $userused);
 					if ($result < 0) $error++;
 					// End call trigger
 				}

From 4483265d5e62143e441a7fc8b652f15b8895fa23 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Thu, 25 Jan 2018 18:30:20 +0000
Subject: [PATCH 026/386] Forgot to update societe card.php with the same
 changes

---
 htdocs/societe/card.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 2dc70b74c7d..d3a3854309a 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1143,7 +1143,15 @@ else
         // State
         if (empty($conf->global->SOCIETE_DISABLE_STATE))
         {
-            print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
+            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>'.fieldLabel('Region-State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
+            }
+            else
+            {
+                print '<tr><td>'.fieldLabel('State','state_id').'</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>';
@@ -1700,7 +1708,15 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
+                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>'.fieldLabel('Region-State','state_id').'</td><td colspan="3">';
+                }
+                else
+                {
+                    print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
+                }
+
                 print $formcompany->select_state($object->state_id,$object->country_code);
                 print '</td></tr>';
             }

From ec38b8a5a25c8e5472a3c694039da62a2b6a8147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 25 Jan 2018 17:50:11 +0100
Subject: [PATCH 027/386] Update
 interface_99_modMyModule_MyModuleTriggers.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 06b34ccb8b3..4f1627c2940 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4645,11 +4645,11 @@ abstract class CommonObject
 			}
 			else
 			{
-				if ($trigger)
+				if (!$notrigger)
 				{
 					// Call trigger
 					$this->context=array('extrafieldaddupdate'=>1);
-					$result=$this->call_trigger(strtoupper(get_class($this)) . '_EXTRAFIELDS_MODIFY', $userused);
+					$result=$this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
 					if ($result < 0) $error++;
 					// End call trigger
 				}

From d0e83b79025d7fe922411e725b7b6b0926f9fab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 26 Jan 2018 08:14:39 +0100
Subject: [PATCH 028/386] trigger on bank account update

---
 htdocs/core/class/commonobject.class.php | 50 +++++++++++++++++++-----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4f1627c2940..9cc686f22e5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1888,10 +1888,18 @@ abstract class CommonObject
 	 *  Change the bank account
 	 *
 	 *  @param		int		$fk_account		Id of bank account
+	 *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers
+	 *  @param      User	$userused		Object user
 	 *  @return		int				1 if OK, 0 if KO
 	 */
-	function setBankAccount($fk_account)
+	function setBankAccount($fk_account, $notrigger=false, $userused=null)
 	{
+        global $user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error = 0;
+
 		if (! $this->table_element) {
 			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
 			return -1;
@@ -1903,15 +1911,37 @@ abstract class CommonObject
 		$sql.= " SET fk_account = ".$fk_account;
 		$sql.= " WHERE rowid=".$this->id;
 
-		if ($this->db->query($sql)) {
-			$this->fk_account = ($fk_account=='NULL')?null:$fk_account;
-			return 1;
-		} else {
-			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
-			$this->error=$this->db->error();
-			return 0;
-		}
-	}
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
+            $this->error = $this->db->lasterror();
+            $error++;
+        }
+        else
+        {
+            if (!$notrigger)
+            {
+                // Call trigger
+                $this->context=array('bankaccountupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+        }
+        if ($error)
+        {
+            $this->db->rollback();
+            return -1;
+        }
+        else
+        {
+            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+            $this->db->commit();
+            return 1;
+        }
+    }
+
 
 	// TODO: Move line related operations to CommonObjectLine?
 

From 336c44dc8802a1ddf5f4c9ab958df33f90bfcadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 26 Jan 2018 08:33:35 +0100
Subject: [PATCH 029/386] trigger on shipping method update

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9cc686f22e5..c0583f09552 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1790,29 +1790,57 @@ abstract class CommonObject
 	 *  Change the shipping method
 	 *
 	 *  @param      int     $shipping_method_id     Id of shipping method
+     *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers
+     *  @param      User	$userused               Object user
+	 *
 	 *  @return     int              1 if OK, 0 if KO
 	 */
-	function setShippingMethod($shipping_method_id)
+	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)
 	{
+        global $user;
+
+        if (empty($userused)) $userused=$user;
+
+        $error = 0;
+
 		if (! $this->table_element) {
 			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);
 			return -1;
 		}
+
+        $this->db->begin();
+
 		if ($shipping_method_id<0) $shipping_method_id='NULL';
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " SET fk_shipping_method = ".$shipping_method_id;
 		$sql.= " WHERE rowid=".$this->id;
-
-		if ($this->db->query($sql)) {
-			$this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
-			return 1;
-		} else {
+        $resql = $this->db->query($sql);
+		if (! $resql) {
 			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
-			$this->error=$this->db->error();
-			return 0;
-		}
+			$this->error = $this->db->lasterror();
+			$error++;
+        } else {
+            if (!$notrigger)
+            {
+                // Call trigger
+                $this->context=array('shippingmethodupdate'=>1);
+                $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+                if ($result < 0) $error++;
+                // End call trigger
+            }
+        }
+        if ($error)
+        {
+            $this->db->rollback();
+            return -1;
+        } else {
+            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+            $this->db->commit();
+            return 1;
+        }
+
 	}
 
 
@@ -1904,6 +1932,8 @@ abstract class CommonObject
 			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
 			return -1;
 		}
+        $this->db->begin();
+
 		if ($fk_account<0) $fk_account='NULL';
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 

From b9d5ed37ddb900c3b15038ef47fcfc01b7484c68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jan 2018 12:46:44 +0100
Subject: [PATCH 030/386] Prepare 8.0

---
 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 c270e2f44fa..a38376e8294 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','7.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','8.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 eb3eee9b6a0cc70b9fcf20807d61682ebf5dd9e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jan 2018 15:25:47 +0100
Subject: [PATCH 031/386] Code comment

---
 htdocs/core/class/extrafields.class.php  | 24 ++++++++++++------------
 htdocs/install/mysql/tables/llx_user.sql |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index c7b2d394a4b..3a3181e14a5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -140,15 +140,15 @@ class ExtraFields
 	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string			$perms				Permission to check
-	 *  @param	int				$list				Visibilty
-	 *  @param	int				$ishidden			Deprecated. Use visibility instead.
+	 *  @param	int				$list				Visibilty (0=never visible, 1=visible on list+forms, 2=list onyl, 3=form only)
+	 *  @param	int				$notused			Deprecated.
 	 *  @param  string  		$computed           Computed value
 	 *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
 	 *  @param  string  		$langfile  		 	Language file
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $computed='', $entity='', $langfile='', $enabled='1')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $notused=0, $computed='', $entity='', $langfile='', $enabled='1')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -165,7 +165,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden, $default, $computed, $entity, $langfile, $enabled);
+			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $notused, $default, $computed, $entity, $langfile, $enabled);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -282,7 +282,7 @@ class ExtraFields
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
 	 *  @param	int				$list			Visibily
-	 *  @param	int				$ishidden		Deprecated. Use visibility instead.
+	 *  @param	int				$notused		Deprecated.
 	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string          $computed       Computed value
 	 *  @param  string          $entity     	Entity of extrafields
@@ -290,7 +290,7 @@ class ExtraFields
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $default='', $computed='',$entity='', $langfile='', $enabled='1')
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $notused=0, $default='', $computed='',$entity='', $langfile='', $enabled='1')
 	{
 		global $conf,$user;
 
@@ -490,7 +490,7 @@ class ExtraFields
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Visibility
-	 *  @param	int		$ishidden			Deprecated. Use  visiblity instead.
+	 *  @param	int		$notused			Deprecated.
 	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string  $computed           Computed value
 	 *  @param  string  $entity	            Entity of extrafields
@@ -498,7 +498,7 @@ class ExtraFields
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $ishidden=0, $default='', $computed='', $entity='', $langfile='', $enabled='1')
+	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $notused=0, $default='', $computed='', $entity='', $langfile='', $enabled='1')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -546,7 +546,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden,$default,$computed,$entity,$langfile,$enabled);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$notused,$default,$computed,$entity,$langfile,$enabled);
 				}
 				if ($result > 0)
 				{
@@ -597,7 +597,7 @@ class ExtraFields
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Visiblity
-	 *  @param	int		$ishidden			Deprecated. Use visility instead.
+	 *  @param	int		$notused			Deprecated.
 	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string  $computed           Computed value
 	 *  @param  string  $entity     		Entity of extrafields
@@ -605,10 +605,10 @@ class ExtraFields
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='',$entity='',$langfile='',$enabled='1')
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$notused=0,$default='',$computed='',$entity='',$langfile='',$enabled='1')
 	{
 		global $conf, $user;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$notused.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled);
 
 		// Clean parameters
 		if ($elementtype == 'thirdparty') $elementtype='societe';
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 4385483209a..2ecb52511d4 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -15,7 +15,6 @@
 --
 -- 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_user
@@ -37,7 +36,7 @@ create table llx_user
   pass_encoding     varchar(24),
   pass              varchar(128),
   pass_crypted      varchar(128),
-  pass_temp         varchar(128),				-- temporary password when asked for forget password
+  pass_temp         varchar(128),				-- temporary password when asked for forget password or 'hashtoallowreset:YYYMMDDHHMMSS' (where date is max date of validaity)
   api_key           varchar(128),				-- key to use REST API by this user
   gender            varchar(10),
   civility          varchar(6),

From 6cae36cc336d7d60ab2b6563e3b79afd86132e76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jan 2018 17:00:14 +0100
Subject: [PATCH 032/386] NEW Add key __USER_REMOTE_IP__ into available
 substitution variables

---
 htdocs/core/lib/functions.lib.php | 3 ++-
 htdocs/langs/en_US/other.lang     | 4 +++-
 htdocs/langs/en_US/users.lang     | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bd7fa7b6fd4..88d4e550b03 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5620,7 +5620,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 			'__USER_LASTNAME__' => (string) $user->lastname,
 			'__USER_FIRSTNAME__' => (string) $user->firstname,
 			'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
-			'__USER_SUPERVISOR_ID__' => (string) $user->fk_user
+			'__USER_SUPERVISOR_ID__' => (string) $user->fk_user,
+			'__USER_REMOTE_IP__' => (string) $_SERVER['REMOTE_ADDR']
 			)
 		);
 	}
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 132a200ab2e..1585504479e 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -227,7 +227,9 @@ 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
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 3c1a8644bf0..c149e9d6a53 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -44,7 +44,9 @@ NewGroup=New group
 CreateGroup=Create group
 RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s created groups
 LastUsersCreated=Latest %s users created

From a61b42075903c5a997224a5c9625ddd46e6ca50b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jan 2018 23:29:49 +0100
Subject: [PATCH 033/386] Fix css

---
 htdocs/core/lib/functions.lib.php | 7 ++++---
 htdocs/index.php                  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30164def386..9cbf52c1cc8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3367,18 +3367,19 @@ function img_searchclear($titlealt = 'default', $other = '')
  *	@param  integer	$infoonimgalt	Info is shown only on alt of star picto, otherwise it is show on output after the star picto
  *	@param	int		$nodiv			No div
  *  @param  string  $admin          '1'=Info for admin users. '0'=Info for standard users (change only the look), 'xxx'=Other
+ *  @param	string	$morecss		More CSS
  *	@return	string					String with info text
  */
-function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1')
+function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1', $morecss='')
 {
 	global $conf, $langs;
 
 	if ($infoonimgalt)
 	{
-		return img_picto($text, 'info', 'class="hideonsmartphone"');
+		return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss?' '.$morecss:'').'"');
 	}
 
-	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
+	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone'.($morecss?' '.$morecss:'').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
 }
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 867f305a680..b01e37927c4 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -656,7 +656,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
     {
         $langs->load("errors");
         //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->trans("WarningLockFileDoesNotExists",DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+        $message.=info_admin($langs->trans("WarningLockFileDoesNotExists",DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     // Conf files must be in read only mode
@@ -665,7 +665,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
         $langs->load("errors");
         //$langs->load("other");
         //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+        $message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     if ($message)

From 28417a6c248d63684c674d50471ac72cd1062a51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jan 2018 23:54:45 +0100
Subject: [PATCH 034/386] Fix css

---
 htdocs/admin/dict.php                       | 8 ++++----
 htdocs/blockedlog/admin/blockedlog_list.php | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a1fc7c87d68..438c7cd5227 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -187,7 +187,7 @@ $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAI
 $tabsql[10]= "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[11]= "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
 $tabsql[12]= "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = " . getEntity($tabname[12]);
-$tabsql[13]= "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.accountancy_code, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = " . getEntity($tabname[13]);
+$tabsql[13]= "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = " . getEntity($tabname[13]);
 $tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
 $tabsql[15]= "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
 $tabsql[16]= "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
@@ -265,7 +265,7 @@ $tabfield[9] = "code,label,unicode";
 $tabfield[10]= "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11]= "element,source,code,libelle,position";
 $tabfield[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
-$tabfield[13]= "code,libelle,type,accountancy_code,entity";
+$tabfield[13]= "code,libelle,type,entity";
 $tabfield[14]= "code,libelle,price,organization,country_id,country";
 $tabfield[15]= "code,libelle,width,height,unit";
 $tabfield[16]= "code,libelle,sortorder";
@@ -304,7 +304,7 @@ $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10]= "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11]= "element,source,code,libelle,position";
 $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder";
-$tabfieldvalue[13]= "code,libelle,type,accountancy_code";
+$tabfieldvalue[13]= "code,libelle,type";
 $tabfieldvalue[14]= "code,libelle,price,organization,country";
 $tabfieldvalue[15]= "code,libelle,width,height,unit";
 $tabfieldvalue[16]= "code,libelle,sortorder";
@@ -343,7 +343,7 @@ $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11]= "element,source,code,libelle,position";
 $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
-$tabfieldinsert[13]= "code,libelle,type,accountancy_code,entity";
+$tabfieldinsert[13]= "code,libelle,type,entity";
 $tabfieldinsert[14]= "code,libelle,price,organization,fk_pays";
 $tabfieldinsert[15]= "code,label,width,height,unit";
 $tabfieldinsert[16]= "code,label,sortorder";
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 633f84b6582..08b384d7ac5 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -359,7 +359,8 @@ print '</td>';
 
 // User
 print '<td class="liste_titre">';
-print $form->select_dolusers($search_fk_user, 'search_fk_user', 1);
+print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+
 print '</td>';
 
 // Actions code

From f2a3c83053a6fe1d126b03b7bec467add770917c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Jan 2018 18:46:52 +0100
Subject: [PATCH 035/386] Better error messages

---
 htdocs/comm/card.php           | 7 ++++---
 htdocs/societe/consumption.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 8fb590d61b4..fa2af2dc3eb 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -211,7 +211,7 @@ if ($id > 0 && empty($object->id))
 {
 	// Load data of third party
 	$res=$object->fetch($id);
-	if ($object->id <= 0) dol_print_error($db,$object->error,$object->errors);
+	if ($object->id < 0) dol_print_error($db, $object->error, $object->errors);
 }
 
 $title=$langs->trans("CustomerCard");
@@ -220,7 +220,7 @@ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
 
-if ($id > 0)
+if ($object->id > 0)
 {
 	$head = societe_prepare_head($object);
 
@@ -1271,7 +1271,8 @@ if ($id > 0)
 }
 else
 {
-	dol_print_error($db,'Bad value for socid parameter');
+	$langs->load("errors");
+	print $langs->trans('ErrorRecordNotFound');
 }
 
 // End of page
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index c9c26326426..ffb4cac77fa 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -268,7 +268,7 @@ if ($type_element == 'supplier_order')
 	$thirdTypeSelect='supplier';
 }
 if ($type_element == 'contract')
-{ 	// Supplier : Show products from orders.
+{ 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic=new Contrat($db);
 	$documentstaticline=new ContratLigne($db);

From f1cd905bf174dede00914b62f34701068d007e8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Jan 2018 19:29:57 +0100
Subject: [PATCH 036/386] Fix var not initialized

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 3a3181e14a5..226d367140b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -111,6 +111,9 @@ class ExtraFields
 	{
 		$this->db = $db;
 		$this->error = array();
+		$this->attributes = array();
+
+		// For old usage
 		$this->attribute_elementtype = array();
 		$this->attribute_type = array();
 		$this->attribute_label = array();

From 7a2992bc4b29f311fb9a54f69bb7298e4f7adb84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Jan 2018 19:35:30 +0100
Subject: [PATCH 037/386] Fix var serialized twice

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 226d367140b..bc37c428bb6 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -311,7 +311,7 @@ class ExtraFields
 		{
 			if(is_array($param) && count($param) > 0)
 			{
-				$params = $this->db->escape(serialize($param));
+				$params = serialize($param);
 			}
 			elseif (strlen($param) > 0)
 			{

From 97c2828d04cd808c3116011ae690737e8f8beaa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Jan 2018 10:57:01 +0100
Subject: [PATCH 038/386] Fix install.lock not always saved

---
 htdocs/install/step5.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 91c517f9644..5181c35f2f9 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -345,7 +345,8 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 // Create lock file
 
 // If first install
-if ($action == "set" && $success) {
+if ($action == "set" && $success)
+{
     if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION))
     {
         // Install is finished
@@ -353,14 +354,14 @@ if ($action == "set" && $success) {
 
         $createlock=0;
 
-        if (! empty($force_install_lockinstall))
+        if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
         {
             // Install is finished, we create the lock file
             $lockfile=DOL_DATA_ROOT.'/install.lock';
             $fp = @fopen($lockfile, "w");
             if ($fp)
             {
-                if ($force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
+            	if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
                 fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
                 fclose($fp);
                 @chmod($lockfile, octdec($force_install_lockinstall));
@@ -403,14 +404,14 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
 
         $createlock=0;
 
-        if (! empty($force_install_lockinstall))
+        if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
         {
             // Upgrade is finished, we create the lock file
             $lockfile=DOL_DATA_ROOT.'/install.lock';
             $fp = @fopen($lockfile, "w");
             if ($fp)
             {
-                if ($force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
+            	if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
                 fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
                 fclose($fp);
                 @chmod($lockfile, octdec($force_install_lockinstall));

From cebda2b141ee3c5c5eb694911cdbeb93640d17a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Jan 2018 10:57:12 +0100
Subject: [PATCH 039/386] Prepare 8.0

---
 htdocs/install/check.php                       | 11 ++++++-----
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 50409fb55e5..8262a5f05df 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -421,11 +421,12 @@ else
 								array('from'=>'3.5.0', 'to'=>'3.6.0'),
 								array('from'=>'3.6.0', 'to'=>'3.7.0'),
 								array('from'=>'3.7.0', 'to'=>'3.8.0'),
-		                        array('from'=>'3.8.0', 'to'=>'3.9.0'),
-		                        array('from'=>'3.9.0', 'to'=>'4.0.0'),
-		                        array('from'=>'4.0.0', 'to'=>'5.0.0'),
-		                        array('from'=>'5.0.0', 'to'=>'6.0.0'),
-		                        array('from'=>'6.0.0', 'to'=>'7.0.0')
+								array('from'=>'3.8.0', 'to'=>'3.9.0'),
+								array('from'=>'3.9.0', 'to'=>'4.0.0'),
+								array('from'=>'4.0.0', 'to'=>'5.0.0'),
+								array('from'=>'5.0.0', 'to'=>'6.0.0'),
+								array('from'=>'6.0.0', 'to'=>'7.0.0'),
+								array('from'=>'7.0.0', 'to'=>'8.0.0')
 		);
 
 		$count=0;
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 e9a72ab9360..1b9375ef1a8 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
@@ -23,4 +23,4 @@
 -- Note: fields with type BLOB/TEXT can't have default value.
 
 -- For 8.0
-ALTER TABLE llx_societe ADD COLUMN fk_entrepot int DEFAULT 0;
+ALTER TABLE llx_societe ADD COLUMN fk_entrepot integer DEFAULT 0;

From 9825586d41256e4b529a3d809ea3c21e0e5fa441 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Jan 2018 11:12:56 +0100
Subject: [PATCH 040/386] Fix css

---
 htdocs/public/paybox/newpayment.php  | 10 +++++-----
 htdocs/public/payment/newpayment.php | 10 +++++-----
 htdocs/public/paypal/newpayment.php  | 10 +++++-----
 htdocs/public/stripe/newpayment.php  | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index c386dc7e84e..eb90814eb7b 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -321,7 +321,7 @@ if (! GETPOST("source") && $valid)
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -407,7 +407,7 @@ if (GETPOST("source") == 'order' && $valid)
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -495,7 +495,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -671,7 +671,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -784,7 +784,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3f2c2979e00..fd1389ba8cb 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -661,7 +661,7 @@ if (! $source)
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -752,7 +752,7 @@ if ($source == 'order')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -877,7 +877,7 @@ if ($source == 'invoice')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1093,7 +1093,7 @@ if ($source == 'contractline')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1252,7 +1252,7 @@ if ($source == 'membersubscription')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 2bb58e4b676..27024d48de1 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -404,7 +404,7 @@ if (! GETPOST("source"))
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -490,7 +490,7 @@ if (GETPOST("source") == 'order')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -600,7 +600,7 @@ if (GETPOST("source") == 'invoice')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -798,7 +798,7 @@ if (GETPOST("source") == 'contractline')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -937,7 +937,7 @@ if (GETPOST("source") == 'membersubscription')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 38d81f7e991..dfd0425bb26 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -470,7 +470,7 @@ if (! GETPOST("source"))
     // Tag
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
     print '<input type="hidden" name="tag" value="'.$tag.'">';
     print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
     print '</td></tr>'."\n";
@@ -556,7 +556,7 @@ if (GETPOST("source") == 'order')
     // Tag
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
     print '<input type="hidden" name="tag" value="'.$tag.'">';
     print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
     print '</td></tr>'."\n";
@@ -667,7 +667,7 @@ if (GETPOST("source") == 'invoice')
     // Tag
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
     print '<input type="hidden" name="tag" value="'.$tag.'">';
     print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
     print '</td></tr>'."\n";
@@ -867,7 +867,7 @@ if (GETPOST("source") == 'contractline')
     // Tag
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
     print '<input type="hidden" name="tag" value="'.$tag.'">';
     print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
     print '</td></tr>'."\n";
@@ -1006,7 +1006,7 @@ if (GETPOST("source") == 'membersubscription')
     // Tag
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
     print '<input type="hidden" name="tag" value="'.$tag.'">';
     print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
     print '</td></tr>'."\n";

From 97da464343be809e06952e5745c544b52d0721d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Jan 2018 11:21:40 +0100
Subject: [PATCH 041/386] Fix price in member public form

---
 htdocs/public/paybox/newpayment.php  | 2 +-
 htdocs/public/payment/newpayment.php | 2 +-
 htdocs/public/paypal/newpayment.php  | 2 +-
 htdocs/public/stripe/newpayment.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index eb90814eb7b..9d7f79081a9 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -767,7 +767,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	    $valtoshow=GETPOST("newamount",'int');
 	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	    print '<input class="flat" class="maxwidth75" type="text" name="newamount" value="'.price($valtoshow).'">';
 	}
 	else {
 	    $valtoshow=$amount;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index fd1389ba8cb..efeb1323a3d 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1235,7 +1235,7 @@ if ($source == 'membersubscription')
 		//$valtoshow=GETPOST("newamount",'int');
 		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+		print '<input class="flat" class="maxwidth75" type="text" name="newamount" value="'.price($valtoshow).'">';
 	}
 	else {
 		$valtoshow=$amount;
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 27024d48de1..fac192bd318 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -920,7 +920,7 @@ if (GETPOST("source") == 'membersubscription')
 	    $valtoshow=GETPOST("newamount",'int');
 	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	    print '<input class="flat" class="maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
 	}
 	else {
 	    $valtoshow=$amount;
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index dfd0425bb26..36b27658ee0 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -989,7 +989,7 @@ if (GETPOST("source") == 'membersubscription')
         $valtoshow=GETPOST("newamount",'int');
         if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-        print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+        print '<input class="flat" class="maxwidth75" type="text" name="newamount" value="'.price($valtoshow).'">';
     }
     else {
         $valtoshow=$amount;

From f761c9efabb2f4e151d9cda4aaf37b8669aec49a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Jan 2018 18:02:24 +0100
Subject: [PATCH 042/386] Add param morecss on error message

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9cbf52c1cc8..0aa42f7572f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2278,7 +2278,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		$titlealt=($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone"));
 	}
 	$rep='';
-	
+
 	if ($hookmanager) {
             $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $withpicto);
             $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
@@ -2304,7 +2304,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		if ($adddivfloat) $rep.='</div>';
 		else $rep.='</span>';
 	  }
-	
+
 	return $rep;
 }
 
@@ -3520,15 +3520,16 @@ function dol_print_error($db='',$error='',$errors=null)
  * @param	string	$prefixcode		Prefix of public error code
  * @param   string  $errormessage   Complete error message
  * @param	array	$errormessages	Array of error messages
+ * @param	string	$morecss		More css
  * @return	void
  */
-function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array())
+function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array(), $morecss='error')
 {
 	global $langs,$conf;
 
 	$langs->load("errors");
 	$now=dol_now();
-	print '<br><div class="center login_main_message"><div class="error">';
+	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
 	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
 	if ($errormessage) print '<br><br>'.$errormessage;
 	if (is_array($errormessages) && count($errormessages))

From e46e66b1ed37ed227f261511e24ad003d768edb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Jan 2018 14:34:48 +0100
Subject: [PATCH 043/386] NEW Introduce option THIRDPARTY_QUICKSEARCH_ON_FIELDS
 to personalize search fields for quick search

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 6de4ae1296c..3966dfeb2fc 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -142,6 +142,9 @@ if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp !=
 if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5';
 if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6']='ProfId6';
 if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod';
+// Personalized search criterias. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
+if (! empty($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS)) $fieldstosearchall=dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
+
 
 // Define list of fields to show into list
 $checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
@@ -513,7 +516,7 @@ $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 = "&sall=".urlencode($search_all);
-if ($sall != '')           $param .= "&sall=".urlencode($sall);
+if ($sall != '')           $param.= "&sall=".urlencode($sall);
 if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
 if ($search_categ_sup > 0) $param.='&search_categ_sup='.urlencode($search_categ_sup);
 if ($search_sale > 0)	   $param.='&search_sale='.urlencode($search_sale);

From 8b90f82f4f2a54b03b380aacc08f4ca8028b7eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 1 Feb 2018 14:41:37 +0100
Subject: [PATCH 044/386] display search result from page 0 even we are page
 350

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

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index fa06a7e7d05..71894b8659b 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -317,7 +317,7 @@ if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->tr
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?page=0">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

From a7357e67f96e25c236b68579e81fa1428a91ea5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Feb 2018 20:19:04 +0100
Subject: [PATCH 045/386] Code comment

---
 htdocs/core/class/html.form.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3b773412861..cbd2eb5c3b3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1726,7 +1726,7 @@ class Form
 	 *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$price_level			Level of price to show
-	 *  @param		int			$status					-1=Return all products, 0=Products not on sell, 1=Products on sell
+	 *  @param		int			$status					Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
 	 *  @param		int			$finished				2=all, 1=finished, 0=raw material
 	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
 	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
@@ -1740,7 +1740,7 @@ class Form
 	 *										            'warehouseopen' = select products from open warehouses,
 	 *										            'warehouseclosed' = select products from closed warehouses,
 	 *										            'warehouseinternal' = select products from warehouses for internal correct/transfer only
-	 *  @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
+	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
 	 *  @return		void
 	 */
 	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())
@@ -2390,7 +2390,7 @@ class Form
 	 *	Return list of suppliers products
 	 *
 	 *	@param	int		$socid   		Id societe fournisseur (0 pour aucun filtre)
-	 *	@param  int		$selected       Produit pre-selectionne
+	 *	@param  int		$selected       Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
 	 *	@param  string	$htmlname       Nom de la zone select
 	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
 	 *	@param  string	$filtre         Pour filtre sql

From fae761628108be99cc86b2c189075c881678c5a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Feb 2018 21:20:54 +0100
Subject: [PATCH 046/386] Fix update price when updating products

---
 htdocs/product/class/api_products.class.php | 61 +++++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index b21a6a34046..516c67f1fbe 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -197,7 +197,8 @@ class Products extends DolibarrApi
     }
 
     /**
-     * Update product
+     * 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
@@ -209,6 +210,8 @@ class Products extends DolibarrApi
      */
     function put($id, $request_data = NULL)
     {
+    	global $conf;
+
         if(! DolibarrApiAccess::$user->rights->produit->creer) {
 			throw new RestException(401);
 		}
@@ -222,15 +225,63 @@ class Products extends DolibarrApi
 			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;
             $this->product->$field = $value;
         }
 
-        if($this->product->update($id, DolibarrApiAccess::$user,1,'update'))
-            return $this->get ($id);
+        $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update');
 
-        return false;
+        // 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);
     }
 
     /**
@@ -431,6 +482,8 @@ class Products extends DolibarrApi
         unset($object->lastname);
         unset($object->civility_id);
 
+        unset($object->recuperableonly);
+
         return $object;
     }
 

From 12aec8f8066d5537896ef3b03134d871316b2267 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Feb 2018 15:19:04 +0100
Subject: [PATCH 047/386] Prepare database for invoicing of projects

---
 .../install/mysql/migration/7.0.0-8.0.0.sql   |  7 +++++
 htdocs/install/mysql/tables/llx_projet.sql    |  3 ++-
 htdocs/install/mysql/tables/llx_societe.sql   | 27 ++++++++++---------
 3 files changed, 24 insertions(+), 13 deletions(-)

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 1b9375ef1a8..498d9226b2e 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
@@ -22,5 +22,12 @@
 -- 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.
 
+
+
+
+
 -- For 8.0
+
 ALTER TABLE llx_societe ADD COLUMN fk_entrepot integer DEFAULT 0;
+
+ALTER TABLE llx_projet ADD COLUMN bill_time integer DEFAULT 0;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 3875e64e1a7..8e58f0ad8c8 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -41,7 +41,8 @@ create table llx_projet
   note_public      text,
   --budget_days      real,                      -- budget in days is sum of field planned_workload of tasks
   opp_amount       double(24,8),
-  budget_amount    double(24,8),				
+  budget_amount    double(24,8),
+  bill_time        integer DEFAULT 0,			-- Set to 1 if time spent must be converted into invoices				
   model_pdf        varchar(255),
   import_key	   varchar(14)					-- Import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c23ca3a183c..f6ee1f39220 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -33,8 +33,6 @@ create table llx_societe
 
   statut                   tinyint        DEFAULT 0,            		-- statut
   parent                   integer,
-  tms                      timestamp,
-  datec	                   datetime,                            		-- creation date
 
   status            	   tinyint 		  DEFAULT 1,			        -- cessation d'activité ( 1 -- en activité, 0 -- cessation d'activité)						
 
@@ -57,15 +55,15 @@ create table llx_societe
   fk_typent                integer        DEFAULT 0,            		--
   fk_forme_juridique       integer        DEFAULT 0,            		-- juridical status
   fk_currency			   varchar(3),									-- default currency
-  siren	                   varchar(128),                         		-- IDProf1: siren or RCS for france
-  siret                    varchar(128),                         		-- IDProf2: siret for france
-  ape                      varchar(128),                         		-- IDProf3: code ape for france
+  siren	                   varchar(128),                         		-- IDProf1: siren or RCS for france, ...
+  siret                    varchar(128),                         		-- IDProf2: siret for france, ...
+  ape                      varchar(128),                         		-- IDProf3: code ape for france, ...
   idprof4                  varchar(128),                         		-- IDProf4: nu for france
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  double(24,8),                       		-- capital de la societe
-  fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
+  capital                  double(24,8)   DEFAULT NULL,        			-- capital de la societe
+  fk_stcomm                integer        DEFAULT 0 NOT NULL,      		-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
   model_pdf				   varchar(255),
@@ -79,8 +77,6 @@ create table llx_societe
   customer_bad             tinyint        DEFAULT 0,            		-- mauvais payeur 0/1
   customer_rate            real           DEFAULT 0,            		-- taux fiabilite client (0 a 1)
   supplier_rate            real           DEFAULT 0,            		-- taux fiabilite fournisseur (0 a 1)
-  fk_user_creat            integer NULL,                        		-- utilisateur qui a cree l'info
-  fk_user_modif            integer,                             		-- utilisateur qui a modifie l'info
   remise_client            real           DEFAULT 0,            		-- remise systematique pour le client
   mode_reglement           tinyint,                             		-- mode de reglement
   cond_reglement           tinyint,                             		-- condition de reglement
@@ -99,10 +95,17 @@ create table llx_societe
   default_lang             varchar(6),									-- default language
   logo                     varchar(255)   DEFAULT NULL,
   canvas				   varchar(32)    DEFAULT NULL,	                -- type of canvas if used (null by default)
-  import_key               varchar(14),                          		-- import key
+  fk_entrepot 			   integer DEFAULT 0,							-- if we need a link between third party and warehouse
   webservices_url          varchar(255),                            	-- supplier webservice url
   webservices_key          varchar(128),                            	-- supplier webservice key
   
-  fk_multicurrency			integer,
-  multicurrency_code		varchar(255)
+  tms                      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
+
+  fk_multicurrency		   integer,
+  multicurrency_code	   varchar(255),
+
+  import_key               varchar(14)                          		-- import key
 )ENGINE=innodb;

From a308e45c6b999799ff10c8a1dcd43a97582c3f01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Feb 2018 17:00:47 +0100
Subject: [PATCH 048/386] Update objectline_create.tpl.php

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 2ea5b6899d7..fbfa0b340e8 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -144,7 +144,7 @@ else {
 	<?php
 	
 	$freelines = false;
-	if(empty($conf->global->MAIN_DISABLE_FREE_LINES))
+	if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
 	{
 		$freelines = true;
 		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)

From 833c7685e18a3f415efdd6b2f73a077086d2a6d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Feb 2018 17:32:38 +0100
Subject: [PATCH 049/386] Hook 'maildao' was renamed into 'mail' into the
 method sendfile that send emails, and method was renamed from 'doaction' into
 'sendMail'. To process task #4875 #7969 in several steps.

---
 ChangeLog                               | 10 ++++++++++
 htdocs/core/actions_sendmails.inc.php   | 20 +++++++++----------
 htdocs/core/class/CMailFile.class.php   | 26 +++++++++++++++++++------
 htdocs/core/class/hookmanager.class.php | 10 ++++++----
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2cf9f178a16..43fecf4d2e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 8.0.0 compared to 7.0.0 *****
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Hook 'maildao' was renamed into 'mail' into the method sendfile that send emails, and method was renamed from
+  'doaction' into 'sendMail'. 
+  
+
 ***** ChangeLog for 7.0.0 compared to 6.0.5 *****
 For users:
 NEW: When payment is registered, PDF of invoices are also regenerated so payments
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index eea69e37c13..962d00ee4b8 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -106,7 +106,6 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 	$subject='';$actionmsg='';$actionmsg2='';
 
-	if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail");
 	$langs->load('mails');
 
 	if (is_object($object))
@@ -321,6 +320,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 
 			// 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.
@@ -329,7 +329,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$mbid = $mailfromid[1];
 
-					/*IMAP Postbox*/
+					// IMAP Postbox
 					$mailboxconfig = new IMAP($db);
 					$mailboxconfig->fetch($mbid);
 					if ($mailboxconfig->mailbox_imap_host) $ref=$mailboxconfig->get_ref();
@@ -361,6 +361,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					}
 				}
 			}
+			*/
 
 			// Make substitution in email content
 			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
@@ -393,7 +394,8 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				$result=$mailfile->sendfile();
 				if ($result)
 				{
-					// FIXME This must be moved into the trigger for action $trigger_name
+					// Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
+					/*
 					if (! empty($conf->dolimail->enabled))
 					{
 						$mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0);	// Original mail id is set ?
@@ -411,7 +413,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 							if ($movemail) setEventMessages($langs->trans("MailMovedToImapFolder",$folder), null, 'mesgs');
 							else setEventMessages($langs->trans("MailMovedToImapFolder_Warning",$folder), null, 'warnings');
 						}
-					}
+					}*/
 
 					// Initialisation of datas
 					if (is_object($object))
@@ -446,12 +448,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// This avoid sending mail twice if going out and then back to page
 					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 					setEventMessages($mesg, null, 'mesgs');
-					if ($conf->dolimail->enabled)
-					{
-						header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
-						exit;
-					}
-					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:''));
+
+					$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
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index d9469c11559..32d795db528 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -482,7 +482,7 @@ class CMailFile
 
 
 	/**
-	 * Send mail that was prepared by constructor
+	 * Send mail that was prepared by constructor.
 	 *
 	 * @return    boolean     True if mail sent, false otherwise
 	 */
@@ -499,15 +499,21 @@ class CMailFile
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array('maildao'));
-			$reshook = $hookmanager->executeHooks('doactions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if (! empty($reshook))
+			$hookmanager->initHooks(array('mail'));
+
+			$parameters=array(); $action='';
+			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao doactions " . $reshook;
+				$this->error = "Error in hook maildao sendMail " . $reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
 
 				return $reshook;
 			}
+			if ($reshook == 1)	// Hook replace standard code
+			{
+				return true;
+			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
 			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
@@ -760,13 +766,21 @@ class CMailFile
 			}
 			else
 			{
-
 				// Send mail method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for sendmode';
 			}
 
+			$parameters=array(); $action='';
+			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			if ($reshook < 0)
+			{
+				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+
+				return $reshook;
+			}
 		}
 		else
 		{
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 31833c113b4..1a19e313e08 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -139,6 +139,9 @@ class HookManager
 			    'addMoreMassActions',
 			    'addSearchEntry',
 				'addStatisticLine',
+				'createDictionaryFieldList',
+				'editDictionaryFieldlist',
+				'getFormMail',
 			    'deleteFile',
 				'doActions',
 			    'doMassActions',
@@ -175,10 +178,9 @@ class HookManager
 				'formatEvent',
                 'printObjectLine',
                 'printObjectSubLine',
-				'createDictionaryFieldList',
-				'editDictionaryFieldlist',
-				'getFormMail',
-			    'showLinkToObjectBlock'
+			    'showLinkToObjectBlock',
+				'sendMail',
+				'sendMailAfter'
 				)
 			)) $hooktype='addreplace';
 

From 9d0314dbae8b54bf2bc5fc272a695e3d2d5fa7c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Feb 2018 18:50:20 +0100
Subject: [PATCH 050/386] NEW Add option CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES

---
 htdocs/contrat/card.php                | 134 +++++++++++++------------
 htdocs/contrat/class/contrat.class.php |  48 +++++----
 2 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 21324613bdf..59271f7eec7 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -657,43 +657,53 @@ if (empty($reshook))
 
 	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
 	{
-	  if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
-	  {
-		  setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-		  $action = 'editline';
-		  $_GET['rowid'] = GETPOST('elrowid');
-		  $error++;
-	  }
+		$error = 0;
 
-	  if (!$error) {
-		  $objectline = new ContratLigne($db);
-		  if ($objectline->fetch(GETPOST('elrowid')))
-		  {
-			  $db->begin();
+		if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
+		{
+			setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+			$action = 'editline';
+			$_GET['rowid'] = GETPOST('elrowid');
+			$error++;
+		}
 
-			  if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
-			  if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+		if (! $error)
+		{
+			$objectline = new ContratLigne($db);
+			if ($objectline->fetch(GETPOST('elrowid')) < 0)
+			{
+				setEventMessages($objectline->error, $objectline->errors, 'errors');
+				$error++;
+			}
+		}
 
-			  $vat_rate = GETPOST('eltva_tx');
-			  // Define info_bits
-			  $info_bits = 0;
-			  if (preg_match('/\*/', $vat_rate))
+		$db->begin();
+
+		if (! $error)
+		{
+			if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
+			if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+
+			$vat_rate = GETPOST('eltva_tx');
+			// Define info_bits
+			$info_bits = 0;
+			if (preg_match('/\*/', $vat_rate))
 				  $info_bits |= 0x01;
 
 			// Define vat_rate
 			$vat_rate = str_replace('*', '', $vat_rate);
-			  $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
-			  $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+			$localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+			$localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 
-			  $txtva = $vat_rate;
+			$txtva = $vat_rate;
 
 			// Clean vat code
-			  $vat_src_code='';
-			  if (preg_match('/\((.*)\)/', $txtva, $reg))
-			  {
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
 				  $vat_src_code = $reg[1];
 				  $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-			  }
+			}
 
 			// ajout prix d'achat
 			$fk_fournprice = $_POST['fournprice'];
@@ -704,22 +714,22 @@ if (empty($reshook))
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
-			  $objectline->description=GETPOST('product_desc','none');
-			  $objectline->price_ht=GETPOST('elprice');
-			  $objectline->subprice=GETPOST('elprice');
-			  $objectline->qty=GETPOST('elqty');
-			  $objectline->remise_percent=GETPOST('elremise_percent');
-			  $objectline->tva_tx=($txtva?$txtva:0);	// Field may be disabled, so we use vat rate 0
-			  $objectline->vat_src_code=$vat_src_code;
-			  $objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
-			  $objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
-			  $objectline->date_ouverture_prevue=$date_start_update;
-			  $objectline->date_ouverture=$date_start_real_update;
-			  $objectline->date_fin_validite=$date_end_update;
-			  $objectline->date_cloture=$date_end_real_update;
-			  $objectline->fk_user_cloture=$user->id;
-			  $objectline->fk_fournprice=$fk_fournprice;
-			  $objectline->pa_ht=$pa_ht;
+			$objectline->description=GETPOST('product_desc','none');
+			$objectline->price_ht=GETPOST('elprice');
+			$objectline->subprice=GETPOST('elprice');
+			$objectline->qty=GETPOST('elqty');
+			$objectline->remise_percent=GETPOST('elremise_percent');
+			$objectline->tva_tx=($txtva?$txtva:0);	// Field may be disabled, so we use vat rate 0
+			$objectline->vat_src_code=$vat_src_code;
+			$objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
+			$objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
+			$objectline->date_ouverture_prevue=$date_start_update;
+			$objectline->date_ouverture=$date_start_real_update;
+			$objectline->date_fin_validite=$date_end_update;
+			$objectline->date_cloture=$date_end_real_update;
+			$objectline->fk_user_cloture=$user->id;
+			$objectline->fk_fournprice=$fk_fournprice;
+			$objectline->pa_ht=$pa_ht;
 
 			if ($fk_unit > 0) {
 			  $objectline->fk_unit = GETPOST('unit');
@@ -727,30 +737,30 @@ if (empty($reshook))
 			  $objectline->fk_unit = null;
 			}
 
-			  // Extrafields
-			  $extrafieldsline = new ExtraFields($db);
-			  $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
-			  $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-			  $objectline->array_options=$array_options;
+			// Extrafields
+			$extrafieldsline = new ExtraFields($db);
+			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
+			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+			$objectline->array_options=$array_options;
 
-			  // TODO verifier price_min si fk_product et multiprix
+			// TODO verifier price_min si fk_product et multiprix
 
-			  $result=$objectline->update($user);
-			  if ($result > 0)
-			  {
-				  $db->commit();
-			  }
-			  else
-			  {
+			$result=$objectline->update($user);
+			if ($result < 0)
+			{
+				$error++;
 				setEventMessages($objectline->error, $objectline->errors, 'errors');
-				  $db->rollback();
-			  }
-		  }
-		  else
-		  {
-			setEventMessages($objectline->error, $objectline->errors, 'errors');
-		  }
-	  }
+			}
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
 	}
 
 	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a6d557a0776..f6c8e965e6d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2911,22 +2911,14 @@ class ContratLigne extends CommonObjectLine
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$contrat=new Contrat($this->db);
-			$contrat->fetch($this->fk_contrat);
-			$result=$contrat->update_statut($user);
-		}
-		else
+		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
 			$error++;
-			//return -1;
 		}
 
 		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
 		{
-
 			$result=$this->insertExtraFields();
 			if ($result < 0)
 			{
@@ -2934,19 +2926,37 @@ class ContratLigne extends CommonObjectLine
 			}
 		}
 
-		if (empty($error)) {
-		if (! $notrigger)
+		// Sync dates of all services
+		if (! $error && ! empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
 		{
-            // Call trigger
-            $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
-            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            // End call triggers
-		}
+			$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+			$sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null").",";
+			$sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
+			$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+
+			$resql = $this->db->query($sql);
+			if (! $resql)
+			{
+				$error++;
+				$this->error="Error ".$this->db->lasterror();
+			}
 		}
 
-		if (empty($error)) {
-        $this->db->commit();
-		return 1;
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+	            // Call trigger
+	            $result=$this->call_trigger('LINECONTRACT_UPDATE', $user);
+	            if ($result < 0) { $error++; $this->db->rollback(); }
+	            // End call triggers
+			}
+		}
+
+		if (! $error)
+		{
+        	$this->db->commit();
+			return 1;
 		} else {
 			$this->db->rollback();
 			$this->errors[]=$this->error;

From ea15c1bfedcd65cbfd9539dda0d49ff2a503523f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 10:50:58 +0100
Subject: [PATCH 051/386] Fix CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES

---
 htdocs/contrat/class/contrat.class.php | 38 +++++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f6c8e965e6d..ad6b16163a5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2872,6 +2872,9 @@ class ContratLigne extends CommonObjectLine
 
 		$this->db->begin();
 
+		$this->oldcopy = new ContratLigne($this->db);
+		$this->oldcopy->fetch($this->id);
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
 		$sql.= " fk_contrat=".$this->fk_contrat.",";
@@ -2926,19 +2929,34 @@ class ContratLigne extends CommonObjectLine
 			}
 		}
 
-		// Sync dates of all services
+		// If we change a planned date (start or end), sync dates for all services
 		if (! $error && ! empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
 		{
-			$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
-			$sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null").",";
-			$sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
-			$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
-
-			$resql = $this->db->query($sql);
-			if (! $resql)
+			if ($this->date_ouverture_prevue != $this->oldcopy->date_ouverture_prevue)
 			{
-				$error++;
-				$this->error="Error ".$this->db->lasterror();
+				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+				$sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null");
+				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+
+				$resql = $this->db->query($sql);
+				if (! $resql)
+				{
+					$error++;
+					$this->error="Error ".$this->db->lasterror();
+				}
+			}
+			if ($this->date_fin_validite != $this->oldcopy->date_fin_validite)
+			{
+				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+				$sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
+				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+
+				$resql = $this->db->query($sql);
+				if (! $resql)
+				{
+					$error++;
+					$this->error="Error ".$this->db->lasterror();
+				}
 			}
 		}
 

From d24d401f3a80f2f95f7e4c57b60d64b0c53a58f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 10:55:09 +0100
Subject: [PATCH 052/386] Fix translation

---
 htdocs/admin/mails.php        | 40 +++++++++++++++++------------------
 htdocs/langs/en_US/admin.lang |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 677e6099a8d..bbac43b5c18 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -239,7 +239,7 @@ if ($action == 'edit')
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
-	
+
 	// Force e-mail recipient
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>';
 	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO)?$conf->global->MAIN_MAIL_FORCE_SENDTO:'') . '" />';
@@ -483,7 +483,7 @@ else
 	// Disable
 
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</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) && ! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
@@ -655,25 +655,7 @@ else
 	dol_fiche_end();
 
 
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-	{
-		print '<br>';
-		/*
-	    // Warning 1
-    	if ($linuxlike)
-    	{
-    		$sendmailoption=ini_get('mail.force_extra_parameters');
-    		if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
-    		{
-    			print info_admin($langs->trans("SendmailOptionNotComplete"));
-    		}
-    	}*/
-		// Warning 2
-   		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
-	}
-
-
-	// Boutons actions
+	// Actions button
 	print '<div class="tabsAction">';
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
@@ -700,6 +682,22 @@ else
 	print '</div>';
 
 
+	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+	{
+		/*
+		 // Warning 1
+		 if ($linuxlike)
+		 {
+		 $sendmailoption=ini_get('mail.force_extra_parameters');
+		 if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
+		 {
+		 print info_admin($langs->trans("SendmailOptionNotComplete"));
+		 }
+		 }*/
+		// Warning 2
+		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+	}
+
 	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && ! in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
 		$text = $langs->trans("WarningPHPMail");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 71acd0e71cb..c2201c5d118 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -269,7 +269,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default 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 (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)

From 4fdde55c59ab8961dadd0d7db43aa07c0c1b7a8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 12:14:39 +0100
Subject: [PATCH 053/386] Keep empty graph if graph is called with empty data

---
 htdocs/core/class/dolgraph.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 329383160aa..ba7a67be3cb 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -594,7 +594,7 @@ class DolGraph
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	integer|null
 	 */
-	function draw($file,$fileurl='')
+	function draw($file, $fileurl='')
 	{
 		if (empty($file))
 		{
@@ -602,12 +602,17 @@ class DolGraph
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (! is_array($this->data) || count($this->data) < 1)
+		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);
 			return -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);
+		}
 		$call = "draw_".$this->_library;
 		call_user_func_array(array($this,$call), array($file,$fileurl));
 	}
@@ -822,7 +827,7 @@ class DolGraph
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_print_error('', 'Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw');
+		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
 		$firstlot=0;
 		// 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

From 42f8da7496671bab030b153b5246e975214b37ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 12:56:17 +0100
Subject: [PATCH 054/386] NEW Add trigger CONTRACT_MODIFY

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ad6b16163a5..fd1019390be 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1268,26 +1268,14 @@ class Contrat extends CommonObject
 		{
 			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('CONTRACT_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 				}
 			}
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
-			{
-				$result=$this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
 			{
 				$result=$this->insertExtraFields();
 				if ($result < 0)

From bb42589d6bd726ee864387fd14e3c5bc884faeb5 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 4 Feb 2018 12:59:02 +0100
Subject: [PATCH 055/386] Fix paging when filtering

If total resultset is smaller then paging size (filtering), goto and
load page 0.
If total resultset is smaller the limit, no need to do paging.
---
 .../modulebuilder/template/myobject_list.php  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 71894b8659b..f7bf371c289 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -253,17 +253,30 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 }
-
-$sql.= $db->plimit($limit+1, $offset);
-
-$resql=$db->query($sql);
-if (! $resql)
+if (($page * $limit) > $nbtotalofrecords) 
 {
-	dol_print_error($db);
-	exit;
+	$page = 0;
+	$offset = 0; 
 }
+// if total resultset is smaller the limit, no need to do paging.
+if ($limit > $nbtotalofrecords)
+{
+	$resql = $result;
+	$num = $nbtotalofrecords;
+} 
+else 
+{
+	$sql.= $db->plimit($limit+1, $offset);
 
-$num = $db->num_rows($resql);
+	$resql=$db->query($sql);
+	if (! $resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$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)
@@ -317,7 +330,7 @@ if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->tr
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?page=0">';
+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="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

From 83e1545720405ebc93c1c66e2f9c529073712fd7 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 4 Feb 2018 12:59:30 +0100
Subject: [PATCH 056/386] Fix comment

---
 htdocs/modulebuilder/template/myobject_list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index f7bf371c289..7c3575401e4 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -253,6 +253,7 @@ 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;

From aff6bced4a0f96488c71a6aed78d889723ff3f1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 13:20:47 +0100
Subject: [PATCH 057/386] Fix default value was not save at creation

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 1161fb8abd8..fd3c60a5b85 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -168,7 +168,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $notused, $default, $computed, $entity, $langfile, $enabled);
+			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $notused, $default_value, $computed, $entity, $langfile, $enabled);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{

From ec15048964636cf8fef91cfecfe6cc20874a5ef4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Feb 2018 14:34:31 +0100
Subject: [PATCH 058/386] Fix init category selected

---
 htdocs/product/card.php | 5 +++--
 htdocs/societe/card.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a54f1d90885..861c46328df 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1106,11 +1106,11 @@ else
             print "</td></tr>";
         //}
 
-		if($conf->categorie->enabled) {
+		if ($conf->categorie->enabled) {
 			// 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, $arrayselected, '', 0, '', 0, '100%');
+			print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
 			print "</td></tr>";
 		}
 
@@ -1464,6 +1464,7 @@ else
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
 				$cats = $c->containing($object->id,Categorie::TYPE_PRODUCT);
+				$arrayselected=array();
 				foreach($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f05f6993322..9fdad8916e1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1909,6 +1909,7 @@ else
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
 					$c = new Categorie($db);
 					$cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
+					$arrayselected=array();
 					foreach ($cats as $cat) {
 						$arrayselected[] = $cat->id;
 					}
@@ -1923,6 +1924,7 @@ else
 					$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;
 					}

From 2930fc7dfa85a0c5db9cefe58e716572867097e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 02:27:31 +0100
Subject: [PATCH 059/386] Fix missing mainmenu and leftmenu into menu
 definition

---
 htdocs/core/menus/init_menu_auguria.sql | 13 +++++++------
 htdocs/core/menus/standard/eldy.lib.php | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index c7339a55ea0..9704f3df684 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -168,9 +168,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->supplier_invoice->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'billing', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->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->supplier_invoice->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'billing', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __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->supplier_invoice->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'billing', '', 1600__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'List', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 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->supplier_invoice->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'billing', '', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->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->supplier_invoice->enabled', __HANDLER__, 'left', 1605__+MAX_llx_menu__, 'billing', '', 1603__+MAX_llx_menu__, '/fourn/facture/rapport.php?leftmenu=suppliers_bills', 'Reporting', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 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->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'billing', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __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->supplier_invoice->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'billing', 'suppliers_bills_payment', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->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->supplier_invoice->enabled', __HANDLER__, 'left', 1605__+MAX_llx_menu__, 'billing', 'suppliers_bills_reports', 1603__+MAX_llx_menu__, '/fourn/facture/rapport.php?leftmenu=suppliers_bills_reports', 'Reporting', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 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->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills_stats&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 -- Billing - Customer invoice
 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->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
@@ -182,9 +183,9 @@ 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->facture->enabled', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 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->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __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->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', 'customers_bills_payment', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', 'customers_bills_reports', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 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->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
 -- Billing - Orders to bill
 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->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'billing', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
 -- Donations
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8c14f0e3df2..81791c993f2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -811,15 +811,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 				$newmenu->add("/compta/facture/invoicetemplate_list.php",$langs->trans("ListOfTemplates"),1,$user->rights->facture->creer);    // No need to see recurring invoices, if user has no permission to create invoice.
 
-				$newmenu->add("/compta/paiement/list.php?leftmenu=customer_bills_payment",$langs->trans("Payments"),1,$user->rights->facture->lire);
+				$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))
 				{
-					$newmenu->add("/compta/paiement/avalider.php",$langs->trans("MenuToValid"),2,$user->rights->facture->lire);
+					$newmenu->add("/compta/paiement/avalider.php",$langs->trans("MenuToValid"),2,$user->rights->facture->lire,'',$mainmenu,'customer_bills_tovalid');
 				}
-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customer_bills_reports",$langs->trans("Reportings"),2,$user->rights->facture->lire);
+				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports",$langs->trans("Reportings"),2,$user->rights->facture->lire,'',$mainmenu,'customers_bills_reports');
 
-				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customer_bills_stats", $langs->trans("Statistics"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"),1,$user->rights->facture->lire,'',$mainmenu,'customers_bills_stats');
 			}
 
 			// Suppliers invoices
@@ -836,11 +836,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$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", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
+				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
 
-				$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
+				$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
 
-				$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
+				$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');
 			}
 
 			// Orders

From 13e71306ac7bf92dfb3d6b15b2d34939ab42dcd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 02:27:48 +0100
Subject: [PATCH 060/386] Start to work on payment import

---
 htdocs/core/modules/modPaypal.class.php | 15 +++++++++++++++
 htdocs/core/modules/modStripe.class.php | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 227540e825e..08f1c77e6d6 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -107,6 +107,21 @@ class modPaypal extends DolibarrModules
         // 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',
+        'type'=>'left',			                // This is a Left menu entry
+        'titre'=>'PaypalImportPayment',
+        'url'=>'/paypal/importpayments.php',
+        'langs'=>'paypal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        'position'=>501,
+        'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',  // 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->banque->consolidate',	// 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:
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 61fe75d8f2e..7e6b15dee74 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -92,8 +92,22 @@ class modStripe extends DolibarrModules
         $r=0;
 
         // 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_stripe',
+        	'type'=>'left',			                // This is a Left menu entry
+	        'titre'=>'StripeImportPayment',
+	        'url'=>'/stripe/importpayments.php',
+	        'langs'=>'stripe',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+	        'position'=>500,
+	        'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',  // 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->banque->consolidate',	// 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;

From 9731a7fedc9703408e4ccaf8ff531265e0c1a970 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 15:31:40 +0100
Subject: [PATCH 061/386] Code for update more similar than insert

---
 htdocs/core/class/commonobject.class.php | 48 ++++++++++++++++--------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 18d3f203dac..62eef427bd9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1345,6 +1345,7 @@ abstract class CommonObject
 	 *	@param	User|string	$fuser		Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
 	 *  @param  string      $trigkey    Trigger key to run (in most cases something like 'XXX_MODIFY')
 	 *	@return	int						<0 if KO, >0 if OK
+	 *  @see updateExtraField
 	 */
 	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='')
 	{
@@ -4511,6 +4512,7 @@ abstract class CommonObject
 	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
 	 *  @param	User		$userused		Object user
 	 *  @return int 						-1=error, O=did nothing, 1=OK
+	 *  @see updateExtraField, setValueFrom
 	 */
 	function insertExtraFields($trigger='',$userused=null)
 	{
@@ -4666,16 +4668,14 @@ abstract class CommonObject
 				$this->error=$this->db->lasterror();
 				$error++;
 			}
-			else
+
+			if (! $error && $trigger)
 			{
-				if ($trigger)
-				{
-					// Call trigger
-					$this->context=array('extrafieldaddupdate'=>1);
-					$result=$this->call_trigger($trigger, $userused);
-					if ($result < 0) $error++;
-					// End call trigger
-				}
+				// Call trigger
+				$this->context=array('extrafieldaddupdate'=>1);
+				$result=$this->call_trigger($trigger, $userused);
+				if ($result < 0) $error++;
+				// End call trigger
 			}
 
 			if ($error)
@@ -4694,15 +4694,19 @@ abstract class CommonObject
 
 	/**
 	 *	Update an exta field value for the current object.
-	 *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
-	 *  This function delte record with all extrafields and insert them again from the array $this->array_options.
+	 *  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
-	 *  @return int                 -1=error, O=did nothing, 1=OK
+	 *  @param  string      $key    		Key of the extrafield
+	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
+	 *  @param	User		$userused		Object user
+	 *  @return int                 		-1=error, O=did nothing, 1=OK
+	 *  @see setValueFrom
 	 */
-	function updateExtraField($key)
+	function updateExtraField($key, $trigger, $userused)
 	{
-		global $conf,$langs;
+		global $conf,$langs,$user;
+
+		if (empty($userused)) $userused=$user;
 
 		$error=0;
 
@@ -4769,7 +4773,21 @@ abstract class CommonObject
 			$resql = $this->db->query($sql);
 			if (! $resql)
 			{
+				$error++;
 				$this->error=$this->db->lasterror();
+			}
+
+			if (! $error && $trigger)
+			{
+				// Call trigger
+				$this->context=array('extrafieldupdate'=>1);
+				$result=$this->call_trigger($trigger, $userused);
+				if ($result < 0) $error++;
+				// End call trigger
+			}
+
+			if ($error)
+			{
 				$this->db->rollback();
 				return -1;
 			}

From 4cfec30f93829fcd1496ff387401ee24394a61d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 15:35:55 +0100
Subject: [PATCH 062/386] Start to work on PDF template for timesheet

---
 .../project/doc/pdf_timespent.modules.php     | 608 ++++++++++++++++++
 1 file changed, 608 insertions(+)
 create mode 100644 htdocs/core/modules/project/doc/pdf_timespent.modules.php

diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
new file mode 100644
index 00000000000..21853f1bbf8
--- /dev/null
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -0,0 +1,608 @@
+<?php
+/* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@capnetworks.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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/project/doc/pdf_baleine.modules.php
+ *	\ingroup    project
+ *	\brief      File of class to generate project document Baleine
+ *	\author	    Regis Houssin
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+
+/**
+ *	Class to manage generation of project document Baleine
+ */
+
+class pdf_timespent extends ModelePDFProjects
+{
+	var $emetteur;	// Objet societe qui emet
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("projects");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "timespent";
+		$this->description = $langs->trans("DocumentModelTimeSpent");
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$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 FAC_PDF_LOGO
+		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+
+		// Recupere emmetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+
+		// Defini position des colonnes
+		$this->posxref=$this->marge_gauche+1;
+		$this->posxlabel=$this->marge_gauche+25;
+		$this->posxtimespent=$this->marge_gauche+120;
+		//$this->posxprogress=$this->marge_gauche+140;
+		$this->posxdatestart=$this->marge_gauche+152;
+		$this->posxdateend=$this->marge_gauche+170;
+		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;
+		}
+	}
+
+
+	/**
+	 *	Fonction generant le projet sur le disque
+	 *
+	 *	@param	Project		$object   		Object project a generer
+	 *	@param	Translate	$outputlangs	Lang output object
+	 *	@return	int         				1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs)
+	{
+		global $conf, $hookmanager, $langs, $user;
+
+		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';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("projects");
+
+		if ($conf->projet->dir_output)
+		{
+			//$nblignes = count($object->lines);  // This is set later with array of tasks
+
+			$objectref = dol_sanitizeFileName($object->ref);
+			$dir = $conf->projet->dir_output;
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $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
+
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$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 (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_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				// Complete object by loading several other informations
+				$task = new Task($this->db);
+				$tasksarray = $task->getTasksArray(0,0,$object->id);
+
+                if (! $object->id > 0)  // Special case when used with object = specimen, we may return all lines
+                {
+                    $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
+                }
+
+				$object->lines=$tasksarray;
+				$nblignes=count($object->lines);
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Project"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
+				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
+
+				// New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+				$tab_top = 50;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 170;
+				$tab_height_newpage = 190;
+
+				// Show public note
+				$notetoshow=empty($object->note_public)?'':$object->note_public;
+				if ($notetoshow)
+				{
+					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+					$tab_top -= 2;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$nexY-$tab_top;
+
+					// Rect prend une longueur en 3eme param
+					$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);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$heightoftitleline = 10;
+				$iniY = $tab_top + $heightoftitleline + 1;
+				$curY = $tab_top + $heightoftitleline + 1;
+				$nexY = $tab_top + $heightoftitleline + 1;
+
+				// Loop on each lines
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+					$pdf->SetTextColor(0,0,0);
+
+					$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();
+
+					// Description of line
+					$ref=$object->lines[$i]->ref;
+					$libelleline=$object->lines[$i]->label;
+					//$progress=($object->lines[$i]->progress?$object->lines[$i]->progress.'%':'');
+					$datestart=dol_print_date($object->lines[$i]->date_start,'day');
+					$dateend=dol_print_date($object->lines[$i]->date_end,'day');
+					$planned_timespent=convertSecondToTime((int) $object->lines[$i]->planned_timespent,'allhourmin');
+
+					$showpricebeforepagebreak=1;
+
+					$pdf->startTransaction();
+					// Label
+					$pdf->SetXY($this->posxlabel, $curY);
+					$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+					$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.
+						// Label
+						$pdf->SetXY($this->posxlabel, $curY);
+						$posybefore=$pdf->GetY();
+						$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+						$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 == ($nblignes-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
+							$showpricebeforepagebreak=0;
+							$forcedesconsamepage=1;
+							if ($forcedesconsamepage)
+							{
+								$pdf->rollbackTransaction(true);
+								$pageposafter=$pageposbefore;
+								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+
+								$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);
+								$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+								$pdf->MultiCell(0, 3, '');		// Set interline to 3
+								$pdf->SetTextColor(0,0,0);
+
+								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+								$curY = $tab_top_newpage + $heightoftitleline + 1;
+
+								// Label
+								$pdf->SetXY($this->posxlabel, $curY);
+								$posybefore=$pdf->GetY();
+								$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+								$pageposafter=$pdf->getPage();
+								$posyafter=$pdf->GetY();
+							}
+						}
+						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
+					}
+					else	// No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+					$posYAfterDescription=$pdf->GetY();
+
+					$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 is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						//var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
+					}
+
+					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+
+					// 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, $planned_timespent?$planned_timespent:'', 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');
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 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+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					$nexY+=2;    // Passe espace entre les lignes
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						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);
+						}
+						$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 == 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);
+						}
+						$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 == 1)
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+				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
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$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 (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		Hide top bar of array
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	{
+		global $conf,$mysoc;
+
+		$heightoftitleline = 10;
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetDrawColor(128,128,128);
+
+		// Draw rect of all tab (title + lines). Rect prend une longueur en 3eme param
+		$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
+		$pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
+
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','', $default_font_size);
+
+		$pdf->SetXY($this->posxref, $tab_top+1);
+		$pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L');
+
+		$pdf->SetXY($this->posxlabel, $tab_top+1);
+		$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->SetXY($this->posxprogress, $tab_top+1);
+		//$pdf->MultiCell($this->posxdatestart-$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');
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param  Project		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	{
+		global $langs,$conf,$mysoc;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
+
+        $posx=$this->page_largeur-$this->marge_droite-100;
+		$posy=$this->marge_haute;
+
+		$pdf->SetXY($this->marge_gauche,$posy);
+
+		// Logo
+		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		if ($mysoc->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, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+			}
+		}
+		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+
+		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$pdf->SetFont('','', $default_font_size + 2);
+
+		$posy+=6;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : " . dol_print_date($object->date_start,'day',false,$outputlangs,true), '', 'R');
+
+		$posy+=6;
+		$pdf->SetXY($posx,$posy);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
+
+		if (is_object($object->thirdparty))
+		{
+			$posy+=6;
+			$pdf->SetXY($posx,$posy);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
+		}
+
+		$pdf->SetTextColor(0,0,60);
+
+		// Add list of linked objects
+		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
+		$object->fetchObjectLinked();
+
+	    foreach($object->linkedObjects as $objecttype => $objects)
+	    {
+	        var_dump($objects);exit;
+	    	if ($objecttype == 'commande')
+	    	{
+	    		$outputlangs->load('orders');
+	    		$num=count($objects);
+	    		for ($i=0;$i<$num;$i++)
+	    		{
+	    			$posy+=4;
+	    			$pdf->SetXY($posx,$posy);
+	    			$pdf->SetFont('','', $default_font_size - 1);
+	    			$text=$objects[$i]->ref;
+	    			if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
+	    			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+	    		}
+	    	}
+	    }
+        */
+
+	}
+
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+     *
+	 *   	@param	PDF			$pdf     			PDF
+	 * 		@param	Project		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	integer
+	 */
+	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	{
+		global $conf;
+		$showdetails=$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);
+	}
+
+}
+

From 9a0dca57afd868c50aa942b2a5cd49d866a947aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 15:40:18 +0100
Subject: [PATCH 063/386] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c0583f09552..76f8e55ff15 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4564,11 +4564,11 @@ abstract class CommonObject
 	 *  Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
 	 *  This function delete record with all extrafields and insert them again from the array $this->array_options.
 	 *
-	 *  @param	bool        $notrigger      false=launch triggers after, true=disable triggers
+	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
 	 *  @param	User		$userused		Object user
 	 *  @return int 						-1=error, O=did nothing, 1=OK
 	 */
-	function insertExtraFields($notrigger=false, $userused=null)
+	function insertExtraFields($trigger='', $userused=null)
 	{
 		global $conf,$langs,$user;
 
@@ -4703,16 +4703,14 @@ abstract class CommonObject
 				$this->error=$this->db->lasterror();
 				$error++;
 			}
-			else
+
+			if (!$error && !$trigger)
 			{
-				if (!$notrigger)
-				{
-					// Call trigger
-					$this->context=array('extrafieldaddupdate'=>1);
-					$result=$this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-					if ($result < 0) $error++;
-					// End call trigger
-				}
+				// Call trigger
+				$this->context=array('extrafieldaddupdate'=>1);
+				$result=$this->call_trigger(strtoupper($trigger, $userused);
+				if ($result < 0) $error++;
+				// End call trigger
 			}
 
 			if ($error)

From 6291cb4cbe6b135f96994975d6fd5c5cd1184c61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 15:41:34 +0100
Subject: [PATCH 064/386] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 76f8e55ff15..592960670a0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4708,7 +4708,7 @@ abstract class CommonObject
 			{
 				// Call trigger
 				$this->context=array('extrafieldaddupdate'=>1);
-				$result=$this->call_trigger(strtoupper($trigger, $userused);
+				$result=$this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}

From a8ad9fb77d42e7e8fc9115afba67bfe60aa6f9ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 16:28:25 +0100
Subject: [PATCH 065/386] Fix default sort order

---
 htdocs/compta/tva/reglement.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 1a0b0699128..66099cd63db 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -97,7 +97,7 @@ $formother=new FormOther($db);
 $tva_static = new Tva($db);
 $bankstatic = new Account($db);
 
-$sql = "SELECT t.rowid, t.amount, t.label, t.datev as dv, t.datep as dp, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
+$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 AND pst.entity IN (".getEntity('c_paiement').")";
@@ -192,8 +192,8 @@ if ($result)
 	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("DateValue",$_SERVER["PHP_SELF"],"dv","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre("DateValue",$_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,'align="left"',$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"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
@@ -222,8 +222,8 @@ if ($result)
 		print "<td>".$tva_static->getNomUrl(1)."</td>\n";
         // Label
 		print "<td>".dol_trunc($obj->label,40)."</td>\n";
-        print '<td align="center">'.dol_print_date($db->jdate($obj->dv),'day')."</td>\n";
-        print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datev),'day')."</td>\n";
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
         // Type
 		print $type;
 		// Account

From 47cb9aef50fe1a0afe18572716ef2e8459adc077 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 17:07:38 +0100
Subject: [PATCH 066/386] Fix: complete labels of operation if bank journal

---
 htdocs/accountancy/journal/bankjournal.php    | 57 +++++++++++--------
 .../compta/paiement/class/paiement.class.php  | 32 +++++++++--
 htdocs/compta/tva/class/tva.class.php         |  8 ++-
 3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index fcb24f7757a..8b9215f5c4c 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -271,7 +271,8 @@ if ($result) {
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+					$paymentstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2, '', '');		// TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
 					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
 				} else if ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
@@ -320,11 +321,12 @@ if ($result) {
 					}
 				} else if ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
+					$paymentdonstatic->ref = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
 					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
-				} else if ($links[$key]['type'] == 'payment_vat') {
+				} else if ($links[$key]['type'] == 'payment_vat') {				// Payment VAT
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
@@ -428,11 +430,10 @@ if (! $error && $action == 'writebookkeeping') {
 			{
 				if ($mt)
 				{
-					$reflabel = $langs->trans("Bank");
-					$reflabel.= ' '.$val['bank_account_ref'];
-					if (! empty($val['soclib'])) {
-						$reflabel .= " - " . dol_string_nohtmltag($val['soclib']);
-					}
+					$reflabel = '';
+					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']);
 
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -486,7 +487,9 @@ if (! $error && $action == 'writebookkeeping') {
 				foreach ( $tabtp[$key] as $k => $mt ) {
 					if ($mt)
 					{
-						$reflabel = dol_string_nohtmltag($val['soclib']);
+						$reflabel = '';
+						if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib']?" - ":"");
+						$reflabel.= dol_string_nohtmltag($val['soclib']);
 
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
@@ -586,7 +589,9 @@ if (! $error && $action == 'writebookkeeping') {
 				foreach ( $tabbq[$key] as $k => $mt ) {
 					if ($mt)
 					{
-						$reflabel = 'WaitingAccount';
+						$reflabel = '';
+						if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
+						$reflabel.= dol_string_nohtmltag('WaitingAccount');
 
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
@@ -717,11 +722,10 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 		foreach ( $tabbq[$key] as $k => $mt ) {
 			if ($mt)
 			{
-				$reflabel = $langs->trans("Bank");
-				$reflabel.= ' '.$val['bank_account_ref'];
-				if (! empty($val['soclib'])) {
-					$reflabel .= " - " . dol_string_nohtmltag($val['soclib']);
-				}
+				$reflabel = '';
+				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']);
 
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
@@ -743,7 +747,9 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($mt)
 				{
-					$reflabel = dol_string_nohtmltag($val['soclib']);
+					$reflabel = '';
+					if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib']?" - ":"");
+					$reflabel.= dol_string_nohtmltag($val['soclib']);
 
 					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
@@ -773,7 +779,9 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				if ($mt)
 				{
-					$reflabel = 'WaitingAccount';
+					$reflabel = '';
+					if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
+					$reflabel.= dol_string_nohtmltag('WaitingAccount');
 
 					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
@@ -904,11 +912,10 @@ if (empty($action) || $action == 'view') {
 		{
 			if ($mt)
 			{
-				$reflabel = $langs->trans("Bank");
-				$reflabel.= ' '.$val['bank_account_ref'];
-				if (! empty($val['soclib'])) {
-					$reflabel .= " - " . $val['soclib'];
-				}
+				$reflabel = '';
+				if (! empty($val['lib'])) $reflabel .= $val['lib'] . " - ";
+				$reflabel.= $langs->trans("Bank").' '.$val['bank_account_ref'];
+				if (! empty($val['soclib'])) $reflabel .= " - " . $val['soclib'];
 
 				//var_dump($tabpay[$key]);
 				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
@@ -949,7 +956,9 @@ if (empty($action) || $action == 'view') {
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($mt)
 				{
-					$reflabel = $val['soclib'];
+					$reflabel = '';
+					if (! empty($val['lib'])) $reflabel .= $val['lib'] . ($val['soclib']?" - ":"");
+					$reflabel.= $val['soclib'];
 
 					print '<!-- Thirdparty bank.rowid='.$key.' -->';
 					print '<tr class="oddeven">';
@@ -1024,7 +1033,9 @@ if (empty($action) || $action == 'view') {
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				if ($mt)
 				{
-					$reflabel = 'WaitingAccount';
+					$reflabel = '';
+					if (! empty($val['lib'])) $reflabel .= $val['lib'] . " - ";
+					$reflabel.= 'WaitingAccount';
 
 					print '<!-- Wait bank.rowid='.$key.' -->';
 					print '<tr class="oddeven">';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 00ae831dc3a..fdcfc89c4e0 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1042,12 +1042,15 @@ 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
 	 *	@return	string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
+	function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0)
 	{
 		global $langs;
 
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
 		$result='';
         $label = $langs->trans("ShowPayment").': '.$this->ref;
         if ($mode == 'withlistofinvoices')
@@ -1064,12 +1067,31 @@ class Paiement extends CommonObject
             	}
             }
         }
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+
+        $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;
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.($this->ref?$this->ref:$this->id).$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 && $withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index b951c05f574..43b525ff230 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -655,9 +655,11 @@ class Tva extends CommonObject
      *  @param	int  	$notooltip		1=Disable tooltip
 	 *	@return	string					Chaine with URL
 	 */
-	function getNomUrl($withpicto=0, $option='',  $notooltip=0)
+	function getNomUrl($withpicto=0, $option='', $notooltip=0)
 	{
-		global $langs;
+		global $langs, $conf;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result='';
         $label=$langs->trans("ShowVatPayment").': '.$this->ref;
@@ -690,7 +692,7 @@ class Tva extends CommonObject
 
 		return $result;
 	}
-	
+
 	/**
      * 	Return amount of payments already done
      *

From bd00b514bff8d1c2cb61985f684c82dcbc1d97e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 20:19:00 +0100
Subject: [PATCH 067/386] Delete intervention API

---
 .../class/api_interventions.class.php         | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 23073737d7e..3f5fad3d74f 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -284,6 +284,39 @@ class Interventions extends DolibarrApi
         }
     }
 
+    /**
+     * Delete order
+     *
+     * @param   int     $id         Order ID
+     * @return  array
+     */
+    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('commande',$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);
+    	}
+
+    	return array(
+	    	'success' => array(
+		    	'code' => 200,
+		    	'message' => 'Intervention deleted'
+	    	)
+    	);
+
+    }
+
     /**
      * Validate an intervention
      *

From 22b95b1c4393415c14ab9e08e827dc70efb544ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 23:06:48 +0100
Subject: [PATCH 068/386] Simpler top menu code

---
 htdocs/core/menus/standard/auguria.lib.php | 3 ++-
 htdocs/core/menus/standard/eldy.lib.php    | 3 ++-
 htdocs/core/menus/standard/empty.php       | 3 ++-
 htdocs/theme/eldy/style.css.php            | 6 +-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 4dae9628c30..b7f2d220868 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -169,7 +169,8 @@ function print_start_menu_entry_auguria($idsel,$classname,$showmode)
 	if ($showmode)
 	{
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
-		print '<div class="tmenuleft tmenusep"></div><div class="tmenucenter">';
+		//print '<div class="tmenuleft tmenusep"></div>';
+		print '<div class="tmenucenter">';
 	}
 }
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d2dba66c53c..fed1cecdc23 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -361,7 +361,8 @@ function print_start_menu_entry($idsel,$classname,$showmode)
 	if ($showmode)
 	{
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
-		print '<div class="tmenuleft tmenusep"></div><div class="tmenucenter">';
+		//print '<div class="tmenuleft tmenusep"></div>';
+		print '<div class="tmenucenter">';
 	}
 }
 
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index ce85e583432..f761b593fb7 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -536,7 +536,8 @@ function print_start_menu_entry_empty($idsel,$classname,$showmode)
 	if ($showmode)
 	{
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
-		print '<div class="tmenuleft tmenusep"></div><div class="tmenucenter">';
+		//print '<div class="tmenuleft tmenusep"></div>';
+		print '<div class="tmenucenter">';
 	}
 }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 69038535669..77e25446fa9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1541,12 +1541,8 @@ div.menu_titre {
 }
 .mainmenuaspan
 {
-<?php if ($disableimages) { ?>
-	padding-<?php print $left; ?>: 4px;
+	padding-<?php print $left; ?>: 2px;
 	padding-<?php print $right; ?>: 2px;
-<?php } else { ?>
-	padding-<?php print $right; ?>: 4px;
-<?php } ?>
 }
 
 div.mainmenu {

From ad621f4035842b70589a7a171b374f9c2e43c74b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Feb 2018 23:17:05 +0100
Subject: [PATCH 069/386] CSS

---
 htdocs/theme/eldy/style.css.php |  6 +++---
 htdocs/theme/md/style.css.php   | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 77e25446fa9..9d90d458363 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1445,14 +1445,14 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
     font-weight: normal;
-	padding: 0px 5px 0px 3px;
+	padding: 0px 4px 0px 4px;
 	white-space: nowrap;
 	color: #<?php echo $colortextbackhmenu; ?>;
     text-decoration: none;
 }
 a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
 	font-weight: normal;
-	padding: 0px 5px 0px 3px;
+	padding: 0px 4px 0px 4px;
 	margin: 0px 0px 0px 0px;
 	white-space: nowrap;
 	color: #<?php echo $colortextbackhmenu; ?>;
@@ -5014,8 +5014,8 @@ div.tabsElem a.tab {
     	margin-left: 1px;
 	}
 	.mainmenuaspan {
-    	/*display: none;*/
   		font-size: 10px;
+  		padding-left: 0;
   		padding-right: 0;
     }
     .topmenuimage {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3cb7ae4d7a9..7cb107b66a5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1566,12 +1566,8 @@ div.menu_titre {
 }
 .mainmenuaspan
 {
-<?php if ($disableimages) { ?>
-	padding-<?php print $left; ?>: 4px;
+	padding-<?php print $left; ?>: 2px;
 	padding-<?php print $right; ?>: 2px;
-<?php } else { ?>
-	padding-<?php print $right; ?>: 4px;
-<?php } ?>
 }
 
 div.mainmenu {
@@ -5022,7 +5018,6 @@ border-top-right-radius: 6px;
   		color: #<?php echo $colortextbackhmenu; ?>;
 	}
 	.mainmenuaspan {
-    	/*display: none;*/
   		font-size: 12px;
     }
     .topmenuimage {
@@ -5047,8 +5042,9 @@ border-top-right-radius: 6px;
   		text-overflow: clip;
 	}
 	.mainmenuaspan {
-    	/*display: none;*/
   		font-size: 10px;
+  		padding-left: 0;
+  		padding-right: 0;
     }
     .topmenuimage {
     	background-size: 20px auto;

From b1f43a14bd1b9c4f719340f6b0f018f30e651d09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Feb 2018 02:29:55 +0100
Subject: [PATCH 070/386] CSS

---
 htdocs/theme/eldy/style.css.php | 5 +++--
 htdocs/theme/md/style.css.php   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9d90d458363..e287c710bfa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2945,14 +2945,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     border: none;
 }*/
 .boxstatsborder {
-    border: 1px solid #CCC !important;
+    /* border: 1px solid #CCC !important; */
 }
 .boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
-    border: 1px solid #CCC;
+    /* border: 1px solid #CCC; */
     text-align: center;
     border-radius: 2px;
+    background: #eee;
 }
 .boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7cb107b66a5..545cce84f20 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3020,14 +3020,15 @@ div .tdtop {
     border: none;
 }*/
 .boxstatsborder {
-    border: 1px solid #CCC !important;
+    /* border: 1px solid #CCC !important; */
 }
 .boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
-    border: 1px solid #CCC;
+    /* border: 1px solid #CCC; */
     text-align: center;
     border-radius: 2px;
+    background: #eee;
 }
 .boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;

From c39f5ed26a54774563860d80829e8dcfda82fd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 7 Feb 2018 09:00:47 +0100
Subject: [PATCH 071/386] Update pdf_rouget.modules.php

---
 htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 1761235d039..f7eca910b7e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2014-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
@@ -516,6 +517,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$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)
 					{
@@ -532,6 +534,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$pdf->AddPage();
 						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 				}
 

From 1cff0593f832e607e9535f1276f2dfdaa9bf66d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 7 Feb 2018 10:42:21 +0100
Subject: [PATCH 072/386] Update modProduct.class.php

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

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 5f44b843e1f..27dbc7c53ef 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -162,7 +162,7 @@ class modProduct extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly']='NPR';
 		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'));
-		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'BuyingPrice','pf.quantity'=>'QtyMin','pf.remise_percent'=>'DiscountQtyMin'));
+		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'BuyingPrice','pf.quantity'=>'QtyMin','pf.remise_percent'=>'DiscountQtyMin','pf.delivery_time_days'=>'NbDaysToDelivery'));
 		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->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('group_concat(cat.label)'=>'Categories'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel','l.description'=>'TranslatedDescription','l.note'=>'TranslatedNote'));
@@ -170,7 +170,7 @@ class modProduct extends DolibarrModules
 		$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_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.width'=>"Numeric",'p.height'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"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'));
-		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'));
+		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'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array("group_concat(cat.label)"=>'Text'));
 		$this->export_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon

From 131eed97a1f68a4f7b0c40b1b9e1c5b1c665c46c Mon Sep 17 00:00:00 2001
From: jh z <1329485053@qq.com>
Date: Wed, 7 Feb 2018 22:56:14 +0800
Subject: [PATCH 073/386] New: Add a tab of Docments to expedition module

---
 htdocs/core/lib/sendings.lib.php              |  11 +
 .../tpl/document_actions_post_headers.tpl.php |   2 +-
 htdocs/expedition/document.php                | 192 ++++++++++++++++++
 3 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/expedition/document.php

diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 3f5c8b8077c..2a9f79b8399 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -79,6 +79,17 @@ function shipping_prepare_head($object)
     	$h++;
 	}
 
+	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);
+	$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;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$h++;
+
     $nbNote = 0;
     if (!empty($object->note_private)) $nbNote++;
     if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 8380d5c23f5..8b24605607d 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -62,7 +62,7 @@ $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','project','project_task','expensereport','tax')))
+	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax')))
 	{
 		$savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
 	}
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
new file mode 100644
index 00000000000..87d0932c64b
--- /dev/null
+++ b/htdocs/expedition/document.php
@@ -0,0 +1,192 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/expedition/document.php
+ *	\ingroup    expedition
+ *	\brief      Management page of documents attached to an expedition
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+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/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';
+if (! empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+}
+
+
+$langs->load('companies');
+$langs->load('other');
+
+$action		= GETPOST('action','aZ09');
+$confirm	= GETPOST('confirm');
+$id			= GETPOST('id','int');
+$ref		= GETPOST('ref');
+
+// Security check
+if ($user->societe_id)
+{
+	$socid = $user->societe_id;
+}
+$result=restrictedArea($user,'expedition',$id,'');
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+$object = new Expedition($db);
+
+
+/*
+ * Actions
+ */
+if ($object->fetch($id))
+{
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
+}
+
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+
+$form = new Form($db);
+
+if ($id > 0 || ! empty($ref)){
+	if ($object->fetch($id, $ref)){
+		$object->fetch_thirdparty();
+
+		$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');
+	
+
+		// Construit liste des fichiers
+		$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'];
+		}
+
+		// Shipment card
+		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/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);
+
+		// 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 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="' . $_SESSION['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>';
+
+		// Order card
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
+
+		print '<table class="border" 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">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+		print "</table>\n";
+
+		print "</div>\n";
+
+		print dol_fiche_end();
+
+		$modulepart = 'expedition';
+		$permission = $user->rights->expedition->creer;
+		$permtoedit = $user->rights->expedition->creer;
+		$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;
+}
+
+
+llxFooter();
+
+$db->close();

From 8847293527a098c5de27a544073f1137dca85c38 Mon Sep 17 00:00:00 2001
From: John <john.botella@atm-consulting.fr>
Date: Thu, 8 Feb 2018 12:25:30 +0100
Subject: [PATCH 074/386] Add new html containers  and somme html5 data-*  for
 contract card.

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index ae1178adf9a..aedb8f639a7 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1499,8 +1499,10 @@ else
 
 		// Title line for service
         $cursorline=1;
+        print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
         while ($cursorline <= $nbofservices)
         {
+        	print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
             print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="updateline">';
@@ -2015,10 +2017,12 @@ else
 
                 print '</form>';
             }
-
+            
+            print '</div>';
             $cursorline++;
         }
-
+        print '</div>';
+        
 		// Form to add new line
         if ($user->rights->contrat->creer && ($object->statut == 0))
         {

From f5ace81116681974d4bb29ebceafe8cefb94f972 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 13:07:05 +0100
Subject: [PATCH 075/386] Update myobject_list.php

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

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 7c3575401e4..ef384edb818 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -260,7 +260,7 @@ if (($page * $limit) > $nbtotalofrecords)
 	$offset = 0; 
 }
 // if total resultset is smaller the limit, no need to do paging.
-if ($limit > $nbtotalofrecords)
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$resql = $result;
 	$num = $nbtotalofrecords;

From 9c954de0811a9f39a127afef7fbc9f0d248c9f8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 14:25:44 +0100
Subject: [PATCH 076/386] Error management

---
 htdocs/comm/card.php                               | 6 +++---
 htdocs/expensereport/class/expensereport.class.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 82a3c621db8..6dfd05354d8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -176,7 +176,7 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	// update order min amount
 	if ($action == 'setorder_min_amount')
 	{
@@ -412,7 +412,7 @@ if ($object->id > 0)
 
 	    print '</td>';
 	    print '</tr>';
-		
+
 		print '<tr class="nowrap">';
 	    print '<td>';
 	    print $form->editfieldkey("OrderMinAmount",'order_min_amount',$object->order_min_amount,$object,$user->rights->societe->creer);
@@ -422,7 +422,7 @@ if ($object->id > 0)
 	    print '</td>';
 	    print '</tr>';
 	}
-	
+
 
 	// Multiprice level
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 2052b63fe0c..b1523f3bbf9 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1091,7 +1091,7 @@ class ExpenseReport extends CommonObject
 		{
             $num = $this->ref;
         }
-        if (empty($num)) return -1;
+        if (empty($num) || $num < 0) return -1;
 
         $this->newref = $num;
 

From b56da9c11ee4291d667151cd2cea4e4d9df12b1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 15:11:05 +0100
Subject: [PATCH 077/386] Better balance css columns in dashboard

---
 htdocs/index.php                |  6 ++----
 htdocs/theme/eldy/style.css.php | 12 ++++++++++++
 htdocs/theme/md/style.css.php   | 12 ++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index b01e37927c4..3eb1aa2285a 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -616,20 +616,18 @@ print '<div class="fichecenter fichecenterbis">';
 
 $boxlist.='<div class="twocolumns">';
 
-$boxlist.='<div class="fichehalfleft boxhalfleft" id="boxhalfleft">';
+$boxlist.='<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
 
 $boxlist.=$boxwork;
 $boxlist.=$resultboxes['boxlista'];
 
 $boxlist.= '</div>';
 
-$boxlist.= '<div class="fichehalfright boxhalfright" id="boxhalfright">';
-$boxlist.= '<div class="ficheaddleft">';
+$boxlist.= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
 $boxlist.=$boxstat;
 $boxlist.=$resultboxes['boxlistb'];
 
-$boxlist.= '</div>';
 $boxlist.= '</div>';
 $boxlist.= "\n";
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index e287c710bfa..3d3d5b2c63e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1214,6 +1214,12 @@ div.ficheaddleft {
 	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
+div.firstcolumn div.box {
+	padding-right: 10px;
+}
+div.secondcolumn div.box {
+	padding-left: 10px;
+}
 /* Force values on one colum for small screen */
 @media only screen and (max-width: 1000px)
 {
@@ -1251,6 +1257,12 @@ div.ficheaddleft {
     	<?php print "padding-".$left.": 0px;\n"; ?>
     	margin-top: 10px;
     }
+    div.firstcolumn div.box {
+		padding-right: 0px;
+	}
+	div.secondcolumn div.box {
+		padding-left: 0px;
+	}
 }
 
 /* For table into table into card */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 545cce84f20..d53d47d1637 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1223,6 +1223,12 @@ div.ficheaddleft {
 	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
+div.firstcolumn div.box {
+	padding-right: 10px;
+}
+div.secondcolumn div.box {
+	padding-left: 10px;
+}
 /* Force values on one colum for small screen */
 @media only screen and (max-width: 900px)
 {
@@ -1261,6 +1267,12 @@ div.ficheaddleft {
     	<?php print "padding-".$left.": 0px;\n"; ?>
     	margin-top: 10px;
     }
+    div.firstcolumn div.box {
+		padding-right: 0px;
+	}
+	div.secondcolumn div.box {
+		padding-left: 0px;
+	}
 }
 
 /* For table into table into card */

From ea24a8a7a78364e6741d13155a0c55515aef8e65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 15:58:00 +0100
Subject: [PATCH 078/386] Add migration process for 8.0 into travis

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 10a2b6e8347..13ac2ae1d62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -327,6 +327,9 @@ script:
   php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
   php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
   php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
+  php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
+  php upgrade2.php 7.0.0 8.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade700800-2.log
+  php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
   cd -
   set +e
   echo

From 8240b6b5f3f8edf9a032a6a2055a8804afe88e6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 16:00:09 +0100
Subject: [PATCH 079/386] travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 13ac2ae1d62..b3e57791fc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -328,7 +328,7 @@ script:
   php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
   php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
   php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
-  php upgrade2.php 7.0.0 8.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade700800-2.log
+  php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
   php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
   cd -
   set +e

From 91bed7c01482a23bd4033ffdce8275bc9b43a2e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 16:13:12 +0100
Subject: [PATCH 080/386] FIX #8079

---
 htdocs/compta/bank/bankentries_list.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 380392c6805..78e95180dc5 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -924,6 +924,7 @@ if ($resql)
 
     $balance = 0;    // For balance
 	$balancecalculated = false;
+	$posconciliatecol = 0;
 
 	// Loop on each record
 	$sign = 1;
@@ -1347,7 +1348,11 @@ if ($resql)
             	}
         	}
         	print '</td>';
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i)
+            {
+            	$totalarray['nbfield']++;
+            	$posconciliatecol = $totalarray['nbfield'];
+            }
     	}
 
         if (! empty($arrayfields['b.conciliated']['checked']))
@@ -1430,6 +1435,12 @@ if ($resql)
 	        }
 	        elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
 	        elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';
+	        elseif ($i == $posconciliatecol)
+	        {
+	        	print '<td>';
+	        	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>';

From 490e0939269ffaf4d215a237e42bd9b7d350e414 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 16:41:50 +0100
Subject: [PATCH 081/386] Fix look and feel v7

---
 htdocs/compta/bank/bankentries_list.php | 56 +++++++++++++++----------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 78e95180dc5..c6baf1c47f1 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -383,12 +383,14 @@ if (dol_strlen($search_dv_start) > 0) $param .= '&search_start_dvmonth=' . GETPO
 if (dol_strlen($search_dv_end) > 0)   $param .= '&search_end_dvmonth=' . GETPOST('search_end_dvmonth', 'int') . '&search_end_dvday=' . GETPOST('search_end_dvday', 'int') . '&search_end_dvyear=' . GETPOST('search_end_dvyear', 'int');
 if ($search_req_nb) $param.='&amp;req_nb='.urlencode($search_req_nb);
 if (GETPOST("thirdparty")) $param.='&amp;thirdparty='.urlencode(GETPOST("thirdparty"));
-if ($optioncss != '')       $param.='&optioncss='.$optioncss;
+if ($optioncss != '')      $param.='&optioncss='.$optioncss;
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 $options = array();
 
+$buttonreconcile = '';
+
 if ($id > 0 || ! empty($ref))
 {
 	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
@@ -420,18 +422,19 @@ if ($id > 0 || ! empty($ref))
 
     if ($action != 'reconcile')
     {
-        print '<div class="tabsAction">';
+        //print '<div class="tabsAction">';
 
-        if ($object->canBeConciliated() > 0) {
+        if ($object->canBeConciliated() > 0)
+        {
             // If not cash account and can be reconciliate
             if ($user->rights->banque->consolidate) {
-                print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
+            	$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
             } else {
-                print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+            	$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
         }
 
-        print '</div>';
+        //print '</div>';
     }
 }
 else
@@ -585,7 +588,7 @@ if ($resql)
 	    $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=".$id." AND num_releve IS NOT NULL";
+	    $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><br>';
@@ -614,17 +617,17 @@ if ($resql)
 	    {
 	        dol_print_error($db);
 	    }
-        /**
-         * Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
-         */
-        if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE == 1) {
-            print '
-    <script type="text/javascript">
-    	$("#num_releve").val("' . $last_releve . '");
-    </script>
-    ';
-        }
-	    print '<br><br>';
+
+		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
+		if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE == 1)
+		{
+			print '
+			    <script type="text/javascript">
+			    	$("#num_releve").val("' . $last_releve . '");
+			    </script>
+			';
+		}
+		print '<br><br>';
 	}
 
 	// Form to add a transaction with no invoice
@@ -721,11 +724,6 @@ if ($resql)
 
 	// Title
 	$bankcateg=new BankCateg($db);
-	$morehtml='<div class="inline-block">';
-	$morehtml.= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
-	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" class="flat right width25" value="'.($page+1).'">';
-	$morehtml.='/'.$nbtotalofpages.' ';
-	$morehtml.='</div>';
 
 	$addbutton = '';
 	if ($action != 'addline' && $action != 'reconcile')
@@ -754,6 +752,18 @@ if ($resql)
 			$addbutton = '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
 		}
 	}
+
+	$morehtml='<div class="inline-block '.(($buttonreconcile || $addbutton)?'marginrightonly':'').'">';
+	$morehtml.= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
+	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" class="flat right width25" value="'.($page+1).'">';
+	$morehtml.='/'.$nbtotalofpages.' ';
+	$morehtml.='</div>';
+
+	if ($action != 'addline' && $action != 'reconcile')
+	{
+		$morehtml.=$buttonreconcile;
+	}
+
 	$morehtml.=$addbutton;
 
 	$picto='title_bank';

From 493a9a72897e8d8cf0c8de29e17a1148cfc8e966 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 16:49:28 +0100
Subject: [PATCH 082/386] Fix td balance

---
 htdocs/compta/bank/bankentries_list.php | 2 +-
 htdocs/langs/en_US/errors.lang          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c6baf1c47f1..692df2fcb22 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1022,7 +1022,7 @@ if ($resql)
 				print '<td align="right">';
             	print price(price2num($balance, 'MT'), 1, $langs);
 				print '</td>';
-				print '<td colspan="'.($tmpnbfieldafterbalance+2).'">';
+				print '<td colspan="'.($tmpnbfieldafterbalance+3).'">';
 				print '</td>';
             	print '</tr>';
             }
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index e51bdfc1be0..e4ecb9f5af8 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -73,7 +73,7 @@ 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 "statut not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank statement name where entry is reported (Format YYYYMM or YYYYMMDD) 
+ErrorPleaseTypeBankTransactionReportName=Please ennter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD) 
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.

From 0f519636008d0935b03489f55993baceb2bea032 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 19:00:13 +0100
Subject: [PATCH 083/386] NEW Externalsite module can accept iframe content.

---
 htdocs/externalsite/admin/externalsite.php |  11 +-
 htdocs/externalsite/frames.php             | 127 ++++++++++++++-------
 htdocs/theme/eldy/style.css.php            |  14 +++
 htdocs/theme/md/style.css.php              |  10 ++
 4 files changed, 120 insertions(+), 42 deletions(-)

diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 3d1fb6af478..6e234c1145f 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -26,6 +26,8 @@
  *    \brief      Page de configuration du module externalsite
  */
 
+if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
@@ -50,7 +52,7 @@ if ($action == 'update')
     $db->begin();
 
 	$label  = GETPOST('EXTERNALSITE_LABEL','alpha');
-    $exturl = GETPOST('EXTERNALSITE_URL','alpha');
+    $exturl = GETPOST('EXTERNALSITE_URL','none');
 
     $i+=dolibarr_set_const($db,'EXTERNALSITE_LABEL',trim($label),'chaine',0,'',$conf->entity);
     $i+=dolibarr_set_const($db,'EXTERNALSITE_URL',trim($exturl),'chaine',0,'',$conf->entity);
@@ -104,9 +106,12 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_URL\" value=\"". (GETPOST('EXTERNALSITE_URL','alpha')?GETPOST('EXTERNALSITE_URL','alpha'):(empty($conf->global->EXTERNALSITE_URL)?'':$conf->global->EXTERNALSITE_URL)) . "\" size=\"40\"></td>";
+print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">';
+print (GETPOST('EXTERNALSITE_URL','none')?GETPOST('EXTERNALSITE_URL','none'):(empty($conf->global->EXTERNALSITE_URL)?'':$conf->global->EXTERNALSITE_URL));
+print '</textarea></td>';
 print "<td>http://localhost/myurl/";
-print "<br>http://wikipedia.org/";
+print "<br>https://wikipedia.org/";
+print "<br>&lt;iframe&gt;...&lt;/iframe&gt;";
 print "</td>";
 print "</tr>";
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 6005b8e55b6..383bfb0228e 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-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
@@ -17,55 +17,104 @@
  */
 
 /**
- *     \file       htdocs/externalsite/frames.php
- *     \ingroup    externalsite
- *     \brief      Page that build two frames: One for menu, the other for the target page to show
- *     \author	   Laurent Destailleur
+ *     \file       	htdocs/externalsite/frames.php
+ *     \ingroup    	externalsite
+ *     \brief      	Page that build two frames: One for menu, the other for the target page to show
+ *					Usage:
+ *					  mydomain.com/externalsite/frames.php to show URL set into setup
+ *					  mydomain.com/externalsite/frames.php?keyforcontent to show content defined into conf->global->$keyforcontent
  */
 
 require '../main.inc.php';
 
 $langs->load("externalsite");
 
-if (empty($conf->global->EXTERNALSITE_URL))
-{
-	llxHeader();
-	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
-	llxFooter();
-}
 
 $mainmenu=GETPOST('mainmenu', "aZ09");
 $leftmenu=GETPOST('leftmenu', "aZ09");
 $idmenu=GETPOST('idmenu', 'int');
 $theme=GETPOST('theme', 'alpha');
 $codelang=GETPOST('lang', 'aZ09');
-
-print "
-<html>
-<head>
-<title>Dolibarr frame for external web site</title>
-</head>
-
-<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
-    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
-    <frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\">
-    <noframes>
-    <body>
-
-    </body>
-    </noframes>
-</frameset>
-
-<noframes>
-<body>
-	<br><div class=\"center\">
-	Sorry, your browser is too old or not correctly configured to view this area.<br>
-	Your browser must support frames.<br>
-	</div>
-</body>
-</noframes>
-
-</html>
-";
+$keyforcontent = GETPOST('keyforcontent', 'aZ09');
 
 
+/*
+ * View
+ */
+
+if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL))
+{
+	llxHeader();
+	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
+	llxFooter();
+}
+
+if (! empty($keyforcontent))
+{
+	llxHeader();
+
+	print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight']-90).'px">';
+
+	if (! preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
+	{
+		$langs->load("errors");
+		print $langs->trans("Variablekeyforcontentmustbenamed", 'EXTERNAL_SITE_CONTENT_');
+	}
+	else if (empty($conf->global->$keyforcontent))
+	{
+		$langs->load("errors");
+		print $langs->trans("ErrorNoContentDefinedIntoVar", $keyforcontent);
+	}
+	else
+	{
+		print $conf->global->$keyforcontent;
+	}
+
+	print '<div>';
+	llxFooter();
+}
+else
+{
+	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
+	{
+		print "
+	<html>
+	<head>
+	<title>Dolibarr frame for external web site</title>
+	</head>
+
+	<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
+	    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
+	  ";
+		print '<frame name="main" src="';
+	    print $conf->global->EXTERNALSITE_URL;
+		print '">';
+		print "
+	    <noframes>
+	    <body>
+
+	    </body>
+	    </noframes>
+	</frameset>
+
+	<noframes>
+	<body>
+		<br><div class=\"center\">
+		Sorry, your browser is too old or not correctly configured to view this area.<br>
+		Your browser must support frames.<br>
+		</div>
+	</body>
+	</noframes>
+
+	</html>
+	";
+	}
+	else
+	{
+		llxHeader();
+		print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight']-90).'px">';
+		print $conf->global->EXTERNALSITE_URL;
+		print '<div>';
+		llxFooter();
+	}
+}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 95910558311..03d1ccdd8a7 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3206,6 +3206,20 @@ a.impayee:active { font-weight: bold; color: #550000; }
 a.impayee:hover { font-weight: bold; color: #550000; }
 
 
+/*
+ *  External web site
+ */
+
+.framecontent {
+    width: 100%;
+    height: 100%;
+}
+
+.framecontent iframe {
+    width: 100%;
+    height: 100%;
+}
+
 
 /*
  *  Other
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 79d17292234..7f0a522eae5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3265,6 +3265,16 @@ a.impayee:hover { font-weight: bold; color: #550000; }
 
 
 
+/*
+ *  External web site
+ */
+
+.framecontent iframe {
+    width: 100%;
+    height: 100%;
+}
+
+
 /*
  *  Other
  */

From a7682eb59f098d68043f503dcfdd986ab08ac821 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Feb 2018 21:01:34 +0100
Subject: [PATCH 084/386] CSS

---
 htdocs/theme/md/style.css.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7f0a522eae5..c9a0a9239b2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3269,12 +3269,18 @@ a.impayee:hover { font-weight: bold; color: #550000; }
  *  External web site
  */
 
+.framecontent {
+    width: 100%;
+    height: 100%;
+}
+
 .framecontent iframe {
     width: 100%;
     height: 100%;
 }
 
 
+
 /*
  *  Other
  */

From 424fc4cd13067908c37dc5984291b191f5580ce6 Mon Sep 17 00:00:00 2001
From: Romain DESCHAMPS <romain.deschamps@live.fr>
Date: Fri, 9 Feb 2018 09:11:47 +0100
Subject: [PATCH 085/386] add missing links in supplier card boxes

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6096ff03f9f..453cb6068ad 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -325,7 +325,7 @@ if ($object->id > 0)
 	    $outstandingTotal=$tmp['total_ht'];
 	    $outstandingTotalIncTax=$tmp['total_ttc'];
 	    $text=$langs->trans("OverAllSupplierProposals");
-	    $link='';
+	    $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">';
@@ -343,7 +343,7 @@ if ($object->id > 0)
 	    $outstandingTotal=$tmp['total_ht'];
 	    $outstandingTotalIncTax=$tmp['total_ttc'];
 	    $text=$langs->trans("OverAllOrders");
-	    $link='';
+	    $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">';
@@ -361,7 +361,7 @@ if ($object->id > 0)
 	    $outstandingTotalIncTax=$tmp['total_ttc'];
 
 	    $text=$langs->trans("OverAllInvoices");
-	    $link='';
+	    $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">';

From 207a4a8dc4934bb38faf33041d08caf09dd21036 Mon Sep 17 00:00:00 2001
From: Romain DESCHAMPS <romain.deschamps@live.fr>
Date: Fri, 9 Feb 2018 09:14:34 +0100
Subject: [PATCH 086/386] add missing links in cust. card boxes

---
 htdocs/comm/card.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 6dfd05354d8..81443f04d62 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -568,7 +568,7 @@ if ($object->id > 0)
 		$outstandingTotal=$tmp['total_ht'];
 		$outstandingTotalIncTax=$tmp['total_ttc'];
 		$text=$langs->trans("OverAllProposals");
-		$link='';
+		$link=DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id;
 		$icon='bill';
 		if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
 		$boxstat.='<div class="boxstats">';
@@ -580,13 +580,13 @@ if ($object->id > 0)
 
 	if (! empty($conf->commande->enabled))
 	{
-		// Box proposals
+		// Box commandes
 		$tmp = $object->getOutstandingOrders();
 		$outstandingOpened=$tmp['opened'];
 		$outstandingTotal=$tmp['total_ht'];
 		$outstandingTotalIncTax=$tmp['total_ttc'];
 		$text=$langs->trans("OverAllOrders");
-		$link='';
+		$link=DOL_URL_ROOT.'/commande/list.php?socid='.$object->id;
 		$icon='bill';
 		if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
 		$boxstat.='<div class="boxstats">';
@@ -598,12 +598,13 @@ if ($object->id > 0)
 
 	if (! empty($conf->facture->enabled))
 	{
+		// Box factures
 		$tmp = $object->getOutstandingBills();
 		$outstandingOpened=$tmp['opened'];
 		$outstandingTotal=$tmp['total_ht'];
 		$outstandingTotalIncTax=$tmp['total_ttc'];
 		$text=$langs->trans("OverAllInvoices");
-		$link='';
+		$link=DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
 		$icon='bill';
 		if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
 		$boxstat.='<div class="boxstats">';

From 6fb08dcc53b3f64c016a66909685487b1416eb7e Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 9 Feb 2018 11:50:33 +0100
Subject: [PATCH 087/386] NEW doActions on categorycard

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 1c6186d5df4..6d85b170bc7 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -66,13 +66,14 @@ $extrafields = new ExtraFields($db);
 $extralabels = $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'));
+$hookmanager->initHooks(array('categorycard','globalcard'));
 
 
 /*
  *	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
 if ($id > 0 && $removeelem > 0)
 {

From a691dec90b6d72b14a1c7e8b07da4810ff03adb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Feb 2018 16:06:23 +0100
Subject: [PATCH 088/386] Fix lose validator user in edit

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index e3009c975bc..e626f950a2b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1180,6 +1180,7 @@ else
 	                print '</tr>';
                 }
 
+                // Validator
                 if (!$edit) {
                     print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
@@ -1189,7 +1190,7 @@ else
                     print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>';
-        			print $form->select_dolusers($object->fk_user, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
+        			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
                     print '</td>';
                     print '</tr>';
                 }

From eb8664e649f41c381540f03e44f42a748310ca70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Feb 2018 16:08:28 +0100
Subject: [PATCH 089/386] NEW Can export leave requests

---
 htdocs/core/menus/standard/eldy.lib.php  |  4 +++-
 htdocs/core/modules/modHoliday.class.php | 22 ++++++++++++++++++++--
 htdocs/exports/export.php                |  6 ++++--
 htdocs/langs/en_US/holiday.lang          | 10 ++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index fed1cecdc23..5a44a3677fd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -70,7 +70,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	else $classname = 'class="tmenu"';
 	$idsel='home';
 
-	$menu->add('/index.php?mainmenu=home&amp;leftmenu=home', $langs->trans("Home"), 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);
+	$titlehome = $langs->trans("Home");
+	if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) $titlehome = '&nbsp; <span class="fa fa-home"></span> &nbsp;';
+	$menu->add('/index.php?mainmenu=home&amp;leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);
 
 	// Third parties
 	$tmpentry=array('enabled'=>(( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur');
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 75bb6a04a07..aef9eb9a7bb 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -57,7 +57,7 @@ class modHoliday 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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Leave management";
+		$this->description = "Leave requests";
 		// 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)
@@ -158,7 +158,25 @@ class modHoliday extends DolibarrModules
 
 
 		// Exports
-		$r=1;
+		$r=0;
+
+		$r++;
+		$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_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','d.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status');
+		$this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user');
+		$this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
+		$this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
+		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
 
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 92a63afcd0e..e76d8e113cf 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -69,8 +69,9 @@ $entitytoicon = array(
 	'category'     => 'category',
 	'shipment'     => 'sending',
     'shipment_line'=> 'sending',
-    'expensereport'=> 'trip',
+	'expensereport'=> 'trip',
     'expensereport_line'=> 'trip',
+	'holiday'      => 'holiday',
     'contract_line' => 'contract',
     'translation'  => 'generic'
 );
@@ -115,7 +116,8 @@ $entitytolang = array(
 	'action'       => 'Event',
 	'expensereport'=> 'ExpenseReport',
 	'expensereport_line'=> 'ExpenseReportLine',
-    'contract'     => 'Contract',
+	'holiday'      => 'TitreRequestCP',
+	'contract'     => 'Contract',
     'contract_line'=> 'ContractLine',
     'translation'  => 'Translation'
 );
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 0ed06cceb40..f73bbdeee52 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -16,7 +16,12 @@ CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
 ListeCP=List of leaves
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=Firstname of approval user
+UserForApprovalLastname=Lastname of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
@@ -30,6 +35,9 @@ 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
 EditCP=Edit
 DeleteCP=Delete
@@ -81,6 +89,8 @@ 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
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation

From 633dc507fe5150c25765b3ba60e6b0277bc6c0b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Feb 2018 20:11:32 +0100
Subject: [PATCH 090/386] NEW Use a css style for weekend in time spent

---
 htdocs/core/lib/project.lib.php    | 23 ++++++++--
 htdocs/projet/activity/perday.php  | 58 +++++++++++++++++++-------
 htdocs/projet/activity/perweek.php | 67 +++++++++++++++++++++---------
 htdocs/theme/eldy/style.css.php    |  5 +++
 4 files changed, 116 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 7106657d417..67600a7ba3e 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -996,9 +996,19 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
 				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
 
-				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+				global $daytoparse;
+				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
+				$idw = $tmparray['wday'];
 
+				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.
+				{
+					$cssweekend='weekend';
+				}
+
+				// Duration
+				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
 				$totalforeachday[$preselectedday]+=$dayWorkLoad;
 
@@ -1280,7 +1290,14 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
 					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
 
-					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').'">';
+					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.
+					{
+						$cssweekend='weekend';
+					}
+
+					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
 					if ($alreadyspent)
 					{
 						$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index f30b0ac4757..dd3aa856817 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -365,7 +365,6 @@ $nav.=' <input type="submit" name="submitdateselect" class="button valignmiddle"
 
 $picto='calendarweek';
 
-
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].($project->id > 0 ? '?id='.$project->id : '').'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="addtime">';
@@ -482,23 +481,43 @@ if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100
 else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
 print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname?'<br>('.$usertoprocess->firstname.')':'').'</td>';
-print '<td align="center">'.$langs->trans("HourStart").'</td>';
-print '<td align="center">'.$langs->trans("Duration").'</td>';
-print '<td align="center">'.$langs->trans("Note").'</td>';
-print '<td align="center"></td>';
-print "</tr>\n";
-
+print '<td class="center">'.$langs->trans("HourStart").'</td>';
 
 // 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
 $holiday = new Holiday($db);
+
 $isavailable=array();
+if (! empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
+{
+	$tmparray=explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
+	if (count($tmparray) >= 2)
+	{
+		$numstartworkingday = $tmparray[0];
+		$numendworkingday = $tmparray[1];
+	}
+}
 
 $isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse);	// $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'];
+
+$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';
+}
+
+print '<td class="center'.($cssweekend?' '.$cssweekend:'').'">'.$langs->trans("Duration").'</td>';
+print '<td class="center">'.$langs->trans("Note").'</td>';
+print '<td class="center"></td>';
+print "</tr>\n";
+
+
 if (count($tasksarray) > 0)
 {
 	//var_dump($tasksarray);				// contains only selected tasks
@@ -571,13 +590,24 @@ if (count($tasksarray) > 0)
 
 	if ($conf->use_javascript_ajax)
 	{
-		print '<tr class="liste_total">
-                <td class="liste_total" colspan="'.$colspan.'">';
-				print $langs->trans("Total");
-				//print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
-				print '</td>
-                <td class="liste_total hide0" align="center"><div id="totalDay[0]">&nbsp;</div></td>
-                <td class="liste_total"></td>
+		print '<tr class="liste_total">';
+		print '<td class="liste_total" colspan="'.$colspan.'">';
+		print $langs->trans("Total");
+		//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';
+		}
+
+		print '<td class="liste_total hide0 center'.($cssweekend?' '.$cssweekend:'').'"><div id="totalDay[0]">&nbsp;</div></td>';
+
+		print '<td class="liste_total"></td>
                 <td class="liste_total"></td>
                 </tr>';
 	}
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index a3c8c9ebe54..ba0e773d114 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -461,7 +461,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>';
-for($i=0;$i<7;$i++)
+for($idw=0;$idw<7;$idw++)
 {
 	print '<td class="liste_titre"></td>';
 }
@@ -489,12 +489,22 @@ $startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['fi
 
 // Get if user is available or not for each day
 $holiday = new Holiday($db);
-$isavailable=array();
 
-for ($i=0;$i<7;$i++)
+$isavailable=array();
+if (! empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
 {
-	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $i, 'd');	// $firstdaytoshow is a date with hours = 0
-	$dayinloop = dol_time_plus_duree($startday, $i, 'd');
+	$tmparray=explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
+	if (count($tmparray) >= 2)
+	{
+		$numstartworkingday = $tmparray[0];
+		$numendworkingday = $tmparray[1];
+	}
+}
+
+for ($idw=0; $idw<7; $idw++)
+{
+	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd');	// $firstdaytoshow is a date with hours = 0
+	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
 
 	// Useless because $dayinloopwithouthours should be same than $dayinloopfromfirstdaytoshow
 	//$tmparray = dol_getdate($dayinloop);
@@ -505,7 +515,14 @@ for ($i=0;$i<7;$i++)
 
 	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow);
 	$isavailable[$dayinloopfromfirstdaytoshow]=$isavailablefordayanduser;			// in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
-	print '<td width="6%" align="center" class="hide'.$i.'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</td>';
+
+	$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';
+	}
+
+	print '<td width="6%" align="center" class="hide'.$idw.($cssweekend?' '.$cssweekend:'').'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</td>';
 }
 print '<td></td>';
 print "</tr>\n";
@@ -578,7 +595,13 @@ if (count($tasksarray) > 0)
 		print '</td>';
 		for ($idw = 0; $idw < 7; $idw++)
 		{
-			print '<td align="center">';
+			$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';
+			}
+
+			print '<td align="center'.($cssweekend?' '.$cssweekend:'').'">';
 			$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$timeonothertasks=($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
 			if ($timeonothertasks)
@@ -599,15 +622,19 @@ if (count($tasksarray) > 0)
                 <td class="liste_total" colspan="'.$colspan.'">';
 				print $langs->trans("Total");
 				print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
-				print '</td>
-                <td class="liste_total hide0" align="center"><div id="totalDay[0]">&nbsp;</div></td>
-                <td class="liste_total hide1" align="center"><div id="totalDay[1]">&nbsp;</div></td>
-                <td class="liste_total hide2" align="center"><div id="totalDay[2]">&nbsp;</div></td>
-                <td class="liste_total hide3" align="center"><div id="totalDay[3]">&nbsp;</div></td>
-                <td class="liste_total hide4" align="center"><div id="totalDay[4]">&nbsp;</div></td>
-                <td class="liste_total hide5" align="center"><div id="totalDay[5]">&nbsp;</div></td>
-                <td class="liste_total hide6" align="center"><div id="totalDay[6]">&nbsp;</div></td>
-                <td class="liste_total"></td>
+				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.
+					{
+						$cssweekend='weekend';
+					}
+
+					print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div id="totalDay['.$idw.']">&nbsp;</div></td>';
+				}
+                print '<td class="liste_total"></td>
     	</tr>';
 	}
 }
@@ -642,11 +669,11 @@ if ($conf->use_javascript_ajax)
 					}
 				});'."\n";
 
-	$i=0;
-	while ($i < 7)
+	$idw=0;
+	while ($idw < 7)
 	{
-		print '    updateTotal('.$i.',\''.$modeinput.'\');';
-		$i++;
+		print '    updateTotal('.$idw.',\''.$modeinput.'\');';
+		$idw++;
 	}
 	print "\n});\n";
 	print '</script>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 03d1ccdd8a7..eea9a06f16f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -388,18 +388,23 @@ input.buttonpaymentstripe {
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
+
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
     border: none;
     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.actionbuttons a {
     padding-left: 6px;
 }

From e984d7df9f074dd0c84a9bb3b73965441920620c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Feb 2018 23:52:43 +0100
Subject: [PATCH 091/386] NEW Add total of time spent in timespent page at top
 of page too.

---
 htdocs/core/js/timesheet.js        | 16 ++++++-------
 htdocs/core/lib/project.lib.php    |  4 ++--
 htdocs/langs/en_US/projects.lang   |  4 ++--
 htdocs/projet/activity/perday.php  | 36 +++++++++++++++++++++++-----
 htdocs/projet/activity/perweek.php | 38 ++++++++++++++++++++++++------
 htdocs/theme/eldy/style.css.php    |  6 +++++
 htdocs/theme/md/style.css.php      |  7 ++++++
 7 files changed, 85 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index ba3f8b2edd1..20a713ce220 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -213,11 +213,9 @@ function updateTotal(days,mode)
             }
         });
         
-        if (document.getElementById('totalDay['+days+']'))	// May be null if no task records to output (nbline is also 0 in this case)
-        {
-        	document.getElementById('totalDay['+days+']').innerHTML = pad(total.getHours())+':'+pad(total.getMinutes());
-        	//addText(,total.getHours()+':'+total.getMinutes());
-        }
+        if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+days).addClass("bold");
+        else jQuery('.totalDay'+days).removeClass("bold");
+    	jQuery('.totalDay'+days).text(pad(total.getHours())+':'+pad(total.getMinutes()));
     }
     else
     {
@@ -257,10 +255,10 @@ function updateTotal(days,mode)
                 }
             }
         }
-        if (document.getElementById('totalDay['+days+']'))	// May be null if no task records to output (nbline is also 0 in this case)
-        {
-        	document.getElementById('totalDay['+days+']').innerHTML = total;
-        }
+        
+        if (total) jQuery('.totalDay'+days).addClass("bold");
+        else jQuery('.totalDay'+days).removeClass("bold");
+    	jQuery('.totalDay'+days).text(total);
     }
     
 }
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 67600a7ba3e..49474d1e190 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -940,7 +940,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print "</td>\n";
 
 				// Planned Workload
-				print '<td align="right">';
+				print '<td align="right" class="leftborder plannedworkload">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
 				else print '--:--';
 				print '</td>';
@@ -1224,7 +1224,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				print "</td>\n";
 
 				// Planned Workload
-				print '<td align="right">';
+				print '<td align="right" class="leftborder plannedworkload">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
 				else print '--:--';
 				print '</td>';
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 86d09ff3edc..ab044618556 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -10,13 +10,13 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects I'm explicitely a contact of 
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for.
+MyProjectsDesc=This view is limited to projects you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 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.
+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.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index dd3aa856817..8475b607de6 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -345,7 +345,7 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0, $usertoprocess, ($proj
 
 llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
+//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
 $param.=($mode?'&mode='.$mode:'');
@@ -375,7 +375,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', '', -1, 'task');
+dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
 
 // Show description of content
 print '<div class="hideonsmartphone">';
@@ -474,7 +474,7 @@ print '<td>'.$langs->trans("Project").'</td>';
 print '<td>'.$langs->trans("ThirdParty").'</td>';
 //print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("Task").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
+print '<td align="right" class="leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
 /*print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -517,6 +517,32 @@ print '<td class="center">'.$langs->trans("Note").'</td>';
 print '<td class="center"></td>';
 print "</tr>\n";
 
+$colspan = 8;
+
+if ($conf->use_javascript_ajax)
+{
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="'.$colspan.'">';
+	print $langs->trans("Total");
+	//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';
+	}
+
+	print '<td class="liste_total center'.($cssweekend?' '.$cssweekend:'').'"><div class="totalDay0">&nbsp;</div></td>';
+
+	print '<td class="liste_total"></td>
+                <td class="liste_total"></td>
+                </tr>';
+}
+
 
 if (count($tasksarray) > 0)
 {
@@ -565,8 +591,6 @@ if (count($tasksarray) > 0)
 		}
 	}
 
-	$colspan = 8;
-
 	// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
 	if ($isdiff)
 	{
@@ -605,7 +629,7 @@ if (count($tasksarray) > 0)
 			$cssweekend='weekend';
 		}
 
-		print '<td class="liste_total hide0 center'.($cssweekend?' '.$cssweekend:'').'"><div id="totalDay[0]">&nbsp;</div></td>';
+		print '<td class="liste_total center'.($cssweekend?' '.$cssweekend:'').'"><div class="totalDay0">&nbsp;</div></td>';
 
 		print '<td class="liste_total"></td>
                 <td class="liste_total"></td>
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index ba0e773d114..c3c4efa836f 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -347,7 +347,7 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0, $usertoprocess, ($proj
 
 llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
+//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
 $param.=($mode?'&mode='.$mode:'');
@@ -376,7 +376,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', '', -1, 'task');
+dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
 
 // Show description of content
 print '<div class="hideonsmartphone">';
@@ -477,7 +477,7 @@ print '<td>'.$langs->trans("Project").'</td>';
 print '<td>'.$langs->trans("ThirdParty").'</td>';
 //print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("Task").'</td>';
-print '<td align="right" class="maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
+print '<td align="right" class="leftborder plannedworkload maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
 /*print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -522,11 +522,37 @@ for ($idw=0; $idw<7; $idw++)
 		$cssweekend='weekend';
 	}
 
-	print '<td width="6%" align="center" class="hide'.$idw.($cssweekend?' '.$cssweekend:'').'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</td>';
+	print '<td width="6%" align="center" class="bold hide'.$idw.($cssweekend?' '.$cssweekend:'').'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</td>';
 }
 print '<td></td>';
 print "</tr>\n";
 
+$colspan=7;
+
+if ($conf->use_javascript_ajax)
+{
+	print '<tr class="liste_total">
+                <td class="liste_total" colspan="'.$colspan.'">';
+	print $langs->trans("Total");
+	print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
+	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.
+		{
+			$cssweekend='weekend';
+		}
+
+		print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
+	}
+	print '<td class="liste_total"></td>
+    	</tr>';
+}
+
+
+
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
 
@@ -584,8 +610,6 @@ if (count($tasksarray) > 0)
 		}
 	}
 
-	$colspan=7;
-
 	// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
 	if ($isdiff)
 	{
@@ -632,7 +656,7 @@ if (count($tasksarray) > 0)
 						$cssweekend='weekend';
 					}
 
-					print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div id="totalDay['.$idw.']">&nbsp;</div></td>';
+					print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 				}
                 print '<td class="liste_total"></td>
     	</tr>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index eea9a06f16f..e7f50732cd4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -404,6 +404,9 @@ td.onholidaymorning, td.onholidayafternoon {
 td.onholidayallday {
 	background-color: #f4eede;
 }
+td.leftborder, td.hide0 {
+	border-left: 1px solid #ccc;
+}
 
 td.actionbuttons a {
     padding-left: 6px;
@@ -597,6 +600,9 @@ textarea.centpercent {
 .wordbreak {
 	word-break: break-all;
 }
+.bold {
+	font-weight: bold !important;
+}
 .nobold {
 	font-weight: normal !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c9a0a9239b2..869654cc0cd 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -408,6 +408,10 @@ td.onholidayallday {
 td.actionbuttons a {
     padding-left: 6px;
 }
+td.leftborder, td.hide0 {
+	border-left: 1px solid #ccc;
+}
+
 select.flat, form.flat select {
 	font-weight: normal;
 	font-size: unset;
@@ -594,6 +598,9 @@ textarea.centpercent {
 .wordbreak {
 	word-break: break-all;
 }
+.bold {
+	font-weight: bold !important;
+}
 .nobold {
 	font-weight: normal !important;
 }

From 2315997aada1cf4657064923ad6d9d95f20b6230 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Feb 2018 00:00:12 +0100
Subject: [PATCH 092/386] CSS enhancement

---
 htdocs/core/lib/project.lib.php   | 2 +-
 htdocs/projet/activity/perday.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 49474d1e190..9070cb307f7 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -986,7 +986,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				}
 
 				// Form to add new time
-				print '<td class="nowrap" align="center">';
+				print '<td class="nowrap leftborder" align="center">';
 				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
 				print $tableCell;
 				print '</td>';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 8475b607de6..ef671f2c7e5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -481,7 +481,7 @@ if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100
 else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
 print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname?'<br>('.$usertoprocess->firstname.')':'').'</td>';
-print '<td class="center">'.$langs->trans("HourStart").'</td>';
+print '<td class="center leftborder">'.$langs->trans("HourStart").'</td>';
 
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);

From 01f09e6c091a989337be6a5d679a0f5234f9e26d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Feb 2018 00:04:05 +0100
Subject: [PATCH 093/386] CSS enhancement

---
 htdocs/projet/activity/perday.php  | 12 ++++++------
 htdocs/projet/activity/perweek.php |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index ef671f2c7e5..6a556fcae3f 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -507,10 +507,10 @@ $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.
+/*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';
-}
+}*/
 
 print '<td class="center'.($cssweekend?' '.$cssweekend:'').'">'.$langs->trans("Duration").'</td>';
 print '<td class="center">'.$langs->trans("Note").'</td>';
@@ -531,10 +531,10 @@ if ($conf->use_javascript_ajax)
 	$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.
+	/*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';
-	}
+	}*/
 
 	print '<td class="liste_total center'.($cssweekend?' '.$cssweekend:'').'"><div class="totalDay0">&nbsp;</div></td>';
 
@@ -624,10 +624,10 @@ if (count($tasksarray) > 0)
 		$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.
+		/*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';
-		}
+		}*/
 
 		print '<td class="liste_total center'.($cssweekend?' '.$cssweekend:'').'"><div class="totalDay0">&nbsp;</div></td>';
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index c3c4efa836f..d64a5fad6cd 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -540,10 +540,10 @@ 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';
-		}
+		}*/
 
 		print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 	}
@@ -651,10 +651,10 @@ if (count($tasksarray) > 0)
 				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';
-					}
+					}*/
 
 					print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 				}

From 74116f495eff43f3305441735e64035383913647 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Feb 2018 00:05:04 +0100
Subject: [PATCH 094/386] CSS enhancement

---
 htdocs/projet/activity/perday.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 6a556fcae3f..85848eefedc 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -507,10 +507,10 @@ $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.
+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';
-}*/
+}
 
 print '<td class="center'.($cssweekend?' '.$cssweekend:'').'">'.$langs->trans("Duration").'</td>';
 print '<td class="center">'.$langs->trans("Note").'</td>';

From ec66bde3c9910a0104cbe34701abe55774e89326 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Feb 2018 12:15:24 +0100
Subject: [PATCH 095/386] Add option WEBSITE_USE_WEBSITE_ACCOUNTS

---
 htdocs/admin/website.php        | 21 ++++++++++++++++++++-
 htdocs/core/lib/company.lib.php |  2 +-
 htdocs/langs/en_US/website.lang |  2 ++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 9811052509a..54a91d6ee92 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -401,6 +401,23 @@ $titre=$langs->trans("WebsiteSetup");
 $linkback='<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($titre,$linkback,'title_setup');
 
+// Onglets
+$head=array();
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website.php";
+$head[$h][1] = $langs->trans("WebSites");
+$head[$h][2] = 'website';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website_options.php";
+$head[$h][1] = $langs->trans("Options");
+$head[$h][2] = 'options';
+$h++;
+
+dol_fiche_head($head, 'website', '', -1);
+
+
 print $langs->trans("WebsiteSetupDesc").'<br>';
 print "<br>\n";
 
@@ -648,7 +665,9 @@ if ($id)
     }
 }
 
-print '<br>';
+dol_fiche_end();
+
+//print '<br>';
 
 
 llxFooter();
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4f1726a45c6..d3b242840ae 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -206,7 +206,7 @@ function societe_prepare_head(Societe $object)
         $h++;
     }
 
-    if (! empty($conf->website->enabled) && (!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");
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index a329661a056..c7cdd65ff4e 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -64,3 +64,5 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+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 / thirdparty
\ No newline at end of file

From e25bd56e22bae24f2e1933e56fb5aa113f70128f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Feb 2018 12:16:06 +0100
Subject: [PATCH 096/386] Add option WEBSITE_USE_WEBSITE_ACCOUNTS

---
 htdocs/admin/website_options.php | 153 +++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 htdocs/admin/website_options.php

diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
new file mode 100644
index 00000000000..e54f19dc8c9
--- /dev/null
+++ b/htdocs/admin/website_options.php
@@ -0,0 +1,153 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/admin/website.php
+ *		\ingroup    setup
+ *		\brief      Page to administer web sites
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("companies");
+$langs->load("website");
+
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$rowid=GETPOST('rowid','alpha');
+
+if (!$user->admin) accessforbidden();
+
+$status = 1;
+
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = 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;
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admin'));
+
+$arrayofparameters=array('WEBSITE_USE_WEBSITE_ACCOUNTS'=>array('css'=>'minwidth200'));
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formadmin=new FormAdmin($db);
+
+llxHeader('', $langs->trans("WebsiteSetup"));
+
+$titre=$langs->trans("WebsiteSetup");
+$linkback='<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($titre,$linkback,'title_setup');
+
+// Onglets
+$head=array();
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website.php";
+$head[$h][1] = $langs->trans("WebSites");
+$head[$h][2] = 'website';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website_options.php";
+$head[$h][1] = $langs->trans("Options");
+$head[$h][2] = 'options';
+$h++;
+
+dol_fiche_head($head, 'options', '', -1);
+
+
+if ($action == 'edit')
+{
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+
+	print '<table class="noborder" width="100%">';
+	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>';
+
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
+
+	print '</form>';
+	print '<br>';
+}
+else
+{
+	print '<table class="noborder" width="100%">';
+	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>';
+	}
+
+	print '</table>';
+
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '</div>';
+}
+
+
+dol_fiche_end();
+//print '<br>';
+
+
+llxFooter();
+$db->close();
+

From b48d369258fea70f62f7956a0887bb14be2595cc Mon Sep 17 00:00:00 2001
From: Ysandor <Ysandor@users.noreply.github.com>
Date: Sat, 10 Feb 2018 20:38:53 +0100
Subject: [PATCH 097/386] add the possibility to remove a category from a
 thirdparty

I don't know if there is a good reason for not proposing to unlink a thirdparty from a category but if it is not the case here is a piece of code allowing to remove a category that works for me and seems general enough to be useful to other people.
The new function is inspired from the addCategory function.

PS : This is the first time i'm trying to contribute on github so don't hesitate to tell me if I did something wrong.
---
 .../societe/class/api_thirdparties.class.php  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 7326d99e2b7..6910f5d6dc3 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -552,7 +552,45 @@ class Thirdparties extends DolibarrApi
       return $this->company;
     }
 
+    /**
+     * Delete category to a thirdparty
+     *
+     * @param int		$id	Id of thirdparty
+     * @param array     $request_data   Request datas
+     *
+     * @return mixed
+     *
+     * @url POST {id}/deleteCategory
+     */
+    function deleteCategory($id, $request_data = NULL) {
+        if (!isset($request_data["category_id"]))
+            throw new RestException(400, "category_id field missing");
+        $category_id = $request_data["category_id"];
 
+      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+			  throw new RestException(401);
+      }
+
+      $result = $this->company->fetch($id);
+      if( ! $result ) {
+          throw new RestException(404, 'Thirdparty not found');
+      }
+      $category = new Categorie($this->db);
+      $result = $category->fetch($category_id);
+      if( ! $result ) {
+          throw new RestException(404, 'category not found');
+      }
+
+      if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->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->company,'customer');
+      return $this->company;
+    }
 
     /**
      * Get outstanding proposals of thirdparty

From 1300f7172f44e25e6b7b0821e562ae28e421a02a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 02:05:14 +0100
Subject: [PATCH 098/386] NEW Can fix the bank account of a payment if payment
 not conciliated

---
 htdocs/compta/bank/ligne.php | 56 +++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 33621d4b9a9..f6740ed6fda 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -62,6 +62,7 @@ if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate) acces
 /*
  * Actions
  */
+
 if ($cancel)
 {
     if ($backtopage)
@@ -108,10 +109,23 @@ if ($user->rights->banque->modifier && $action == "update")
 {
 	$error=0;
 
-	$ac = new Account($db);
-	$ac->fetch($id);
+	$acline = new AccountLine($db);
+	$acline->fetch($rowid);
 
-	if ($ac->courant == Account::TYPE_CASH && $_POST['value'] != 'LIQ')
+	$acsource = new Account($db);
+	$acsource->fetch($id);
+
+	$actarget = new Account($db);
+	if (GETPOST('accountid','int') > 0 && ! $acline->rappro && ! $acline->getVentilExportCompta())	// We ask to change bank account
+	{
+		$actarget->fetch(GETPOST('accountid','int'));
+	}
+	else
+	{
+		$actarget->fetch($id);
+	}
+
+	if ($actarget->courant == Account::TYPE_CASH && GETPOST('value','alpha') != 'LIQ')
 	{
 		setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
 		$error++;
@@ -119,16 +133,6 @@ if ($user->rights->banque->modifier && $action == "update")
 
 	if (! $error)
 	{
-		// Avant de modifier la date ou le montant, on controle si ce n'est pas encore rapproche
-		$conciliated=0;
-		$sql = "SELECT b.rappro FROM ".MAIN_DB_PREFIX."bank as b WHERE rowid=".$rowid;
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$objp = $db->fetch_object($result);
-			$conciliated=$objp->rappro;
-		}
-
 		$db->begin();
 
 		$amount = price2num($_POST['amount']);
@@ -142,15 +146,15 @@ if ($user->rights->banque->modifier && $action == "update")
 		if (isset($_POST['banque']))     $sql.=" banque='".$db->escape($_POST["banque"])."',";
 		if (isset($_POST['emetteur']))   $sql.=" emetteur='".$db->escape($_POST["emetteur"])."',";
 		// Blocked when conciliated
-		if (! $conciliated)
+		if (! $acline->rappro)
 		{
 			if (isset($_POST['label']))      $sql.=" label='".$db->escape($_POST["label"])."',";
 			if (isset($_POST['amount']))     $sql.=" amount='".$amount."',";
 			if (isset($_POST['dateomonth'])) $sql.=" dateo = '".$db->idate($dateop)."',";
 			if (isset($_POST['datevmonth'])) $sql.=" datev = '".$db->idate($dateval)."',";
 		}
-		$sql.= " fk_account = ".$id;
-		$sql.= " WHERE rowid = ".$rowid;
+		$sql.= " fk_account = ".$actarget->id;
+		$sql.= " WHERE rowid = ".$acline->id;
 
 		$result = $db->query($sql);
 		if (! $result)
@@ -282,7 +286,7 @@ if ($result)
         $account = $acct->id;
 
         $bankline = new AccountLine($db);
-        $bankline->fetch($rowid,$ref);
+        $bankline->fetch($rowid, $ref);
 
         $links=$acct->get_url($rowid);
         $bankline->load_previous_next_ref('','rowid');
@@ -311,21 +315,19 @@ if ($result)
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border" width="100%">';
 
-        // Ref
-        /*
-        print '<tr><td class="titlefield">'.$langs->trans("Ref")."</td>";
-        print '<td>';
-        print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid');
-        print '</td>';
-        print '</tr>';
-        */
-
         $i++;
 
         // Bank account
         print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
         print '<td>';
-        print $acct->getNomUrl(1,'transactions','reflabel');
+        if (! $objp->rappro && ! $bankline->getVentilExportCompta())
+        {
+        	print $form->select_comptes($acct->id, 'accountid', 0, '', 0);
+        }
+        else
+        {
+        	print $acct->getNomUrl(1,'transactions','reflabel');
+        }
         print '</td>';
         print '</tr>';
 

From f637269a270cc3627c033998d5a8bd582f7dfb44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 04:05:13 +0100
Subject: [PATCH 099/386] Fix bad list of id for supplier categories

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 5658460927c..46063c0f8c4 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -896,10 +896,14 @@ class Categorie extends CommonObject
 
 		$sub_type = $type;
 		$subcol_name = "fk_".$type;
-		if ($type=="customer" || $type=="supplier") {
+		if ($type=="customer") {
 			$sub_type="societe";
 			$subcol_name="fk_soc";
 		}
+		if ($type=="supplier") {
+			$sub_type="fournisseur";
+			$subcol_name="fk_soc";
+		}
 		if ($type=="contact") {
 			$subcol_name="fk_socpeople";
 		}

From aaf4db2e034012133c82415c29a2fb93f9e5a1ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 04:05:51 +0100
Subject: [PATCH 100/386] Fix API on thirdparty categories

---
 .../societe/class/api_thirdparties.class.php  | 177 +++++++++++++++---
 1 file changed, 150 insertions(+), 27 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 6910f5d6dc3..58e96d015b2 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -90,7 +90,7 @@ class Thirdparties extends DolibarrApi
       $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);
     }
 
     /**
@@ -238,7 +238,7 @@ class Thirdparties extends DolibarrApi
         }
 
         if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get ($id);
+            return $this->get($id);
 
         return false;
     }
@@ -479,7 +479,7 @@ class Thirdparties extends DolibarrApi
     }
 
     /**
-     * Get categories for a thirdparty
+     * Get customer categories for a thirdparty
      *
      * @param int		$id         ID of thirdparty
      * @param string	$sortfield	Sort field
@@ -497,36 +497,41 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(401);
 		}
 
+		$result = $this->company->fetch($id);
+		if( ! $result )
+		{
+			throw new RestException(404, 'Thirdparty not found');
+		}
+
 		$categories = new Categorie($this->db);
 
 		$result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
+		if (is_numeric($result) && $result < 0)
+		{
+			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+		{
+			return array();
 		}
 
 		return $result;
     }
 
     /**
-     * Add category to a thirdparty
+     * Add a customer category to a thirdparty
      *
-     * @param int		$id	Id of thirdparty
-     * @param array     $request_data   Request datas
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
      *
      * @return mixed
      *
-     * @url POST {id}/addCategory
+     * @url POST {id}/categories/{category_id}
      */
-    function addCategory($id, $request_data = NULL) {
-        if (!isset($request_data["category_id"]))
-            throw new RestException(400, "category_id field missing");
-        $category_id = $request_data["category_id"];
-
+    function addCategory($id, $category_id)
+    {
       if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
       }
@@ -549,24 +554,22 @@ class Thirdparties extends DolibarrApi
       }
 
       $category->add_type($this->company,'customer');
-      return $this->company;
+
+      return $this->_cleanObjectDatas($this->company);
     }
 
     /**
-     * Delete category to a thirdparty
+     * Remove the link between a customer category and the thirdparty
      *
-     * @param int		$id	Id of thirdparty
-     * @param array     $request_data   Request datas
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
      *
      * @return mixed
      *
-     * @url POST {id}/deleteCategory
+     * @url DELETE {id}/categories/{category_id}
      */
-    function deleteCategory($id, $request_data = NULL) {
-        if (!isset($request_data["category_id"]))
-            throw new RestException(400, "category_id field missing");
-        $category_id = $request_data["category_id"];
-
+    function deleteCategory($id, $category_id)
+    {
       if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
       }
@@ -589,9 +592,129 @@ class Thirdparties extends DolibarrApi
       }
 
       $category->del_type($this->company,'customer');
-      return $this->company;
+
+      return $this->_cleanObjectDatas($this->company);
     }
 
+    /**
+     * Get supplier categories for a thirdparty
+     *
+     * @param int		$id         ID of thirdparty
+     * @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}/supplier_categories
+     */
+    function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+    	if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->company->fetch($id);
+    	if( ! $result )
+    	{
+    		throw new RestException(404, 'Thirdparty not found');
+    	}
+
+    	$categories = new Categorie($this->db);
+
+    	$result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
+
+    	if (is_numeric($result) && $result < 0)
+    	{
+    		throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+    	}
+
+    	if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+    	{
+    		return array();
+    	}
+
+    	return $result;
+    }
+
+    /**
+     * Add a supplier category to a thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url POST {id}/supplier_categories/{category_id}
+     */
+    function addSupplierCategory($id, $category_id)
+    {
+    	if(! DolibarrApiAccess::$user->rights->societe->creer) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->company->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Thirdparty not found');
+    	}
+    	$category = new Categorie($this->db);
+    	$result = $category->fetch($category_id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'category not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->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->company,'supplier');
+
+    	return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Remove the link between a category and the thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url DELETE {id}/supplier_categories/{category_id}
+     */
+    function deleteSupplierCategory($id, $category_id)
+    {
+    	if(! DolibarrApiAccess::$user->rights->societe->creer) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->company->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Thirdparty not found');
+    	}
+    	$category = new Categorie($this->db);
+    	$result = $category->fetch($category_id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'category not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->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->company,'supplier');
+
+    	return $this->_cleanObjectDatas($this->company);
+    }
+
+
     /**
      * Get outstanding proposals of thirdparty
      *

From d762226a70ed31da529fa45900327a78710b1566 Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Mon, 12 Feb 2018 14:39:18 +0100
Subject: [PATCH 101/386] FIX : Call to trigger on chargesociale create

---
 .../compta/sociales/class/chargesociales.class.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index cf359d691ec..b6386ae3b98 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -155,6 +155,7 @@ class ChargeSociales extends CommonObject
     function create($user)
     {
     	global $conf;
+		$error=0;
 
         $now=dol_now();
 
@@ -190,8 +191,17 @@ class ChargeSociales extends CommonObject
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
-            $this->db->commit();
-            return $this->id;
+			$result=$this->call_trigger('PAYMENTSOCIALECONTRIBUTION_CREATE',$user);
+			if ($result < 0) $error++;
+
+			if(empty($error)) {
+				$this->db->commit();
+				return $this->id;
+			}
+			else {
+				$this->db->rollback();
+				return -1*$error;
+			}
         }
         else
         {

From 2aaf3a466d97b6898047bbde05f3f5ad50519e8d Mon Sep 17 00:00:00 2001
From: Gerhard Stephan <gerhard.stephan@timepunch.de>
Date: Mon, 12 Feb 2018 21:38:51 +0100
Subject: [PATCH 102/386] Load product data optional fields to the line ->
 enables to use "line_options_{extrafield}"

This fixes the issue #3185
https://github.com/Dolibarr/dolibarr/issues/3185
---
 htdocs/core/class/commondocgenerator.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 666011b3f4a..dee67990cdc 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -527,7 +527,13 @@ abstract class CommonDocGenerator
 		$line->fetch_optionals($line->rowid,$extralabels);
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-
+	
+		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
+		$product = new Product($this->db);
+		$result = $product->fetch(null, $line->product_ref);
+		foreach($product->array_options as $key=>$label)
+			$resarray["line_".$key] = $label;
+		
 		return $resarray;
 	}
 

From f93934905fba82d5d4acddb33388bf44fe6c0d50 Mon Sep 17 00:00:00 2001
From: Gerhard Stephan <gerhard.stephan@timepunch.de>
Date: Tue, 13 Feb 2018 08:41:57 +0100
Subject: [PATCH 103/386] Implemented a correct error handling, if the
 $line->product_ref has not been set

---
 htdocs/core/class/commondocgenerator.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index dee67990cdc..015173f1f05 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -529,10 +529,13 @@ abstract class CommonDocGenerator
 		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
 	
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		$product = new Product($this->db);
-		$result = $product->fetch(null, $line->product_ref);
-		foreach($product->array_options as $key=>$label)
-			$resarray["line_".$key] = $label;
+		if (isset($line->product_ref))
+		{
+			$product = new Product($this->db);
+			$result = $product->fetch(null, $line->product_ref);
+			foreach($product->array_options as $key=>$label)
+				$resarray["line_".$key] = $label;
+		}		
 		
 		return $resarray;
 	}

From 1a4aa894893b252a2aa69f37f262423ab04120ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 13:55:36 +0100
Subject: [PATCH 104/386] NEW Can share any file from the "Document" tab.

---
 htdocs/core/actions_linkedfiles.inc.php   |  85 +++++++++++-----
 htdocs/core/class/html.formfile.class.php |  59 ++++++++++--
 htdocs/core/lib/files.lib.php             |   7 +-
 htdocs/document.php                       |  31 +++---
 htdocs/ecm/file_card.php                  |   4 -
 htdocs/viewimage.php                      | 112 +++++++++++++++++++---
 6 files changed, 227 insertions(+), 71 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 0e0c444af33..7f938ba9b6c 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -182,37 +182,70 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
         $filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom','alpha'), '_', 0);	// Do not remove accents
         $filenameto=dol_sanitizeFileName(GETPOST('renamefileto','alpha'), '_', 0);		// Do not remove accents
 
-        // 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 (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+        if ($filenamefrom != $filenameto)
         {
-            $filenameto.= '.noexe';
-        }
+	        // 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 (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+	        {
+	            $filenameto.= '.noexe';
+	        }
 
-        if ($filenamefrom && $filenameto)
-        {
-            $srcpath = $upload_dir.'/'.$filenamefrom;
-            $destpath = $upload_dir.'/'.$filenameto;
+	        if ($filenamefrom && $filenameto)
+	        {
+	            $srcpath = $upload_dir.'/'.$filenamefrom;
+	            $destpath = $upload_dir.'/'.$filenameto;
 
-            $result = dol_move($srcpath, $destpath);
-            if ($result)
-            {
-            	if ($object->id)
-            	{
-                	$object->addThumbs($destpath);
-            	}
+	            $result = dol_move($srcpath, $destpath);
+	            if ($result)
+	            {
+	            	if ($object->id)
+	            	{
+	                	$object->addThumbs($destpath);
+	            	}
 
-                // TODO Add revert function of addThumbs to remove for old name
-                //$object->delThumbs($srcpath);
+	                // TODO Add revert function of addThumbs to remove for old name
+	                //$object->delThumbs($srcpath);
 
-                setEventMessages($langs->trans("FileRenamed"), null);
-            }
-            else
-            {
-                $langs->load("errors"); // key 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');
-            }
+	                setEventMessages($langs->trans("FileRenamed"), null);
+	            }
+	            else
+	            {
+	                $langs->load("errors"); // key 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');
+	            }
+	        }
         }
     }
+
+    // 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/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 4bff96700d5..ac5bfdcabb7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -938,7 +938,7 @@ class FormFile
 	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
 	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
-	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
+	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
 	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
 	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
 	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
@@ -951,6 +951,7 @@ class FormFile
 		global $user, $conf, $langs, $hookmanager;
 		global $bc,$bcdd;
 		global $sortfield, $sortorder, $maxheightmini;
+		global $dolibarr_main_url_root;
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
@@ -1038,6 +1039,7 @@ class FormFile
 				print '<td></td>';
 				if (empty($useinecm)) print '<td></td>';
 				print '<td></td>';
+				print '<td></td>';
 				if (! $disablemove) print '<td></td>';
 				print "</tr>\n";
 			}
@@ -1047,7 +1049,8 @@ class FormFile
 			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
+			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+			print_liste_field_titre('');
 			print_liste_field_titre('');
 			if (! $disablemove) print_liste_field_titre('');
 			print "</tr>\n";
@@ -1063,7 +1066,6 @@ class FormFile
 					//var_dump($sortfield);
 					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
 				}
-				//var_dump($filearray);
 			}
 
 			$nboffiles=count($filearray);
@@ -1146,6 +1148,48 @@ class FormFile
 						else print '&nbsp;';
 						print '</td>';
 					}
+
+					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
+					print '<td align="center">';
+					if ($relativedir && $filearray[$key]['rowid'] > 0)
+					{
+						if ($editline)
+						{
+							print $langs->trans("FileSharedViaALink").' ';
+							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+						}
+						else
+						{
+							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:'');
+								//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($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+								//print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';	// No target here
+							}
+							else
+							{
+								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
+							}
+						}
+					}
+					print '</td>';
+
+					// Actions buttons
 					if (! $editline)
 					{
 						// Delete or view link
@@ -1215,6 +1259,7 @@ 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 '</td>';
@@ -1227,9 +1272,9 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				$colspan=(empty($useinecm)?'5':'5');
-				if (empty($disablemove)) $colspan++;
-				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
+				$colspan=(empty($useinecm)?'6':'6');
+				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@@ -1249,6 +1294,8 @@ class FormFile
 				print '</form>';
 			}
 
+			print ajax_autoselect('downloadlink');
+
 			return $nboffiles;
 		}
 	}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 206d1bb8099..b53e588c275 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -225,7 +225,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
 {
 	global $conf, $db;
 
-	$sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+	$sql.=" acl, position, share";
 	if ($mode) $sql.=", description";
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
@@ -258,7 +259,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
 					"keywords" => $obj->keywords,
 					"cover" => $obj->cover,
 					"position" => (int) $obj->position,
-					"acl" => $obj->acl
+					"acl" => $obj->acl,
+					"share" => $obj->share
 				);
 			}
 			$i++;
@@ -318,6 +320,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
 				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
 				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
 				$found=1;
 				break;
 			}
diff --git a/htdocs/document.php b/htdocs/document.php
index 1c722e4cb55..50f4a61186d 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -25,9 +25,9 @@
  *	\file       htdocs/document.php
  *  \brief      Wrapper to download data files
  *  \remarks    Call of this wrapper is made with URL:
- * 				document.php?modulepart=repfichierconcerne&file=relativepathoffile
- * 				document.php?modulepart=logs&file=dolibarr.log
- * 				document.php?modulepart=logs&hashp=sharekey
+ * 				DOL_URL_ROOT.'/document.php?modulepart=repfichierconcerne&file=relativepathoffile'
+ * 				DOL_URL_ROOT.'/document.php?modulepart=logs&file=dolibarr.log'
+ * 				DOL_URL_ROOT.'/document.php?hashp=sharekey'
  */
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -36,9 +36,9 @@
 //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');
 //if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
 // For bittorent link, we don't need to load/check we are into a login session
 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN"))
@@ -58,9 +58,6 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined
 	define("NOLOGIN",1);
 	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 }
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 /**
  * Header empty
@@ -75,7 +72,6 @@ function llxHeader() { }
  */
 function llxFooter() { }
 
-
 require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -103,21 +99,17 @@ if (in_array($modulepart, array('facture_paiement','unpaid')))
 
 
 /*
- * Action
+ * Actions
  */
 
 // None
 
 
+
 /*
  * View
  */
 
-// Define mime type
-$type = 'application/octet-stream';
-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
-else $type=dol_mimetype($original_file);
-
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
 if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
@@ -160,6 +152,10 @@ if (! empty($hashp))
 	}
 }
 
+// Define mime type
+$type = 'application/octet-stream';
+if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
+else $type=dol_mimetype($original_file);
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../","/", $original_file);
@@ -252,9 +248,6 @@ header('Content-Length: ' . dol_filesize($fullpath_original_file));
 header('Cache-Control: Public, must-revalidate');
 header('Pragma: public');
 
-//ob_clean();
-//flush();
-
 readfile($fullpath_original_file_osencoded);
 
 if (is_object($db)) $db->close();
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 8c62cbe18f2..e0926e0f777 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -341,13 +341,9 @@ if (! empty($object->share))
 {
 	if ($action != 'edit')
 	{
-		$modulepart='ecm';
 		$forcedownload=0;
 
 		$paramlink='';
-		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
-		//if (! empty($object->entity)) $paramlink.='&entity='.$object->entity; 					// For sharing with hash (so public files), entity is not required.
-		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
 		if (! empty($object->share)) $paramlink.=($paramlink?'&':'').'hashp='.$object->share;			// Hash for public share
 		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 3f7ddbcd1cb..3e2b59ae404 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -20,8 +20,10 @@
 
 /**
  *		\file       htdocs/viewimage.php
- *		\brief      Wrapper to show images into Dolibarr screens
- *      \remarks    Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
+ *		\brief      Wrapper to show images into Dolibarr screens.
+ *		\remarks    Call to wrapper is :
+ *					DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0
+ *					DOL_URL_ROOT.'/viewimage.php?hashp=sharekey
  */
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -35,7 +37,16 @@ if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN")) define("NOLOGIN",'1');
+if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN"))
+{
+	define("NOLOGIN",'1');
+}
+// For direct external download link, we don't need to load/check we are into a login session
+if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
+{
+	define("NOLOGIN",1);
+}
+// Some value of modulepart can be used to get resources that are public so no login are required.
 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
 {
 	define("NOLOGIN",'1');
@@ -57,18 +68,20 @@ function llxHeader() { }
  */
 function llxFooter() { }
 
-require 'main.inc.php';
+require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 $action=GETPOST('action','alpha');
-$original_file=GETPOST("file",'alpha');
+$original_file=GETPOST('file','alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
+$hashp=GETPOST('hashp','aZ09');
 $modulepart=GETPOST('modulepart','alpha');
-$urlsource=GETPOST("urlsource",'alpha');
+$urlsource=GETPOST('urlsource','alpha');
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
+if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
+if (empty($original_file) && empty($hashp)) accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);
 if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility
 
 
@@ -97,9 +110,45 @@ if (GETPOST("cache",'alpha'))
     //print $dolibarr_nocache; exit;
 }
 
+// If we have a hash public (hashp), we guess the original_file.
+if (! empty($hashp))
+{
+	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+	$ecmfile=new EcmFiles($db);
+	$result = $ecmfile->fetch(0, '', '', '', $hashp);
+	if ($result > 0)
+	{
+		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory
+		$moduleparttocheck = $tmp[0];
+		if ($modulepart)	// Not required for link using public hashp
+		{
+			if ($moduleparttocheck == $modulepart)
+			{
+				// We remove first level of directory
+				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
+				//var_dump($original_file); exit;
+			}
+			else
+			{
+				accessforbidden('Bad link. File is from another module part.',0,0,1);
+			}
+		}
+		else
+		{
+			$modulepart = $moduleparttocheck;
+			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
+		}
+	}
+	else
+	{
+		$langs->load("errors");
+		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);
+	}
+}
+
 // Define mime type
 $type = 'application/octet-stream';
-if (! empty($_GET["type"])) $type=$_GET["type"];
+if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
 else $type=dol_mimetype($original_file);
 
 // Security: Delete string ../ into $original_file
@@ -110,16 +159,49 @@ $refname=basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
-$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
+
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-$fullpath_original_file     = $check_access['original_file'];
+$fullpath_original_file     = $check_access['original_file'];               // $fullpath_original_file is now a full path name
+
+if (! empty($hashp))
+{
+	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed
+	$sqlprotectagainstexternals = '';
+}
+else
+{
+	// Basic protection (against external users only)
+	if ($user->societe_id > 0)
+	{
+		if ($sqlprotectagainstexternals)
+		{
+			$resql = $db->query($sqlprotectagainstexternals);
+			if ($resql)
+			{
+				$num=$db->num_rows($resql);
+				$i=0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($user->societe_id != $obj->fk_soc)
+					{
+						$accessallowed=0;
+						break;
+					}
+					$i++;
+				}
+			}
+		}
+	}
+}
 
 // Security:
 // Limit access if permissions are wrong
 if (! $accessallowed)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Security:
@@ -128,7 +210,7 @@ if (preg_match('/\.\./',$fullpath_original_file) || preg_match('/[<>|]/',$fullpa
 {
 	dol_syslog("Refused to deliver file ".$fullpath_original_file);
 	print "ErrorFileNameInvalid: ".$original_file;
-    exit;
+	exit;
 }
 
 
@@ -174,8 +256,10 @@ else					// Open and return file
 {
     clearstatcache();
 
+    $filename = basename($fullpath_original_file);
+
     // Output files on browser
-    dol_syslog("viewimage.php return file $fullpath_original_file content-type=$type");
+    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"]))
@@ -186,7 +270,7 @@ else					// Open and return file
         exit;*/
     }
 
-    // Les drois sont ok et fichier trouve
+    // Permissions are ok and file found, so we return it
     if ($type)
     {
         top_httphead($type);

From 7743f88e98efa921e7ccca9ebb947e1c8509c413 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 14:03:11 +0100
Subject: [PATCH 105/386] Fix bad escaping

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

diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index a75ed1846ff..e4a63b23b3d 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -71,7 +71,8 @@ $(document).ready(function(){
 					function() {
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
-							location.href = '<?php echo dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']); ?>';
+							//console.log('<?php echo dol_escape_js($_SERVER['QUERY_STRING']); ?>');
+							location.href = '<?php echo dol_escape_js($_SERVER['PHP_SELF']).'?'.dol_escape_js($_SERVER['QUERY_STRING']); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {

From 8a32ae69353d087c2b964c665efeb47dee644d1e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 15:46:39 +0100
Subject: [PATCH 106/386] Move ajax_autoselect into functions.lib.php

---
 htdocs/core/lib/ajax.lib.php      | 18 ------------------
 htdocs/core/lib/functions.lib.php | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 2ddc7125d4a..845a758703e 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -358,24 +358,6 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 }
 
 
-/**
- * Make content of an input box selected when we click into input field.
- *
- * @param string	$htmlname	Id of html object
- * @param string	$addlink	Add a 'link to' after
- */
-function ajax_autoselect($htmlname, $addlink='')
-{
-	global $langs;
-	$out = '<script type="text/javascript">
-               jQuery(document).ready(function () {
-				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
-				});
-		    </script>';
-	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
-	return $out;
-}
-
 /**
  * Convert a html select field into an ajax combobox.
  * Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a736f3c139a..534555cd8e5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6861,6 +6861,25 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
 }
 
 
+/**
+ * Make content of an input box selected when we click into input field.
+ *
+ * @param string	$htmlname	Id of html object
+ * @param string	$addlink	Add a 'link to' after
+ */
+function ajax_autoselect($htmlname, $addlink='')
+{
+	global $langs;
+	$out = '<script type="text/javascript">
+               jQuery(document).ready(function () {
+				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
+				});
+		    </script>';
+	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	return $out;
+}
+
+
 /**
  *	Return mime type of a file
  *

From 35aece060cdf34320183525130ce6f7588efe661 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 15:47:17 +0100
Subject: [PATCH 107/386] Search field in correct column

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ac5bfdcabb7..3d560c9644e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1289,13 +1289,13 @@ class FormFile
 				}
 			}
 
+			print ajax_autoselect('downloadlink');
+
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '</form>';
 			}
 
-			print ajax_autoselect('downloadlink');
-
 			return $nboffiles;
 		}
 	}
@@ -1344,8 +1344,8 @@ class FormFile
 		if (! empty($addfilterfields))
 		{
 			print '<tr class="liste_titre nodrag nodrop">';
-			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 			print '<td></td>';
+			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 			print '<td></td>';
 			print '<td></td>';
 			// Action column

From 92e67ebb8fe34bf73fd632eacf9d7a66d3925f13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 16:33:45 +0100
Subject: [PATCH 108/386] Fix svg image preview ko

---
 htdocs/core/lib/functions.lib.php | 3 ++-
 htdocs/core/lib/images.lib.php    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 534555cd8e5..457f8068c0e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6844,7 +6844,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
 
 	if (empty($conf->use_javascript_ajax)) return '';
 
-	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');
+	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
 	//$mime_preview[]='archive';
 	$num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
@@ -6950,6 +6950,7 @@ function dol_mimetype($file, $default='application/octet-stream', $mode=0)
 	if (preg_match('/\.gif$/i',$tmpfile))					   { $mime='image/gif';    $imgmime='image.png'; $famime='file-image-o'; }
 	if (preg_match('/\.bmp$/i',$tmpfile))					   { $mime='image/bmp';    $imgmime='image.png'; $famime='file-image-o'; }
 	if (preg_match('/\.(tif|tiff)$/i',$tmpfile))			   { $mime='image/tiff';   $imgmime='image.png'; $famime='file-image-o'; }
+	if (preg_match('/\.svg$/i',$tmpfile))					   { $mime='image/svg+xml';$imgmime='image.png'; $famime='file-image-o'; }
 	// Calendar
 	if (preg_match('/\.vcs$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
 	if (preg_match('/\.ics$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index e6f69da1d93..f0a666b03e9 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -37,7 +37,7 @@ $quality = 80;
  */
 function image_format_supported($file)
 {
-    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm';   // See also into product.class.php
+    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg';   // See also into product.class.php
 
     // Case filename is not a format image
     if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;

From 4f369bd746075fa2f60c55167f8218a2a2d5f8cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 16:34:43 +0100
Subject: [PATCH 109/386] NEW Can force usage of shared link for photo of
 products

---
 htdocs/product/class/product.class.php | 40 +++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e6439031146..73d867e7141 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4095,9 +4095,11 @@ class Product extends CommonObject
 	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
 	 * 	@param		int		$maxWidth		Max width of original image when size='small'
 	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
+	 *  @param      int     $notitle         Do not add title tag on image
+	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
 	 */
-	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160,$nolink=0)
+	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160,$nolink=0,$notitle=0,$usesharelink=0)
 	{
 		global $conf,$user,$langs;
 
@@ -4196,15 +4198,39 @@ class Product extends CommonObject
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						if ($notitle) $alt='';
 
-						if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+						if ($usesharelink)
 						{
-							$return.= '<!-- Show thumb -->';
-							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+							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" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+								}
+								else {
+									$return.= '<!-- Show original file -->';
+									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+								}
+							}
+							else
+							{
+								$return.= '<!-- Show nophoto file (because file is not shared) -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+							}
 						}
-						else {
-							$return.= '<!-- Show original file -->';
-							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+						else
+						{
+							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+							{
+								$return.= '<!-- Show thumb -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+							}
+							else {
+								$return.= '<!-- Show original file -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+							}
 						}
 
 						if (empty($nolink)) $return.= '</a>';

From b128c95a74ffa4e6e3aaea01933ac8eab15255b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 19:08:46 +0100
Subject: [PATCH 110/386] NEW Add showempty parameter in country selection

---
 htdocs/core/class/html.form.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cbd2eb5c3b3..4e8f67d6552 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -646,9 +646,10 @@ class Form
 	 *  @param	integer	$maxlength		Max length for labels (0=no limit)
 	 *  @param	string	$morecss		More css class
 	 *  @param	string	$usecodeaskey	'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+	 *  @param	int		$showempty		Show empty choice
 	 *  @return string           		HTML string with select
 	 */
-	function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0,$morecss='minwidth300',$usecodeaskey='')
+	function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
 	{
 		global $conf,$langs;
 
@@ -693,20 +694,22 @@ class Form
 
 				foreach ($countryArray as $row)
 				{
+					if (empty($showempty) && empty($row['rowid'])) continue;
+
 					if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite=0;
-						$out.= '<option a 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 b value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
+						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
 					}
 					else
 					{
-						$out.= '<option c 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']).'">';
 					}
 					if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
 					else $out.= '&nbsp;';

From 795cbaa978d9281692cfeff95651692e62d450eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Feb 2018 20:13:35 +0100
Subject: [PATCH 111/386] Code comment

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 7b6ef9bbde1..14f017bef55 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -129,7 +129,7 @@ class Translate
 	 *  Return active language code for current user
 	 * 	It's an accessor for this->defaultlang
 	 *
-	 *  @param	int		$mode       0=Long language code, 1=Short language code
+	 *  @param	int		$mode       0=Long language code, 1=Short language code (en, fr, es, ...)
 	 *  @return string      		Language code used (en_US, en_AU, fr_FR, ...)
 	 */
 	function getDefaultLang($mode=0)

From 4f9bb336009b16bf9d827138631cab35c81ba2ea Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 14 Feb 2018 10:47:10 +0100
Subject: [PATCH 112/386] NEW: supplier credit notes: convert to usable
 absolute discount + link/unlink to supplier invoice + create supplier credit
 note from excess paid

---
 htdocs/compta/facture/card.php                |   8 +-
 htdocs/core/class/commoninvoice.class.php     |   6 -
 htdocs/core/class/commonobject.class.php      |   2 +-
 htdocs/core/class/discount.class.php          |  64 +++-
 htdocs/core/class/html.form.class.php         |  49 ++-
 htdocs/core/lib/doc.lib.php                   |   2 +-
 htdocs/core/lib/pdf.lib.php                   |   2 +-
 htdocs/core/tpl/objectline_view.tpl.php       |   4 +-
 .../fourn/class/fournisseur.facture.class.php | 100 +++++
 htdocs/fourn/facture/card.php                 | 343 +++++++++++++++++-
 htdocs/societe/class/societe.class.php        |   5 +-
 htdocs/societe/consumption.php                |   4 +-
 12 files changed, 519 insertions(+), 70 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 01ea8d93de3..df5e78b8712 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2989,11 +2989,11 @@ else if ($id > 0 || ! empty($ref))
 	$resteapayeraffiche = $resteapayer;
 
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
-		$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
+		$filterabsolutediscount = "fk_facture IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$filtercreditnote = "fk_facture IS 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 (fk_facture_source IS NOT NULL AND (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)%')";
+		$filterabsolutediscount = "fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+		$filtercreditnote = "fk_facture IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
 	}
 
 	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 9d7ae9d0998..c629c6021b4 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -180,12 +180,6 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	function getSumCreditNotesUsed($multicurrency=0)
 	{
-	    if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	        return 0;
-	    }
-
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 	    $discountstatic=new DiscountAbsolute($this->db);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0dd9a245136..a320d102c4e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3955,7 +3955,7 @@ abstract class CommonObject
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
+			} // TODO handle (EXCESS PAID)
 			else
 			{
 				$this->tpl['description'] = dol_trunc($line->desc,60);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 37dedea8b6b..c8aa11996b6 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -60,16 +60,17 @@ class DiscountAbsolute
     /**
      *	Load object from database into memory
      *
-     *  @param      int		$rowid       		id discount to load
-     *  @param      int		$fk_facture_source	fk_facture_source
-     *	@return		int							<0 if KO, =0 if not found, >0 if OK
+     *  @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
      */
-    function fetch($rowid, $fk_facture_source=0)
+    function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0)
     {
     	global $conf;
 
         // Check parameters
-        if (! $rowid && ! $fk_facture_source)
+        if (! $rowid && ! $fk_facture_source && ! $fk_invoice_supplier_source)
         {
             $this->error='ErrorBadParameters';
             return -1;
@@ -79,14 +80,16 @@ class DiscountAbsolute
         $sql.= " sr.fk_user,";
         $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
         $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.description,";
+        $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.facnumber as ref_facture_source";
+        $sql.= " f.facnumber as ref_facture_source, fsup.facnumber as ref_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 = " . $conf->entity;
         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);
@@ -113,6 +116,10 @@ class DiscountAbsolute
                 $this->fk_facture = $obj->fk_facture;
                 $this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
                 $this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir 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 avoir source
+                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source;	// Ref avoir source
                 $this->description = $obj->description;
                 $this->datec = $this->db->jdate($obj->datec);
 
@@ -161,11 +168,12 @@ class DiscountAbsolute
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
         $sql.= " (entity, datec, fk_soc, fk_user, description,";
         $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
-        $sql.= " fk_facture_source";
+        $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.", ".$user->id.", '".$this->db->escape($this->description)."',";
         $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
-        $sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null");
+        $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);
@@ -194,7 +202,7 @@ class DiscountAbsolute
         global $conf, $langs;
 
         // Check if we can remove the discount
-        if ($this->fk_facture_source)
+        if ($this->fk_facture_source)  // TODO check
         {
             $sql="SELECT COUNT(rowid) as nb";
             $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
@@ -278,9 +286,10 @@ class DiscountAbsolute
      *
      *	@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)
+     *	@param		string	$mode			'supplier' to link to supplier invoice, 'customer' instead
      *	@return		int						<0 if KO, >0 if OK
      */
-    function link_to_invoice($rowidline,$rowidinvoice)
+    function link_to_invoice($rowidline,$rowidinvoice,$mode='customer')
     {
         // Check parameters
         if (! $rowidline && ! $rowidinvoice)
@@ -295,16 +304,26 @@ class DiscountAbsolute
         }
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        if($mode == 'supplier') {
+        	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)
         {
-            $this->fk_facture_line=$rowidline;
-            $this->fk_facture=$rowidinvoice;
+        	if($mode == 'supplier') {
+        		$this->fk_invoice_supplier_line=$rowidline;
+        		$this->fk_invoice_supplier=$rowidinvoice;
+        	} else {
+        		$this->fk_facture_line=$rowidline;
+        		$this->fk_facture=$rowidinvoice;
+        	}
             return 1;
         }
         else
@@ -319,12 +338,17 @@ class DiscountAbsolute
      *	Link the discount to a particular invoice line or a particular invoice.
      *	Do not call this if discount is linked to a reconcialiated invoice
      *
+     *	@param		string		$mode			'supplier' to unlink a supplier invoice, 'customer' instead
      *	@return		int							<0 if KO, >0 if OK
      */
-    function unlink_invoice()
+    function unlink_invoice($mode = 'customer')
     {
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+		if($mode = 'supplier') {
+       		$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;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
@@ -359,8 +383,8 @@ class DiscountAbsolute
         //$sql  = "SELECT rc.amount_ttc as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
         $sql.= " WHERE rc.entity = " . $conf->entity;
-        if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
-        else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
+        if ($mode == 'supplier') $sql.= " AND (rc.fk_facture_source IS NULL AND rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
+        else $sql.= " AND (rc.fk_invoice_supplier_source IS NULL AND rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";	        // Available
         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.')';
@@ -452,7 +476,7 @@ class DiscountAbsolute
             $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 = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
+            $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
         }
         else
         {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4e8f67d6552..8a1cc6ac33c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1236,6 +1236,7 @@ class Form
 					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc=preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
 					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc=preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
 					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc=preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+					// TODO handle (EXCESS PAID)
 
 					$selectstring='';
 					if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected';
@@ -4219,9 +4220,10 @@ class Form
 	 * 	@param	int		$maxvalue		Max value for lines that can be selected
 	 *  @param  string	$more           More string to add
 	 *  @param  int     $hidelist       1=Hide list
+	 *  @param	string	$mode			'supplier' to list available discounts for suppliers, 'customer' instead
 	 *  @return	void
 	 */
-	function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0)
+	function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $mode='customer')
 	{
 		global $conf,$langs;
 		if ($htmlname != "none")
@@ -4230,28 +4232,51 @@ class Form
 			print '<input type="hidden" name="action" value="setabsolutediscount">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<div class="inline-block">';
-			if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-			{
-				if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
-				else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
-			}
-			else
-			{
-				if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%'))") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
-				else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+			if($mode == 'supplier') {
+				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				{
+					if (! $filter || $filter=="fk_invoice_supplier IS NOT NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
+					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+				}
+				else
+				{
+					if (! $filter || $filter=="fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
+					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+				}
+			} else {
+				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				{
+					if (! $filter || $filter=="fk_facture IS NOT NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
+					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+				}
+				else
+				{
+					if (! $filter || $filter=="fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
+					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+				}
 			}
 			if (empty($hidelist)) print ': ';
 			print '</div>';
 			if (empty($hidelist))
 			{
 				print '<div class="inline-block" style="padding-right: 10px">';
-				$newfilter='fk_facture IS NULL AND fk_facture_line IS NULL';	// Remises disponibles
+				if($mode == 'supplier') {
+					$newfilter = 'fk_facture_source IS NULL AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Exclude customer discounts
+					$newfilter.= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available
+				} else {
+					$newfilter = 'fk_invoice_supplier_source IS NULL AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Exclude supplier discounts
+					$newfilter.= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
+				}
 				if ($filter) $newfilter.=' AND ('.$filter.')';
 				$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")).'"';
-					if ($filter && $filter != "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description LIKE '(DEPOSIT)%')") print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					if($mode == 'supplier' && $filter && $filter != "fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
+						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+					if($mode != 'supplier' && $filter && $filter != "fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
+						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
+
 					print '>';
 				}
 				print '</div>';
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 99e576ad057..20eaa9a71f7 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -88,7 +88,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
+		} // TODO handle (EXCESS PAID)
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 377f2215b6d..0fb649506cb 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1251,7 +1251,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
+		} // TODO handle (EXCESS PAID)
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8d5b13ece7c..bc5d950ab8e 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -72,7 +72,7 @@ if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
 		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); // TODO handle (EXCESS PAID)
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -100,7 +100,7 @@ if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
+			} // TODO handle (EXCESS PAID)
 			else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 444eb5d200a..b23c9af5fce 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -897,6 +897,106 @@ class FactureFournisseur extends CommonInvoice
         }
     }
 
+    /**
+     *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
+     *
+     *    @param     int	$idremise	Id of absolute discount
+     *    @return    int          		>0 if OK, <0 if KO
+     */
+    function insert_discount($idremise)
+    {
+    	global $langs;
+    	
+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+    	include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+    	
+    	$this->db->begin();
+    	
+    	$remise=new DiscountAbsolute($this->db);
+    	$result=$remise->fetch($idremise);
+    	
+    	if ($result > 0)
+    	{
+    		if ($remise->fk_invoice_supplier)	// Protection against multiple submission
+    		{
+    			$this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+    			$this->db->rollback();
+    			return -5;
+    		}
+    		
+    		$facligne=new SupplierInvoiceLine($this->db);
+    		$facligne->fk_facture=$this->id;
+    		$facligne->fk_remise_except=$remise->id;
+    		$facligne->desc=$remise->description;   	// Description ligne
+    		$facligne->vat_src_code=$remise->vat_src_code;
+    		$facligne->tva_tx=$remise->tva_tx;
+    		$facligne->subprice = -$remise->amount_ht;
+    		$facligne->fk_product=0;					// Id produit predefini
+    		$facligne->qty=1;
+    		$facligne->remise_percent=0;
+    		$facligne->rang=-1;
+    		$facligne->info_bits=2;
+    		
+    		// Get buy/cost price of invoice that is source of discount
+    		if ($remise->fk_invoice_supplier_source > 0)
+    		{
+    			$srcinvoice=new FactureFournisseur($this->db);
+    			$srcinvoice->fetch($remise->fk_invoice_supplier_source);
+    			$totalcostpriceofinvoice=0;
+    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';  // TODO Move this into commonobject
+    			$formmargin=new FormMargin($this->db);
+    			$arraytmp=$formmargin->getMarginInfosArray($srcinvoice, false);
+    			$facligne->pa_ht = $arraytmp['pa_total'];
+    		}
+    		
+    		$facligne->total_ht  = -$remise->amount_ht;
+    		$facligne->total_tva = -$remise->amount_tva;
+    		$facligne->total_ttc = -$remise->amount_ttc;
+    		
+    		$facligne->multicurrency_subprice = -$remise->multicurrency_subprice;
+    		$facligne->multicurrency_total_ht = -$remise->multicurrency_total_ht;
+    		$facligne->multicurrency_total_tva = -$remise->multicurrency_total_tva;
+    		$facligne->multicurrency_total_ttc = -$remise->multicurrency_total_ttc;
+    		
+    		$lineid=$facligne->insert();
+    		if ($lineid > 0)
+    		{
+    			$result=$this->update_price(1);
+    			if ($result > 0)
+    			{
+    				// Create link between discount and invoice line
+    				$result=$remise->link_to_invoice($lineid,0,'supplier');
+    				if ($result < 0)
+    				{
+    					$this->error=$remise->error;
+    					$this->db->rollback();
+    					return -4;
+    				}
+    				
+    				$this->db->commit();
+    				return 1;
+    			}
+    			else
+    			{
+    				$this->error=$facligne->error;
+    				$this->db->rollback();
+    				return -1;
+    			}
+    		}
+    		else
+    		{
+    			$this->error=$facligne->error;
+    			$this->db->rollback();
+    			return -2;
+    		}
+    	}
+    	else
+    	{
+    		$this->db->rollback();
+    		return -3;
+    	}
+    }
+    
 
     /**
      *	Delete invoice from database
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 761d5d591e3..a397d40d147 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 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/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -265,6 +266,14 @@ if (empty($reshook))
 			$action='';
 		}
 	}
+	
+	// Delete link of credit note to invoice
+	else if ($action == 'unlinkdiscount' && $user->rights->facture->creer)
+	{
+		$discount = new DiscountAbsolute($db);
+		$result = $discount->fetch(GETPOST("discountid"));
+		$discount->unlink_invoice('supplier');
+	}
 
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
 	{
@@ -376,6 +385,186 @@ if (empty($reshook))
 		$result=$object->update($user);
 		if ($result < 0) dol_print_error($db,$object->error);
 	}
+	elseif ($action == "setabsolutediscount" && $user->rights->facture->creer)
+	{
+		// POST[remise_id] or POST[remise_id_for_payment]
+	
+		// We use the credit to reduce amount of invoice
+		if (! empty($_POST["remise_id"])) {
+			$ret = $object->fetch($id);
+			if ($ret > 0) {
+				$result = $object->insert_discount($_POST["remise_id"]);
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			} else {
+				dol_print_error($db, $object->error);
+			}
+		}
+		// We use the credit to reduce remain to pay
+		if (! empty($_POST["remise_id_for_payment"]))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+			$discount = new DiscountAbsolute($db);
+			$discount->fetch($_POST["remise_id_for_payment"]);
+			
+			//var_dump($object->getRemainToPay(0));
+			//var_dump($discount->amount_ttc);exit;
+			if ($discount->amount_ttc > $object->getRemainToPay(0))
+			{
+				// TODO Split the discount in 2 automatically
+				$error++;
+				setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors');
+			}
+
+			if (! $error)
+			{
+				$result = $discount->link_to_invoice(0, $id, 'supplier');
+				if ($result < 0) {
+					setEventMessages($discount->error, $discount->errors, 'errors');
+				}
+			}
+		}
+		
+		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);
+			}
+			$ret = $object->fetch($id); // Reload to get new records
+			
+			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	// Convertir en reduc
+	else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->facture->creer)
+	{
+		$object->fetch($id);
+		$object->fetch_thirdparty();
+		//$object->fetch_lines();	// Already done into fetch
+		
+		// Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
+		$discountcheck=new DiscountAbsolute($db);
+		$result=$discountcheck->fetch(0,0,$object->id);
+
+		$canconvert=0;
+		if ($object->type == FactureFournisseur::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 (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->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)
+		{
+			$db->begin();
+			
+			$amount_ht = $amount_tva = $amount_ttc = array();
+			
+			// Loop on each vat rate
+			$i = 0;
+			foreach ($object->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;
+					$i ++;
+				}
+			}
+			
+			// Insert one discount by VAT rate category
+			$discount = new DiscountAbsolute($db);
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+				$discount->description = '(CREDIT_NOTE)';
+			elseif ($object->type == FactureFournisseur::TYPE_DEPOSIT)
+				$discount->description = '(DEPOSIT)';
+			elseif ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION)
+				$discount->description = '(EXCESS PAID)';
+			else {
+				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
+			}
+			$discount->fk_soc = $object->socid;
+			$discount->fk_invoice_supplier_source = $object->id;
+			
+			$error = 0;
+				
+			if ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION)
+			{
+				// If we're on a standard invoice, we have to get excess paid to create a discount in TTC without VAT
+				
+				$sql = 'SELECT SUM(pf.amount) as total_paiements';
+				$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'paiementfourn as p';
+				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (' . getEntity('c_paiement') . ')';
+				$sql.= ' WHERE pf.fk_facturefourn = '.$object->id;
+				$sql.= ' AND pf.fk_paiementfourn = p.rowid';
+				$sql.= ' AND p.entity IN (' . getEntity('facture').')';
+				$sql.= ' ORDER BY p.datep, p.tms';
+
+				$resql = $db->query($sql);
+				if (! $resql) dol_print_error($db);
+
+				$res = $db->fetch_object($resql);
+				$total_paiements = $res->total_paiements;
+				
+				$discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
+				$discount->amount_tva = 0;
+				$discount->tva_tx = 0;
+
+				$result = $discount->create($user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+				
+			}
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::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->tva_tx = abs($tva_tx);
+					
+					$result = $discount->create($user);
+					if ($result < 0)
+					{
+						$error++;
+						break;
+					}
+				}
+				
+			}
+			
+			if (empty($error))
+			{
+				if($object->type != FactureFournisseur::TYPE_DEPOSIT) {
+					// Classe facture
+					$result = $object->set_paid($user);
+					if ($result >= 0)
+					{
+						$db->commit();
+					}
+					else
+					{
+						setEventMessages($object->error, $object->errors, 'errors');
+						$db->rollback();
+					}
+				} else {
+					$db->commit();
+				}
+			}
+			else
+			{
+				setEventMessages($discount->error, $discount->errors, 'errors');
+				$db->rollback();
+			}
+		}
+	}
+	
 
 	// Delete payment
 	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
@@ -464,6 +653,7 @@ if (empty($reshook))
 		// Credit note invoice
 		if ($_POST['type'] == FactureFournisseur::TYPE_CREDIT_NOTE)
 		{
+
 			$sourceinvoice = GETPOST('fac_avoir','int');
 			if (! ($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
 			{
@@ -519,6 +709,10 @@ if (empty($reshook))
 
 				$id = $object->create($user);
 
+				if($id <= 0) {
+					$error++;
+				}
+
 				if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0)
 				{
 					$facture_source = new FactureFournisseur($db); // fetch origin object
@@ -677,7 +871,7 @@ if (empty($reshook))
 							}
 
 							$num=count($lines);
-							for ($i = 0; $i < $num; $i++)
+							for ($i = 0; $i < $num; $i++) // TODO handle subprice < 0
 							{
 								$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
 								$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
@@ -1485,6 +1679,7 @@ if ($action == 'create')
 
 	if ($societe->id > 0)
 	{
+		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 'supplier');
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	}
@@ -1717,22 +1912,22 @@ if ($action == 'create')
 
 	print '</td></tr>';
 
-	if ($socid > 0)
+	if ($societe->id > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
+		if ($societe->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
 		else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
 		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
+			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
 		else
 			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
 		print '.';
 		print '</td></tr>';
 	}
@@ -1944,6 +2139,18 @@ else
 		}
 		$resteapayeraffiche = $resteapayer;
 
+		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
+			$filterabsolutediscount = "fk_invoice_supplier IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+			$filtercreditnote = "fk_invoice_supplier IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
+		}
+		
+		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 'supplier');
+		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 'supplier');
+		$absolute_discount = price2num($absolute_discount, 'MT');
+		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
 		/*
          *	View card
@@ -1953,6 +2160,17 @@ else
 
 		dol_fiche_head($head, 'card', $titre, -1, 'bill');
 
+		$formconfirm = '';
+
+		// Confirmation de la conversion de l'avoir en reduc
+		if ($action == 'converttoreduc') {
+			if($object->type == FactureFournisseur::TYPE_STANDARD) $type_fac = 'ExcessReceived'; // TODO translation trop-perçu => trop-payé
+			elseif($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $type_fac = 'CreditNote';
+			elseif($object->type == FactureFournisseur::TYPE_DEPOSIT) $type_fac = 'Deposit';
+			$text = $langs->trans('ConfirmConvertToReduc', strtolower($langs->transnoentities($type_fac))); // TODO translation client => fournisseur
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $langs->trans('ConvertToReduc'), $text, 'confirm_converttoreduc', '', "yes", 2);
+		}
+
 		// Clone confirmation
 		if ($action == 'clone')
 		{
@@ -2189,7 +2407,88 @@ else
             print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
         }
         print '</td></tr>';
-
+        
+        // Relative and absolute discounts
+        $addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+        $addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+        $addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+        $viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
+		
+		print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
+		print '</td><td>';
+		if ($societe->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		// print ' ('.$addrelativediscount.')';
+		
+		// Is there is commercial discount or down payment available ?
+		if ($absolute_discount > 0) {
+			print '. ';
+			if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+				if ($object->statut == 0) {
+					print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+					print '. ';
+				} else {
+					if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+						print '<br>' . $text . '.<br>';
+					} else {
+						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+						$text2 = $langs->trans("AbsoluteDiscountUse");
+						print $form->textwithpicto($text, $text2);
+					}
+				}
+			} else {
+				// Discount available of type fixed amount (not credit note)
+				print '<br>';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 'supplier');
+			}
+		} else {
+			if ($absolute_creditnote > 0) 		// If not, link will be added later
+			{
+				if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
+					print ' (' . $addabsolutediscount . ')<br>';
+				else
+					print '. ';
+			} else
+				print '. ';
+		}
+		// Is there credit notes availables ?
+		if ($absolute_creditnote > 0)
+		{
+			// If validated, we show link "add credit note to payment"
+			if ($object->statut != FactureFournisseur::STATUS_VALIDATED || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+				if ($object->statut == 0 && $object->type != FactureFournisseur::TYPE_DEPOSIT) {
+					$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
+					print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
+				} else {
+					print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
+				}
+			} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
+				// There is credit notes discounts available
+				if (! $absolute_discount) print '<br>';
+				// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 'supplier');
+				$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 'supplier'); // We allow credit note even if amount is higher
+			}
+		}
+		if (! $absolute_discount && ! $absolute_creditnote) {
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+			if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
+				print ' (' . $addabsolutediscount . ')<br>';
+			else
+				print '. ';
+		}
+		// if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
+		// {
+		// if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
+		// print ' &nbsp; - &nbsp; ';
+		// print $addabsolutediscount;
+		// print ' &nbsp; - &nbsp; '.$addcreditnote; // We disbale link to credit note
+		// }
+		print '</td></tr>';
+			
         // Label
         print '<tr>';
         print '<td>'.$form->editfieldkey("Label",'label',$object->label,$object,($user->rights->fournisseur->facture->creer)).'</td>';
@@ -2539,18 +2838,19 @@ else
 				print $langs->trans('AlreadyPaid');
 			print ' :</td><td align="right"'.(($totalpaye > 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . '</td><td>&nbsp;</td></tr>';
 
-			$resteapayer = $object->total_ttc - $totalpaye;
+			//$resteapayer = $object->total_ttc - $totalpaye;
 			$resteapayeraffiche = $resteapayer;
+
 			$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 			// Loop on each credit note or deposit amount applied
 			$creditnoteamount = 0;
 			$depositamount = 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_supplier as re";
-			$sql .= " WHERE fk_facture = " . $object->id;
+			$sql .= " re.description, re.fk_invoice_supplier_source";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
+			$sql .= " WHERE fk_invoice_supplier = " . $object->id;
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
@@ -2558,7 +2858,7 @@ else
 				$invoice = new FactureFournisseur($db);
 				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
-					$invoice->fetch($obj->fk_facture_source);
+					$invoice->fetch($obj->fk_invoice_supplier_source);
 					print '<tr><td colspan="' . $nbcols . '" align="right">';
 					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
 						print $langs->trans("CreditNote") . ' ';
@@ -2568,7 +2868,7 @@ else
 					print ' :</td>';
 					print '<td align="right">' . price($obj->amount_ttc) . '</td>';
 					print '<td align="right">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>'; // TODO unlinkdiscount
 					print '</td></tr>';
 					$i ++;
 					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
@@ -2579,7 +2879,7 @@ else
 			} else {
 				dol_print_error($db);
 			}
-            */
+
 
 			// Paye partiellement 'escompte'
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
@@ -2627,7 +2927,7 @@ else
 			else
 				print $langs->trans('ExcessReceived');
 			print ' :</td>';
-			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':$cssforamountpaymentcomplete).'>' . price($resteapayeraffiche) . '</td>';
+			print '<td align="right" class="'.($resteapayeraffiche?'amountremaintopay':$cssforamountpaymentcomplete).'">' . price($resteapayeraffiche) . '</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
 		}
 		else // Credit note
@@ -2649,7 +2949,7 @@ else
 			else
 				print $langs->trans('ExcessPaydBack');
 			print ' :</td>';
-			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($sign * $resteapayeraffiche) . '</td>';
+			print '<td align="right" class="'.($resteapayeraffiche?'amountremaintopay':$cssforamountpaymentcomplete).'">' . price($sign * $resteapayeraffiche) . '</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
 
 			// Sold credit note
@@ -2792,7 +3092,7 @@ else
 				}
 
 				// Reverse back money or convert to reduction
-				if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+				if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD) {
 					// For credit note only
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0)
 					{
@@ -2806,6 +3106,11 @@ else
 						}
 					}
 
+					// For standard invoice with excess paid
+					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->facture->creer && empty($discount->id))
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessReceivedToReduc').'</a></div>'; // TODO translation : trop-perçu => trop payé
+					}
 					// For credit note
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&amp;action=converttoreduc">' . $langs->trans('ConvertToReduc') . '</a></div>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b9b431f3e3e..4adfae72258 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1718,14 +1718,15 @@ class Societe extends CommonObject
 	 *	@param	User	$user		Filtre sur un user auteur des remises
 	 * 	@param	string	$filter		Filtre autre
 	 * 	@param	integer	$maxvalue	Filter on max value for discount
+	 * 	@param	string	$mode		'supplier' to get available discounts for suppliers, 'customer' instead
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
+	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$mode='customer')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);
+		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$mode);
 		if ($result >= 0)
 		{
 			return $result;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ffb4cac77fa..1420562da19 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -490,7 +490,7 @@ if ($sql_select)
 			$txt='';
 			print img_object($langs->trans("ShowReduc"),'reduc').' ';
 			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); // TODO handle (EXCESS PAID)
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -517,7 +517,7 @@ if ($sql_select)
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 					// Add date of deposit
 					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
+				} // TODO handle (EXCESS PAID)
 				else
 				{
 					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);

From daca27b2ed8e8a2924105de16b32f7f8d894d117 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 14 Feb 2018 18:02:40 +0100
Subject: [PATCH 113/386] NEW: supplier credit notes: split display in
 thirdparty discount page + fixes + refactoring

---
 htdocs/comm/card.php                          |   2 +-
 htdocs/comm/remx.php                          | 372 +++++++++++++++++-
 htdocs/core/class/discount.class.php          |  93 ++++-
 htdocs/core/class/html.form.class.php         |  15 +-
 .../fourn/class/fournisseur.facture.class.php |   2 +-
 htdocs/fourn/facture/card.php                 |  21 +-
 .../install/mysql/migration/7.0.0-8.0.0.sql   |   1 +
 .../tables/llx_societe_remise_except.key.sql  |   1 +
 .../tables/llx_societe_remise_except.sql      |   3 +-
 htdocs/societe/class/societe.class.php        |  25 +-
 10 files changed, 476 insertions(+), 59 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 81443f04d62..d732a10a347 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -392,7 +392,7 @@ if ($object->id > 0)
 	print '</td></tr></table>';
 	print '</td>';
 	print '<td>';
-	$amount_discount=$object->getAvailableDiscounts();
+	$amount_discount=$object->getAvailableDiscounts(); // TODO adapt to supplier discounts
 	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");
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 0127b8f15be..072baa675fb 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -26,6 +26,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 $langs->load("orders");
@@ -143,6 +144,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	$amount_ht=GETPOST('amount_ht');
 	$desc=GETPOST('desc','alpha');
 	$tva_tx=GETPOST('tva_tx','alpha');
+	$discount_type=! empty($_POST['discount_type'])?GETPOST('discount_type','alpha'):0;
 
 	if (price2num($amount_ht) > 0)
 	{
@@ -157,7 +159,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 		{
 			$soc = new Societe($db);
 			$soc->fetch($id);
-			$discountid=$soc->set_remise_except($amount_ht,$user,$desc,$tva_tx);
+			$discountid=$soc->set_remise_except($amount_ht,$user,$desc,$tva_tx,$discount_type);
 
 			if ($discountid > 0)
 			{
@@ -215,6 +217,7 @@ if (GETPOST('action','aZ09') == 'confirm_remove' && GETPOST("confirm")=='yes')
 
 $form=new Form($db);
 $facturestatic=new Facture($db);
+$facturefournstatic=new FactureFournisseur($db);
 
 llxHeader('',$langs->trans("GlobalDiscount"));
 
@@ -244,12 +247,13 @@ if ($socid > 0)
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-	// Calcul avoirs en cours
+	// Calcul avoirs client en cours
 	$remise_all=$remise_user=0;
 	$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
 	$sql.= " WHERE rc.fk_soc = " . $object->id;
 	$sql.= " AND rc.entity = " . $conf->entity;
+	$sql.= " AND discount_type = 0"; // Exclude supplier discounts
 	$sql.= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
 	$sql.= " GROUP BY rc.fk_user";
 	$resql=$db->query($sql);
@@ -264,14 +268,47 @@ if ($socid > 0)
 		dol_print_error($db);
 	}
 
-	print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
+	print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>'; // TODO adapt text
 	print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
 	if (! empty($user->fk_soc))    // No need to show this for external users
 	{
-    	print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
+		print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>'; // TODO adapt text
     	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 	}
+
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		// Calcul avoirs fournisseur en cours
+		$remise_all=$remise_user=0;
+		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND discount_type = 1"; // Exclude customer discounts
+		$sql.= " AND (fk_invoice_supplier_line IS NULL AND fk_invoice_supplier IS NULL)";
+		$sql.= " GROUP BY rc.fk_user";
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			$remise_all+=$obj->amount;
+			if ($obj->fk_user == $user->id) $remise_user+=$obj->amount;
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+		
+		print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>'; // TODO adapt text
+		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+		
+		if (! empty($user->fk_soc))    // No need to show this for external users
+		{
+			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>'; // TODO adapt text
+			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+		}
+	}
+
 	print '</table>';
 
 	print '</div>';
@@ -284,6 +321,11 @@ if ($socid > 0)
 
     	print '<div class="underbanner clearboth"></div>';
     	print '<table class="border" width="100%">';
+		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	    	print '<tr><td>'.$langs->trans('DiscountType').'</td>';
+	    	print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+	    	print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label></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>';
@@ -321,9 +363,18 @@ if ($socid > 0)
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.GETPOST('remid'), $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1);
 	}
 
+
 	/*
-	 * Liste remises fixes restant en cours (= liees a aucune facture ni ligne de facture)
+	 * Liste remises fixes client restant en cours (= liees a aucune facture ni ligne de facture)
 	 */
+	
+	print load_fiche_titre($langs->trans("DiscountStillRemaining"));
+	
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+	}
+
 	$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
 	$sql.= " rc.datec as dc, rc.description,";
 	$sql.= " rc.fk_facture_source,";
@@ -334,13 +385,16 @@ if ($socid > 0)
 	$sql.= " WHERE rc.fk_soc = " . $object->id;
 	$sql.= " AND rc.entity = " . $conf->entity;
 	$sql.= " AND u.rowid = rc.fk_user";
+	$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
 	$sql.= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
 	$sql.= " ORDER BY rc.datec DESC";
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-		print load_fiche_titre($langs->trans("DiscountStillRemaining"));
+		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', ''); // TODO translate
+		}
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -449,11 +503,157 @@ if ($socid > 0)
 		dol_print_error($db);
 	}
 
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		print '</div>'; // class="fichehalfleft"
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+
+		/*
+		 * Liste remises fixes fournisseur restant en cours (= liees a aucune facture ni ligne de facture)
+		 */
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql.= " rc.datec as dc, rc.description,";
+		$sql.= " rc.fk_invoice_supplier_source,";
+		$sql.= " u.login, u.rowid as user_id,";
+		$sql.= " fa.ref, fa.type as type";
+		$sql.= " FROM  ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND u.rowid = rc.fk_user";
+		$sql.= " AND rc.discount_type = 1"; // Eliminate customer discounts
+		$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";
+		$sql.= " ORDER BY rc.datec DESC";
+		
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', ''); // TODO translate
+			print '<table width="100%" class="noborder">';
+			print '<tr class="liste_titre">';
+			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
+			print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
+			print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
+			print '<td width="100" align="center">'.$langs->trans("DiscountOfferedBy").'</td>';
+			print '<td width="50">&nbsp;</td>';
+			print '</tr>';
+			
+			$showconfirminfo=array();
+			
+			$i = 0;
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
+				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="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturefournstatic->getNomURl(1);
+						print '</td>';
+					}
+					elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
+					{
+						print '<td class="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturefournstatic->getNomURl(1);
+						print '</td>';
+					}
+					elseif (preg_match('/\(EXCESS PAID\)/',$obj->description))
+					{
+						print '<td class="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(EXCESS PAID\)/',$langs->trans("ExcessPaid"),$obj->description).' '.$facturefournstatic->getNomURl(1); // TODO translate ExcessPaid
+						print '</td>';
+					}
+					else
+					{
+						print '<td>';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
+					print '<td align="right">'.price($obj->amount_ht).'</td>';
+					print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+					print '<td align="right">'.price($obj->amount_ttc).'</td>';
+					print '<td align="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="nowrap">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
+						print ' &nbsp; ';
+						print '<a 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++;
+				}
+			}
+			else
+			{
+				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+			$db->free($resql);
+			print "</table>";
+			
+			if (count($showconfirminfo))
+			{
+				$amount1=price2num($showconfirminfo['amount_ttc']/2,'MT');
+				$amount2=($showconfirminfo['amount_ttc']-$amount1);
+				$formquestion=array(
+						'text' => $langs->trans('TypeAmountOfEachNewDiscount'),
+						array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
+						array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
+				);
+				$langs->load("dict");
+				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage?'&backtopage='.urlencode($backtopage):''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($showconfirminfo['amount_ttc']),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
+			}
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		print '</div>'; // class="ficheaddleft"
+		print '</div>'; // class="fichehalfright"
+		print '</div>'; // class="fichecenter"
+	}
+
 	print '<br>';
 
 	/*
 	 * List discount consumed (=liees a une ligne de facture ou facture)
 	 */
+	
+	print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
+
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+	}
 
 	// Remises liees a lignes de factures
 	$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
@@ -471,6 +671,7 @@ if ($socid > 0)
 	$sql.= " AND rc.fk_facture_line = fc.rowid";
 	$sql.= " AND fc.fk_facture = f.rowid";
 	$sql.= " AND rc.fk_user = u.rowid";
+	$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
 	$sql.= " ORDER BY dc DESC";
 	//$sql.= " UNION ";
 	// Remises liees a factures
@@ -487,7 +688,7 @@ if ($socid > 0)
 	$sql2.= " WHERE rc.fk_soc =". $object->id;
 	$sql2.= " AND rc.fk_facture = f.rowid";
 	$sql2.= " AND rc.fk_user = u.rowid";
-
+	$sql2.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
 	$sql2.= " ORDER BY dc DESC";
 
 	$resql=$db->query($sql);
@@ -495,7 +696,9 @@ if ($socid > 0)
 	if ($resql) $resql2=$db->query($sql2);
 	if ($resql2)
 	{
-		print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
+		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', ''); // TODO translate
+		}
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -598,6 +801,159 @@ if ($socid > 0)
 		dol_print_error($db);
 	}
 
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		print '</div>'; // class="fichehalfleft"
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+
+		// Remises liees a lignes de factures
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql.= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
+		$sql.= " rc.fk_invoice_supplier_source,";
+		$sql.= " u.login, u.rowid as user_id,";
+		$sql.= " f.rowid, f.ref as facnumber,";
+		$sql.= " fa.ref, fa.type as type";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql.= " , ".MAIN_DB_PREFIX."user as u";
+		$sql.= " , ".MAIN_DB_PREFIX."facture_fourn_det as fc";
+		$sql.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
+		$sql.= " WHERE rc.fk_soc =". $object->id;
+		$sql.= " AND rc.fk_invoice_supplier_line = fc.rowid";
+		$sql.= " AND fc.fk_facture_fourn = f.rowid";
+		$sql.= " AND rc.fk_user = u.rowid";
+		$sql.= " AND rc.discount_type = 1"; // Eliminate customer discounts
+		$sql.= " ORDER BY dc DESC";
+		//$sql.= " UNION ";
+		// Remises liees a factures
+		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql2.= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
+		$sql2.= " rc.fk_invoice_supplier_source,";
+		$sql2.= " u.login, u.rowid as user_id,";
+		$sql2.= " f.rowid, f.ref as facnumber,";
+		$sql2.= " fa.ref, fa.type as type";
+		$sql2.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql2.= " , ".MAIN_DB_PREFIX."user as u";
+		$sql2.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
+		$sql2.= " WHERE rc.fk_soc =". $object->id;
+		$sql2.= " AND rc.fk_invoice_supplier = f.rowid";
+		$sql2.= " AND rc.fk_user = u.rowid";
+		$sql2.= " AND rc.discount_type = 1"; // Eliminate customer discounts
+		$sql2.= " ORDER BY dc DESC";
+		
+		$resql=$db->query($sql);
+		$resql2=null;
+		if ($resql) $resql2=$db->query($sql2);
+		if ($resql2)
+		{
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', ''); // TODO translate
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre">';
+			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
+			print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
+			print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
+			print '<td width="100" align="center">'.$langs->trans("Author").'</td>';
+			print '<td width="50">&nbsp;</td>';
+			print '</tr>';
+			
+			$tab_sqlobj=array();
+			$tab_sqlobjOrder=array();
+			$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);
+				}
+			}
+			$db->free($resql);
+			
+			$num = $db->num_rows($resql2);
+			for ($i = 0;$i < $num;$i++)
+			{
+				$sqlobj = $db->fetch_object($resql2);
+				$tab_sqlobj[] = $sqlobj;
+				$tab_sqlobjOrder[]= $db->jdate($sqlobj->dc);
+			}
+			$db->free($resql2);
+			array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
+			
+			$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="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturefournstatic->getNomURl(1);
+						print '</td>';
+					}
+					elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
+					{
+						print '<td class="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturefournstatic->getNomURl(1);
+						print '</td>';
+					}
+					elseif (preg_match('/\(EXCESS PAID\)/',$obj->description))
+					{
+						print '<td class="nowrap">';
+						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
+						$facturefournstatic->ref=$obj->ref;
+						$facturefournstatic->type=$obj->type;
+						print preg_replace('/\(EXCESS PAID\)/',$langs->trans("Invoice"),$obj->description).' '.$facturefournstatic->getNomURl(1);
+						print '</td>';
+					}
+					else
+					{
+						print '<td>';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>'; // TODO adapt to supplier invoice of use getNomUrl
+					print '<td align="right">'.price($obj->amount_ht).'</td>';
+					print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+					print '<td align="right">'.price($obj->amount_ttc).'</td>';
+					print '<td align="center">';
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>'; // TODO getNomUrl ?
+					print '</td>';
+					print '<td>&nbsp;</td>';
+					print '</tr>';
+					$i++;
+				}
+			}
+			else
+			{
+				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+			
+			print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+		
+		print '</div>'; // class="ficheaddleft"
+		print '</div>'; // class="fichehalfright"
+		print '</div>'; // class="fichecenter"
+	}
 }
 
 llxFooter();
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index c8aa11996b6..b62e35c183e 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -34,6 +34,7 @@ class DiscountAbsolute
 
     public $id;					// Id discount
     public $fk_soc;
+    public $discount_type;			// 0 => customer discount, 1 => supplier discount
     public $amount_ht;				//
     public $amount_tva;			//
     public $amount_ttc;			//
@@ -76,7 +77,7 @@ class DiscountAbsolute
             return -1;
         }
 
-        $sql = "SELECT sr.rowid, sr.fk_soc,";
+        $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,";
         $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
@@ -101,6 +102,7 @@ class DiscountAbsolute
 
                 $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;
@@ -166,11 +168,11 @@ class DiscountAbsolute
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.= " (entity, datec, fk_soc, fk_user, description,";
+        $sql.= " (entity, datec, fk_soc, discount_type, fk_user, description,";
         $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
         $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.", ".$user->id.", '".$this->db->escape($this->description)."',";
+        $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)).", ".$user->id.", '".$this->db->escape($this->description)."',";
         $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
         $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");
@@ -202,7 +204,7 @@ class DiscountAbsolute
         global $conf, $langs;
 
         // Check if we can remove the discount
-        if ($this->fk_facture_source)  // TODO check
+        if ($this->fk_facture_source)
         {
             $sql="SELECT COUNT(rowid) as nb";
             $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
@@ -228,15 +230,46 @@ class DiscountAbsolute
                 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;
+        	
+        	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();
 
         // 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);
@@ -263,6 +296,26 @@ class DiscountAbsolute
                     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();
@@ -286,10 +339,9 @@ class DiscountAbsolute
      *
      *	@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)
-     *	@param		string	$mode			'supplier' to link to supplier invoice, 'customer' instead
      *	@return		int						<0 if KO, >0 if OK
      */
-    function link_to_invoice($rowidline,$rowidinvoice,$mode='customer')
+    function link_to_invoice($rowidline,$rowidinvoice)
     {
         // Check parameters
         if (! $rowidline && ! $rowidinvoice)
@@ -304,7 +356,7 @@ class DiscountAbsolute
         }
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if($mode == 'supplier') {
+        if(! empty($this->discount_type)) {
         	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
         	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
         } else {
@@ -317,7 +369,7 @@ class DiscountAbsolute
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	if($mode == 'supplier') {
+        	if(! empty($this->discount_type)) {
         		$this->fk_invoice_supplier_line=$rowidline;
         		$this->fk_invoice_supplier=$rowidinvoice;
         	} else {
@@ -338,13 +390,12 @@ class DiscountAbsolute
      *	Link the discount to a particular invoice line or a particular invoice.
      *	Do not call this if discount is linked to a reconcialiated invoice
      *
-     *	@param		string		$mode			'supplier' to unlink a supplier invoice, 'customer' instead
      *	@return		int							<0 if KO, >0 if OK
      */
-    function unlink_invoice($mode = 'customer')
+    function unlink_invoice()
     {
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-		if($mode = 'supplier') {
+		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";
@@ -368,14 +419,14 @@ class DiscountAbsolute
     /**
      *  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      string      $mode       'customer' = discounts the customer has, 'supplier' = discount i have at this supplier
+     *	@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		int						<0 if KO, amount otherwise
      */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $mode='customer')
+    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0)
     {
     	global $conf;
 
@@ -383,8 +434,12 @@ class DiscountAbsolute
         //$sql  = "SELECT rc.amount_ttc as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
         $sql.= " WHERE rc.entity = " . $conf->entity;
-        if ($mode == 'supplier') $sql.= " AND (rc.fk_facture_source IS NULL AND rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
-        else $sql.= " AND (rc.fk_invoice_supplier_source IS NULL AND rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";	        // Available
+        $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.')';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8a1cc6ac33c..e6ab69dff95 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4220,10 +4220,10 @@ class Form
 	 * 	@param	int		$maxvalue		Max value for lines that can be selected
 	 *  @param  string	$more           More string to add
 	 *  @param  int     $hidelist       1=Hide list
-	 *  @param	string	$mode			'supplier' to list available discounts for suppliers, 'customer' instead
+	 *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *  @return	void
 	 */
-	function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $mode='customer')
+	function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $discount_type=0)
 	{
 		global $conf,$langs;
 		if ($htmlname != "none")
@@ -4232,7 +4232,7 @@ class Form
 			print '<input type="hidden" name="action" value="setabsolutediscount">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<div class="inline-block">';
-			if($mode == 'supplier') {
+			if(! empty($discount_type)) {
 				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
 					if (! $filter || $filter=="fk_invoice_supplier IS NOT NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
@@ -4260,11 +4260,10 @@ class Form
 			if (empty($hidelist))
 			{
 				print '<div class="inline-block" style="padding-right: 10px">';
-				if($mode == 'supplier') {
-					$newfilter = 'fk_facture_source IS NULL AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Exclude customer discounts
+				$newfilter = 'discount_type='.intval($discount_type);
+				if(! empty($discount_type)) {
 					$newfilter.= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available
 				} else {
-					$newfilter = 'fk_invoice_supplier_source IS NULL AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Exclude supplier discounts
 					$newfilter.= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available
 				}
 				if ($filter) $newfilter.=' AND ('.$filter.')';
@@ -4272,9 +4271,9 @@ class Form
 				if ($nbqualifiedlines > 0)
 				{
 					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
-					if($mode == 'supplier' && $filter && $filter != "fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
+					if(! empty($discount_type) && $filter && $filter != "fk_invoice_supplier IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
 						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
-					if($mode != 'supplier' && $filter && $filter != "fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
+					if(empty($discount_type) && $filter && $filter != "fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
 						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
 
 					print '>';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index b23c9af5fce..198954572d1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2672,7 +2672,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 				$this->error = $this->db->lasterror();
 			}
 		}
-
+		// TODO free discount linked to line as in customer invoice 
 		if (! $error)
 		{
 			$this->db->commit();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index a397d40d147..e3c68177b41 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -133,7 +133,7 @@ if (empty($reshook))
 		$object->fetch_thirdparty();
 		$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
 	}
-
+	var_dump($conf->global->MAIN_VERSION_LAST_UPGRADE, $conf->global->MAIN_VERSION_LAST_INSTALL);
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes')
 	{
@@ -272,7 +272,7 @@ if (empty($reshook))
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
-		$discount->unlink_invoice('supplier');
+		$discount->unlink_invoice();
 	}
 
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
@@ -419,7 +419,7 @@ if (empty($reshook))
 
 			if (! $error)
 			{
-				$result = $discount->link_to_invoice(0, $id, 'supplier');
+				$result = $discount->link_to_invoice(0, $id);
 				if ($result < 0) {
 					setEventMessages($discount->error, $discount->errors, 'errors');
 				}
@@ -486,6 +486,7 @@ if (empty($reshook))
 			else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
+			$discount->discount_type = 1; // Supplier discount
 			$discount->fk_soc = $object->socid;
 			$discount->fk_invoice_supplier_source = $object->id;
 			
@@ -1679,7 +1680,7 @@ if ($action == 'create')
 
 	if ($societe->id > 0)
 	{
-		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 'supplier');
+		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	}
@@ -2143,12 +2144,12 @@ else
 			$filterabsolutediscount = "fk_invoice_supplier IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			$filterabsolutediscount = "fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+			$filterabsolutediscount = "fk_invoice_supplier IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
 		
-		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 'supplier');
-		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 'supplier');
+		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
@@ -2442,7 +2443,7 @@ else
 			} else {
 				// Discount available of type fixed amount (not credit note)
 				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 'supplier');
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
 			}
 		} else {
 			if ($absolute_creditnote > 0) 		// If not, link will be added later
@@ -2468,9 +2469,9 @@ else
 			} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 				// There is credit notes discounts available
 				if (! $absolute_discount) print '<br>';
-				// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 'supplier');
+				// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
 				$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 'supplier'); // We allow credit note even if amount is higher
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
 			}
 		}
 		if (! $absolute_discount && ! $absolute_creditnote) {
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 9bfe0bd2915..bfc2c79a679 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
@@ -35,3 +35,4 @@ ALTER TABLE llx_projet ADD COLUMN bill_time integer DEFAULT 0;
 ALTER TABLE llx_societe ADD COLUMN order_min_amount double(24,8) DEFAULT NULL AFTER outstanding_limit;
 ALTER TABLE llx_societe ADD COLUMN supplier_order_min_amount double(24,8) DEFAULT NULL AFTER order_min_amount;
 
+ALTER TABLE llx_societe_remise_except ADD COLUMN discount_type integer DEFAULT 0 NOT NULL AFTER fk_soc;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
index 148a8777915..525af592041 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
@@ -26,6 +26,7 @@ ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_soc
 ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_line (fk_facture_line);
 ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture);
 ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_source (fk_facture_source);
+ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_discount_type (discount_type);
 
 
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user    FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 3a19a026ca9..151e33d7f1e 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -23,7 +23,8 @@ create table llx_societe_remise_except
 (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   entity					integer DEFAULT 1 NOT NULL,				-- multi company id
-  fk_soc					integer NOT NULL,						-- client
+  fk_soc					integer NOT NULL,						-- customer or supplier
+  discount_type				integer DEFAULT 0 NOT NULL,				-- 0 => customer, 1 => supplier
   datec						datetime,
   amount_ht					double(24,8) NOT NULL,
   amount_tva				double(24,8) DEFAULT 0 NOT NULL,
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4adfae72258..2e980ba7ff8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1661,13 +1661,14 @@ class Societe extends CommonObject
 	/**
 	 *    	Add a discount for third party
 	 *
-	 *    	@param	float	$remise     Amount of discount
-	 *    	@param  User	$user       User adding discount
-	 *    	@param  string	$desc		Reason of discount
-	 *      @param  float	$tva_tx     VAT rate
+	 *    	@param	float	$remise     	Amount of discount
+	 *    	@param  User	$user       	User adding discount
+	 *    	@param  string	$desc			Reason of discount
+	 *      @param  float	$tva_tx     	VAT rate
+	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *		@return	int					<0 if KO, id of discount record if OK
 	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0)
+	function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
 	{
 		global $langs;
 
@@ -1693,11 +1694,13 @@ class Societe extends CommonObject
 
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc=$this->id;
+			$discount->discount_type=$discount_type;
 			$discount->amount_ht=price2num($remise,'MT');
 			$discount->amount_tva=price2num($remise*$tva_tx/100,'MT');
 			$discount->amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
 			$discount->tva_tx=price2num($tva_tx,'MT');
 			$discount->description=$desc;
+
 			$result=$discount->create($user);
 			if ($result > 0)
 			{
@@ -1715,18 +1718,18 @@ class Societe extends CommonObject
 	/**
 	 *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
 	 *
-	 *	@param	User	$user		Filtre sur un user auteur des remises
-	 * 	@param	string	$filter		Filtre autre
-	 * 	@param	integer	$maxvalue	Filter on max value for discount
-	 * 	@param	string	$mode		'supplier' to get available discounts for suppliers, 'customer' instead
+	 *	@param	User	$user			Filtre sur un user auteur des remises
+	 * 	@param	string	$filter			Filtre autre
+	 * 	@param	integer	$maxvalue		Filter on max value for discount
+	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$mode='customer')
+	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$mode);
+		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
 		if ($result >= 0)
 		{
 			return $result;

From ea2e46cccd091eb3ae07a40389eed178a6a5690c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Feb 2018 20:46:40 +0100
Subject: [PATCH 114/386] Update chargesociales.class.php

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

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index b6386ae3b98..07b7d1a5ae7 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -191,7 +191,7 @@ class ChargeSociales extends CommonObject
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
-			$result=$this->call_trigger('PAYMENTSOCIALECONTRIBUTION_CREATE',$user);
+			$result=$this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
 			if ($result < 0) $error++;
 
 			if(empty($error)) {

From 78697c1735a0861c4136ddde0314433aed614bef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Feb 2018 21:14:24 +0100
Subject: [PATCH 115/386] USe fk_product is better than ref

---
 htdocs/comm/propal/card.php                    | 10 ++++++----
 htdocs/core/class/commondocgenerator.class.php | 18 +++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8bd9f7ffa98..54e3cf36c45 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -104,8 +104,11 @@ if ($id > 0 || ! empty($ref)) {
 	$ret = $object->fetch($id, $ref);
 	if ($ret > 0)
 		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
-		dol_print_error('', $object->error);
+	if ($ret <= 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -1711,7 +1714,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 
-} else {
+} elseif ($object->id > 0) {
 	/*
 	 * Show object in view mode
 	 */
@@ -1818,7 +1821,6 @@ if ($action == 'create')
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/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, $user->rights->propal->creer, 'string', '', 0, 1);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 015173f1f05..aeca3d5a102 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -425,7 +425,7 @@ abstract class CommonDocGenerator
 			{
 				$object->fetch_projet();
 			}
-			
+
 			$resarray[$array_key.'_project_ref'] = $object->project->ref;
 			$resarray[$array_key.'_project_title'] = $object->project->title;
 			$resarray[$array_key.'_project_description'] = $object->project->description;
@@ -510,7 +510,7 @@ abstract class CommonDocGenerator
 		    '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)
 		{
@@ -527,16 +527,16 @@ abstract class CommonDocGenerator
 		$line->fetch_optionals($line->rowid,$extralabels);
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-	
+
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		if (isset($line->product_ref))
+		if (isset($line->fk_product) && $line->fk_product > 0)
 		{
-			$product = new Product($this->db);
-			$result = $product->fetch(null, $line->product_ref);
-			foreach($product->array_options as $key=>$label)
+			$tmpproduct = new Product($this->db);
+			$result = $tmpproduct->fetch($line->fk_product);
+			foreach($tmpproduct->array_options as $key=>$label)
 				$resarray["line_".$key] = $label;
-		}		
-		
+		}
+
 		return $resarray;
 	}
 

From 51028c845de6e827f48ae26fe2de1d14c3eec682 Mon Sep 17 00:00:00 2001
From: Gerhard Stephan <gerhard.stephan@timepunch.de>
Date: Thu, 15 Feb 2018 10:15:27 +0100
Subject: [PATCH 116/386] Export to PDF using LibreOffice 5 command line

---
 htdocs/includes/odtphp/odf.php | 143 ++++++++++++++++++---------------
 1 file changed, 78 insertions(+), 65 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 19fd3390937..0b3501be6be 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -574,85 +574,98 @@ IMG;
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
 		$this->saveToDisk($name);
 
-		$execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2);	// 1 or 2
-		// Method 1 sometimes hang the server.
-
-		if (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF))
+		// Export to PDF using LibreOffice 
+		if ($conf->global->MAIN_ODT_AS_PDF == 'libreoffice')
 		{
-			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
-
-			// MAIN_ODT_AS_PDF should be   "sudo -u unoconv /usr/bin/unoconv" and userunoconv must have sudo to be root by adding file /etc/sudoers.d/unoconv with content  www-data ALL=(unoconv) NOPASSWD: /usr/bin/unoconv .
-
-			// Try this with www-data user:    /usr/bin/unoconv -vvvv -f pdf /tmp/document-example.odt
-			// It must return:
-			//Verbosity set to level 4
-			//Using office base path: /usr/lib/libreoffice
-			//Using office binary path: /usr/lib/libreoffice/program
-			//DEBUG: Connection type: socket,host=127.0.0.1,port=2002;urp;StarOffice.ComponentContext
-			//DEBUG: Existing listener not found.
-			//DEBUG: Launching our own listener using /usr/lib/libreoffice/program/soffice.bin.
-			//LibreOffice listener successfully started. (pid=9287)
-			//Input file: /tmp/document-example.odt
-			//unoconv: file `/tmp/document-example.odt' does not exist.
-			//unoconv: RuntimeException during import phase:
-			//Office probably died. Unsupported URL <file:///tmp/document-example.odt>: "type detection failed"
-			//DEBUG: Terminating LibreOffice instance.
-			//DEBUG: Waiting for LibreOffice instance to exit
-
-			// It fails:
-			// - set shel of user to bash instead of nologin.
-			// - set permission to read/write to user on home directory /var/www so user can create the libreoffice , dconf and .cache dir and files then set permission back
-
-			$command = $conf->global->MAIN_ODT_AS_PDF.' '.escapeshellcmd($name);
-			//$command = '/usr/bin/unoconv -vvv '.escapeshellcmd($name);
+			// Executing convert to PDF using libreoffice 5 (using windows libreoffice must be in path)
+			$command ='soffice.exe -headless -convert-to pdf -outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			exec($command, $output_arr, $retval);
+			
+			// Split extension from name to allow deleting the source using MAIN_ODT_AS_PDF_DEL_SOURCE
+			$name=preg_replace('/\.odt/i', '', $name);
 		}
 		else
 		{
-			// deprecated old method
-			$name=preg_replace('/\.odt/i', '', $name);
+			$execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2);	// 1 or 2
+			// Method 1 sometimes hang the server.
 
-			if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
+			if (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF))
 			{
-				$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+				// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
+
+				// MAIN_ODT_AS_PDF should be   "sudo -u unoconv /usr/bin/unoconv" and userunoconv must have sudo to be root by adding file /etc/sudoers.d/unoconv with content  www-data ALL=(unoconv) NOPASSWD: /usr/bin/unoconv .
+
+				// Try this with www-data user:    /usr/bin/unoconv -vvvv -f pdf /tmp/document-example.odt
+				// It must return:
+				//Verbosity set to level 4
+				//Using office base path: /usr/lib/libreoffice
+				//Using office binary path: /usr/lib/libreoffice/program
+				//DEBUG: Connection type: socket,host=127.0.0.1,port=2002;urp;StarOffice.ComponentContext
+				//DEBUG: Existing listener not found.
+				//DEBUG: Launching our own listener using /usr/lib/libreoffice/program/soffice.bin.
+				//LibreOffice listener successfully started. (pid=9287)
+				//Input file: /tmp/document-example.odt
+				//unoconv: file `/tmp/document-example.odt' does not exist.
+				//unoconv: RuntimeException during import phase:
+				//Office probably died. Unsupported URL <file:///tmp/document-example.odt>: "type detection failed"
+				//DEBUG: Terminating LibreOffice instance.
+				//DEBUG: Waiting for LibreOffice instance to exit
+
+				// It fails:
+				// - set shel of user to bash instead of nologin.
+				// - set permission to read/write to user on home directory /var/www so user can create the libreoffice , dconf and .cache dir and files then set permission back
+
+				$command = $conf->global->MAIN_ODT_AS_PDF.' '.escapeshellcmd($name);
+				//$command = '/usr/bin/unoconv -vvv '.escapeshellcmd($name);
 			}
 			else
 			{
-			    dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
-				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
-			}
-		}
+				// deprecated old method
+				$name=preg_replace('/\.odt/i', '', $name);
 
-		//$dirname=dirname($name);
-		//$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname;
-
-		dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG);
-		if ($execmethod == 1)
-		{
-			exec($command, $output_arr, $retval);
-		}
-		if ($execmethod == 2)
-		{
-			$outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
-
-			$ok=0;
-			$handle = fopen($outputfile, 'w');
-			if ($handle)
-			{
-				dol_syslog(get_class($this)."Run command ".$command,LOG_DEBUG);
-				fwrite($handle, $command."\n");
-				$handlein = popen($command, 'r');
-				while (!feof($handlein))
+				if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
 				{
-					$read = fgets($handlein);
-					fwrite($handle, $read);
-					$output_arr[]=$read;
+					$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+				}
+				else
+				{
+					dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
+					$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 				}
-				pclose($handlein);
-				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
 
+			//$dirname=dirname($name);
+			//$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname;
+
+			dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG);
+			if ($execmethod == 1)
+			{
+				exec($command, $output_arr, $retval);
+			}
+			if ($execmethod == 2)
+			{
+				$outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
+
+				$ok=0;
+				$handle = fopen($outputfile, 'w');
+				if ($handle)
+				{
+					dol_syslog(get_class($this)."Run command ".$command,LOG_DEBUG);
+					fwrite($handle, $command."\n");
+					$handlein = popen($command, 'r');
+					while (!feof($handlein))
+					{
+						$read = fgets($handlein);
+						fwrite($handle, $read);
+						$output_arr[]=$read;
+					}
+					pclose($handlein);
+					fclose($handle);
+				}
+				if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
+		}
+		
 		if ($retval == 0)
 		{
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);

From 3ffc67105260f2fdc875ec70b291abf34e6500c7 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Thu, 15 Feb 2018 10:47:32 +0100
Subject: [PATCH 117/386] Add phone format for several countries

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 457f8068c0e..89e31d00703 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2223,13 +2223,263 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		}
 	}
 
-	if (strtoupper($countrycode) == "CA")
+	elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 		}
 	}
-
+	elseif (strtoupper($parameters['countrycode']) == "PT" )
+	{//Portugal		
+		if (dol_strlen($object) == 13)
+		{//ex: +351_ABC_DEF_GHI
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "SR" )
+	{//Suriname
+		if (dol_strlen($object) == 10)
+		{//ex: +597_ABC_DEF
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
+		}
+		elseif (dol_strlen($object) == 11)
+		{//ex: +597_ABC_DEFG
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "DE" )
+	{//Allemagne
+		if (dol_strlen($object) == 14)
+		{//ex:  +49_ABCD_EFGH_IJK
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
+		}
+		elseif (dol_strlen($object) == 13) 
+		{//ex: +49_ABC_DEFG_HIJ
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ES")
+	{//Espagne
+		if (dol_strlen($object) == 12) 
+		{//ex:  +34_ABC_DEF_GHI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "BF")
+	{// Burkina Faso
+		if (dol_strlen($newphone) == 12)
+		{//ex :  +22 A BC_DE_FG_HI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "RO")
+	{// Roumanie
+		if (dol_strlen($newphone) == 12)
+		{//ex :  +40 AB_CDE_FG_HI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TR")
+	{//Turquie			
+		if (dol_strlen($object) == 13)
+		{//ex :  +90 ABC_DEF_GHIJ
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "US")
+	{//Etat-Unis
+		if (dol_strlen($newphone) == 12)
+		{//ex: +1 ABC_DEF_GHIJ
+			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MX")
+	{//Mexique
+		if (dol_strlen($newphone) == 12)
+		{//ex: +52 ABCD_EFG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+		}
+		elseif (dol_strlen($newphone) == 11)
+		{//ex: +52 AB_CD_EF_GH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);				
+		}
+		elseif (dol_strlen($newphone) == 13)
+		{//ex: +52 ABC_DEF_GHIJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);	
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ML")
+	{//Mali
+		if(dol_strlen($newphone) == 12)
+		{//ex: +223 AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TH")
+	{//Thaïlande
+		if(dol_strlen($newphone) == 11)
+		{//ex: +66_ABC_DE_FGH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +66_A_BCD_EF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
+		}
+		}
+	elseif (strtoupper($parameters['countrycode']) == "MU")
+	{//Maurice
+		if(dol_strlen($newphone) == 11)
+		{//ex: +230_ABC_DE_FG
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +230_ABCD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ZA")
+	{//Afrique du sud
+		if(dol_strlen($newphone) == 12)
+		{//ex: +27_AB_CDE_FG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "SY")
+	{//Syrie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +963_AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +963_AB_CD_EF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "AE")
+	{//Emirats Arabes Unis
+		if(dol_strlen($newphone) == 12)
+		{//ex: +971_ABC_DEF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +971_ABC_DEF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+		elseif(dol_strlen($newphone) == 14)
+		{//ex: +971_ABC_DEF_GHIK
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "DZ")
+	{//Algérie
+		if(dol_strlen($newphone) == 13)
+		{//ex: +213_ABC_DEF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "BE")
+	{//Belgique
+		if(dol_strlen($newphone) == 11)
+		{//ex: +32_ABC_DE_FGH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +32_ABC_DEF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "PF")
+	{//Polynésie française
+		if(dol_strlen($newphone) == 12)
+		{//ex: +689_AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "CO")
+	{//Colombie
+		if(dol_strlen($newphone) == 13)
+		{//ex: +57_ABC_DEF_GH_IJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "JO")
+	{//Jordanie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +962_A_BCD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MG")
+	{//Madagascar
+		if(dol_strlen($newphone) == 13)
+		{//ex: +261_AB_CD_EF_GHI 
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GB")
+	{//Royaume uni
+		if(dol_strlen($newphone) == 13)
+		{//ex: +44_ABCD_EFG_HIJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "CH")
+	{//Suisse
+		if(dol_strlen($newphone) == 12)
+		{//ex: +41_AB_CDE_FG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 15)
+		{// +41_AB_CDE_FGH_IJKL
+			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TN")
+	{//Tunisie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +216_AB_CDE_FGH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GF")
+	{//Guyane francaise
+		if(dol_strlen($newphone) == 13)
+		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GP")
+	{//Guadeloupe
+		if(dol_strlen($newphone) == 13)
+		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MQ")
+	{//Martinique
+		if(dol_strlen($newphone) == 13)
+		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "IT")
+	{//Italie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +39_ABC_DEF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +39_ABC_DEF_GH_IJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif(strtoupper($parameters['countrycode']) == "AU")
+	{//Australie
+		 if(dol_strlen($newphone) == 12)
+		{//ex: +61_A_BCDE_FGHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
+		}
+	}
 	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone

From d547d1a9cf6cc82c2c969cedb0a762f356e8e792 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Feb 2018 13:15:21 +0100
Subject: [PATCH 118/386] Suggest better change for #8196. To be tested.

---
 htdocs/includes/odtphp/odf.php | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 19fd3390937..77201ed9178 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -561,7 +561,7 @@ IMG;
 	 * Convert the ODT file to PDF and export the file as attached file by HTTP
 	 * Note: you need to have JODConverter and OpenOffice or LibreOffice installed and executable on the same system as where this php script will be executed. You also need to chmod +x odt2pdf.sh
 	 *
-	 * @param string $name (optional)
+	 * @param 	string 	$name 	Name of ODT file to generate before generating PDF
 	 * @throws OdfException
 	 * @return void
 	 */
@@ -577,7 +577,23 @@ IMG;
 		$execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2);	// 1 or 2
 		// Method 1 sometimes hang the server.
 
-		if (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF))
+
+		// Export to PDF using LibreOffice
+		if ($conf->global->MAIN_ODT_AS_PDF == 'libreoffice')
+		{
+			// Executing convert to PDF using libreoffice 5
+			if (isset($_SERVER["WINDIR"]))
+			{
+				// using windows libreoffice that must be in path
+				$command ='soffice.exe -headless -convert-to pdf -outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			}
+			else
+			{
+				// using linux/mac libreoffice that must be in path
+				$command ='soffice -headless -convert-to pdf -outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			}
+		}
+		elseif (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF))
 		{
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 
@@ -609,16 +625,16 @@ IMG;
 		else
 		{
 			// deprecated old method
-			$name=preg_replace('/\.odt/i', '', $name);
+			$tmpname=preg_replace('/\.odt/i', '', $name);
 
 			if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
 			{
-				$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+				$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 			}
 			else
 			{
 			    dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
-				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($name).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
+				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 			}
 		}
 
@@ -661,12 +677,15 @@ IMG;
 			}
 
 			if (!empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				$name=preg_replace('/\.od(x|t)/i', '', $name);
 				header('Content-type: application/pdf');
 				header('Content-Disposition: attachment; filename="'.$name.'.pdf"');
-				readfile("$name.pdf");
+				readfile($name.".pdf");
 			}
 			if (!empty($conf->global->MAIN_ODT_AS_PDF_DEL_SOURCE))
-				unlink("$name.odt");
+			{
+				unlink($name);
+			}
 		} else {
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $output_arr='.var_export($output_arr,true), LOG_DEBUG);

From 0172ecb425b50c59c60f0cbf2937bc2537c268da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Feb 2018 13:21:58 +0100
Subject: [PATCH 119/386] Code comment

---
 htdocs/includes/odtphp/odf.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 77201ed9178..5119a533d84 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -585,6 +585,7 @@ IMG;
 			if (isset($_SERVER["WINDIR"]))
 			{
 				// using windows libreoffice that must be in path
+				// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
 				$command ='soffice.exe -headless -convert-to pdf -outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
 			}
 			else

From 9965a25eaa11ef87fe07bbf076c06197193205e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Feb 2018 13:23:13 +0100
Subject: [PATCH 120/386] Code comment

---
 htdocs/includes/odtphp/odf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5119a533d84..dd39f97c9f7 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -616,8 +616,8 @@ IMG;
 			//DEBUG: Terminating LibreOffice instance.
 			//DEBUG: Waiting for LibreOffice instance to exit
 
-			// It fails:
-			// - set shel of user to bash instead of nologin.
+			// If it fails:
+			// - set shell of user to bash instead of nologin.
 			// - set permission to read/write to user on home directory /var/www so user can create the libreoffice , dconf and .cache dir and files then set permission back
 
 			$command = $conf->global->MAIN_ODT_AS_PDF.' '.escapeshellcmd($name);

From 634f3bc025fe7e5ffed57d3ace07df6b6d12b582 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Thu, 15 Feb 2018 13:38:21 +0100
Subject: [PATCH 121/386] Bad copy/paste

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89e31d00703..3c1dcab3378 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2229,14 +2229,14 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "PT" )
+	elseif (strtoupper($countrycode) == "PT" )
 	{//Portugal		
 		if (dol_strlen($object) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "SR" )
+	elseif (strtoupper($countrycode) == "SR" )
 	{//Suriname
 		if (dol_strlen($object) == 10)
 		{//ex: +597_ABC_DEF
@@ -2247,7 +2247,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "DE" )
+	elseif (strtoupper($countrycode) == "DE" )
 	{//Allemagne
 		if (dol_strlen($object) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
@@ -2258,42 +2258,42 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "ES")
+	elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($object) == 12) 
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "BF")
+	elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($newphone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "RO")
+	elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($newphone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "TR")
+	elseif (strtoupper($countrycode) == "TR")
 	{//Turquie			
 		if (dol_strlen($object) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "US")
+	elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($newphone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "MX")
+	elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($newphone) == 12)
 		{//ex: +52 ABCD_EFG_HI
@@ -2308,14 +2308,14 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);	
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "ML")
+	elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if(dol_strlen($newphone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "TH")
+	elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if(dol_strlen($newphone) == 11)
 		{//ex: +66_ABC_DE_FGH
@@ -2326,7 +2326,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
 		}
 		}
-	elseif (strtoupper($parameters['countrycode']) == "MU")
+	elseif (strtoupper($countrycode) == "MU")
 	{//Maurice
 		if(dol_strlen($newphone) == 11)
 		{//ex: +230_ABC_DE_FG
@@ -2337,14 +2337,14 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "ZA")
+	elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if(dol_strlen($newphone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "SY")
+	elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if(dol_strlen($newphone) == 12)
 		{//ex: +963_AB_CD_EF_GH
@@ -2355,7 +2355,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "AE")
+	elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if(dol_strlen($newphone) == 12)
 		{//ex: +971_ABC_DEF_GH
@@ -2370,14 +2370,14 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "DZ")
+	elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if(dol_strlen($newphone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "BE")
+	elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if(dol_strlen($newphone) == 11)
 		{//ex: +32_ABC_DE_FGH
@@ -2388,42 +2388,42 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "PF")
+	elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if(dol_strlen($newphone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "CO")
+	elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if(dol_strlen($newphone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "JO")
+	elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if(dol_strlen($newphone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "MG")
+	elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if(dol_strlen($newphone) == 13)
 		{//ex: +261_AB_CD_EF_GHI 
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "GB")
+	elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if(dol_strlen($newphone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "CH")
+	elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if(dol_strlen($newphone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
@@ -2434,35 +2434,35 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "TN")
+	elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if(dol_strlen($newphone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "GF")
+	elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if(dol_strlen($newphone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "GP")
+	elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if(dol_strlen($newphone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "MQ")
+	elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if(dol_strlen($newphone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
-	elseif (strtoupper($parameters['countrycode']) == "IT")
+	elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if(dol_strlen($newphone) == 12)
 		{//ex: +39_ABC_DEF_GHI
@@ -2473,7 +2473,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
-	elseif(strtoupper($parameters['countrycode']) == "AU")
+	elseif(strtoupper($countrycode) == "AU")
 	{//Australie
 		 if(dol_strlen($newphone) == 12)
 		{//ex: +61_A_BCDE_FGHI

From 93965e857baa5d4ed5d5ff18f70ef2b6ad67183b Mon Sep 17 00:00:00 2001
From: Gerhard Stephan <gerhard.stephan@timepunch.de>
Date: Thu, 15 Feb 2018 16:02:13 +0100
Subject: [PATCH 122/386] fetched from dolibarr/dolibarr

---
 ChangeLog                                     |   8 +-
 htdocs/adherents/type.php                     |   4 +-
 htdocs/comm/propal/card.php                   |  10 +-
 htdocs/compta/facture/class/facture.class.php |   3 +
 .../sociales/class/chargesociales.class.php   |  14 +-
 htdocs/compta/tva/class/tva.class.php         |   3 +
 htdocs/contrat/card.php                       |  16 +-
 htdocs/contrat/services_list.php              |   3 +-
 htdocs/contrat/tpl/linkedobjectblock.tpl.php  |  17 +-
 htdocs/core/actions_linkedfiles.inc.php       |  85 ++++--
 .../core/class/commondocgenerator.class.php   |  18 +-
 htdocs/core/class/commonobject.class.php      |   2 +-
 htdocs/core/class/html.form.class.php         |  11 +-
 htdocs/core/class/html.formfile.class.php     |  61 +++-
 htdocs/core/class/translate.class.php         |   2 +-
 htdocs/core/lib/ajax.lib.php                  |  18 --
 htdocs/core/lib/company.lib.php               |   2 +-
 htdocs/core/lib/files.lib.php                 |   7 +-
 htdocs/core/lib/functions.lib.php             | 276 +++++++++++++++++-
 htdocs/core/lib/images.lib.php                |   2 +-
 .../commande/doc/pdf_einstein.modules.php     |  12 +-
 htdocs/core/modules/modBlockedLog.class.php   |   4 +-
 htdocs/core/modules/modWebsite.class.php      |   2 +-
 htdocs/core/tpl/ajaxrow.tpl.php               |   3 +-
 htdocs/document.php                           |  31 +-
 htdocs/ecm/file_card.php                      |   4 -
 htdocs/fourn/card.php                         |  33 ++-
 .../fourn/class/fournisseur.facture.class.php |   2 +
 htdocs/install/check.php                      |   6 +-
 htdocs/install/repair.php                     |  64 +++-
 htdocs/install/step5.php                      |   6 +
 htdocs/install/upgrade2.php                   | 177 ++++++++++-
 htdocs/langs/en_US/companies.lang             |  10 +-
 htdocs/langs/en_US/install.lang               |   2 +
 htdocs/langs/en_US/website.lang               |   6 +-
 htdocs/product/class/product.class.php        |  40 ++-
 htdocs/product/fournisseurs.php               |   4 +-
 htdocs/product/list.php                       |   4 +-
 htdocs/societe/card.php                       |   4 +-
 htdocs/viewimage.php                          | 112 ++++++-
 htdocs/website/class/websitepage.class.php    |   2 +
 htdocs/website/index.php                      |  24 +-
 test/phpunit/CodingPhpTest.php                |   4 +-
 43 files changed, 926 insertions(+), 192 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b985647586..8c04eaf7a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,11 +14,13 @@ Following changes may create regressions for some external modules, but were nec
 
 ***** ChangeLog for 7.0.0 compared to 6.0.5 *****
 For users:
+NEW: Add a preview icon after files that can be previewed (pdf + images)
 NEW: When payment is registered, PDF of invoices are also regenerated so payments
      appears with no need to click on regenerate.
 NEW: #5711 Add shipment line deleting and editing for draft shipments.
+NEW: Accept substitution key __(ABC)__ replaced with value of translation of key ABC
 NEW: Accept substitution key __[ABC]__ replaced with value of const ABC
-NEW: Accountancy Add variant on sell account for intracommunity sales & export sales
+NEW: Accountancy Add fields for sale accounting account for intracommunity sales & export sales
 NEW: Add a button "Activate all services" on contracts
 NEW: Add a confirmation for all mass action 'delete'
 NEW: Add a group task line for tasks on same level on gantt diagram
@@ -583,7 +585,9 @@ Following changes may create regression for some external modules, but were nece
   exists, but if an external module need action on it, it must provides itself its trigger file.
 * Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode. So, if you set var
   $multicompany_transverse_mode to 1 into your conf file, you must remove this line and a new key into 
-  the Home - setup - other admin page. 
+  the Home - setup - other admin page.
+* If you use Multicompany transverse mode, it will be necessary to check the activation of the modules in the children
+  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.
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index eb44809178f..cc9fd872062 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -107,7 +107,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 	$object->subscription	= (int) trim($subscription);
 	$object->note			= trim($comment);
 	$object->mail_valid		= trim($mail_valid);
-	$object->vote			= trim($vote);
+	$object->vote			= (boolean) trim($vote);
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -160,7 +160,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	$object->subscription	= (int) trim($subscription);
 	$object->note			= trim($comment);
 	$object->mail_valid		= trim($mail_valid);
-	$object->vote			= trim($vote);
+	$object->vote			= (boolean) trim($vote);
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8bd9f7ffa98..54e3cf36c45 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -104,8 +104,11 @@ if ($id > 0 || ! empty($ref)) {
 	$ret = $object->fetch($id, $ref);
 	if ($ret > 0)
 		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
-		dol_print_error('', $object->error);
+	if ($ret <= 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -1711,7 +1714,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 
-} else {
+} elseif ($object->id > 0) {
 	/*
 	 * Show object in view mode
 	 */
@@ -1818,7 +1821,6 @@ if ($action == 'create')
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/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, $user->rights->propal->creer, 'string', '', 0, 1);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 35ab14454ef..12d6fa10769 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3004,6 +3004,9 @@ class Facture extends CommonInvoice
 		$line->total_ttc = $tabprice[2];
 		$line->total_localtax1 = $tabprice[9];
 		$line->total_localtax2 = $tabprice[10];
+		$line->multicurrency_total_ht  = $tabprice[16];
+		$line->multicurrency_total_tva = $tabprice[17];
+		$line->multicurrency_total_ttc = $tabprice[18];
 		$line->update($user);
 		$this->update_price(1);
 		$this->db->commit();
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 61728562d2e..2d75584cbda 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -156,6 +156,7 @@ class ChargeSociales extends CommonObject
     function create($user)
     {
     	global $conf;
+		$error=0;
 
         $now=dol_now();
 
@@ -191,8 +192,17 @@ class ChargeSociales extends CommonObject
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
-            $this->db->commit();
-            return $this->id;
+			$result=$this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE',$user);
+			if ($result < 0) $error++;
+
+			if(empty($error)) {
+				$this->db->commit();
+				return $this->id;
+			}
+			else {
+				$this->db->rollback();
+				return -1*$error;
+			}
         }
         else
         {
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index d575d1a97b9..c9db79e6202 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -670,6 +670,9 @@ class Tva extends CommonObject
         $linkclose='';
         if (empty($notooltip))
         {
+
+
+            
         	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
         	{
         		$label=$langs->trans("ShowMyObject");
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 92290ee0656..c2b6e03ee5b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1561,7 +1561,7 @@ else
 
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-					print '<tr '.$bcnd[$var].' valign="top">';
+					print '<tr '.$bcnd[$var].' class="tdtop">';
 					// Label
 					if ($objp->fk_product > 0)
 					{
@@ -1571,12 +1571,10 @@ else
 						$productstatic->ref=$objp->pref;
 						$productstatic->entity=$objp->pentity;
 						$productstatic->label=$objp->plabel;
-						$text = $productstatic->getNomUrl(1,'',20);
+						$text = $productstatic->getNomUrl(1,'',32);
 						if ($objp->plabel)
 						{
 							$text .= ' - ';
-							//$productstatic->ref=$objp->label;
-							//$text .= $productstatic->getNomUrl(0,'',16);
 							$text .= $objp->plabel;
 						}
 						$description = $objp->description;
@@ -1713,8 +1711,8 @@ else
 						$productstatic->type=$objp->ptype;
 						$productstatic->ref=$objp->pref;
 						$productstatic->entity=$objp->pentity;
-						print $productstatic->getNomUrl(1,'',20);
-						print $objp->label?' - '.dol_trunc($objp->label,16):'';
+						print $productstatic->getNomUrl(1,'',32);
+						print $objp->label?' - '.dol_trunc($objp->label,32):'';
 						print '<br>';
 					}
 					else
@@ -1822,7 +1820,7 @@ else
 				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
 				array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
-				$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
@@ -1834,7 +1832,7 @@ else
 				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
 				$comment      = GETPOST('comment','alpha');
-				$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
@@ -1853,7 +1851,7 @@ else
 				}
 				else
 				{
-					$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 5bede6be358..108fb6d4403 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -75,7 +75,7 @@ $opclotureyear=GETPOST('opclotureyear');
 $filter_opcloture=GETPOST('filter_opcloture');
 
 // Initialize context for list
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'servicelist'.$mode;
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'contractservicelist'.$mode;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
@@ -483,7 +483,6 @@ if (! empty($arrayfields['cd.date_cloture']['checked']))
 	print '</td>';
 }
 // Extra fields
-// Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index e0b76ba689b..a44f20679b8 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2018      Juanjo Menent <jmenent@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
@@ -50,10 +51,22 @@ foreach($linkedObjectBlock as $key => $objectlink)
     <td><?php echo $objectlink->getNomUrl(1); ?></td>
     <td></td>
 	<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
-	<td align="right"><?php // var_dump($objectlink->total_ttc); ?></td>
+    <td align="right"><?php
+		// Price of contract is not shown by default because a contract is a list of service with 
+		// start and end date that change with time andd that may be different that the period of reference for price.
+		// So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
+		if ($user->rights->contrat->lire && empty($conf->global->CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE)) 
+		{
+			$totalcontrat = 0;
+			foreach ($objectlink->lines as $linecontrat) {
+				$totalcontrat = $totalcontrat + $linecontrat->total_ht;
+			    $total = $total + $linecontrat->total_ht;
+			}
+			echo price($totalcontrat);
+		} ?></td>
 	<td align="right"><?php echo $objectlink->getLibStatut(7); ?></td>
 	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
 </tr>
 <?php } ?>
 
-<!-- END PHP TEMPLATE -->
\ No newline at end of file
+<!-- END PHP TEMPLATE -->
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 0e0c444af33..7f938ba9b6c 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -182,37 +182,70 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
         $filenamefrom=dol_sanitizeFileName(GETPOST('renamefilefrom','alpha'), '_', 0);	// Do not remove accents
         $filenameto=dol_sanitizeFileName(GETPOST('renamefileto','alpha'), '_', 0);		// Do not remove accents
 
-        // 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 (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+        if ($filenamefrom != $filenameto)
         {
-            $filenameto.= '.noexe';
-        }
+	        // 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 (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+	        {
+	            $filenameto.= '.noexe';
+	        }
 
-        if ($filenamefrom && $filenameto)
-        {
-            $srcpath = $upload_dir.'/'.$filenamefrom;
-            $destpath = $upload_dir.'/'.$filenameto;
+	        if ($filenamefrom && $filenameto)
+	        {
+	            $srcpath = $upload_dir.'/'.$filenamefrom;
+	            $destpath = $upload_dir.'/'.$filenameto;
 
-            $result = dol_move($srcpath, $destpath);
-            if ($result)
-            {
-            	if ($object->id)
-            	{
-                	$object->addThumbs($destpath);
-            	}
+	            $result = dol_move($srcpath, $destpath);
+	            if ($result)
+	            {
+	            	if ($object->id)
+	            	{
+	                	$object->addThumbs($destpath);
+	            	}
 
-                // TODO Add revert function of addThumbs to remove for old name
-                //$object->delThumbs($srcpath);
+	                // TODO Add revert function of addThumbs to remove for old name
+	                //$object->delThumbs($srcpath);
 
-                setEventMessages($langs->trans("FileRenamed"), null);
-            }
-            else
-            {
-                $langs->load("errors"); // key 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');
-            }
+	                setEventMessages($langs->trans("FileRenamed"), null);
+	            }
+	            else
+	            {
+	                $langs->load("errors"); // key 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');
+	            }
+	        }
         }
     }
+
+    // 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/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 015173f1f05..aeca3d5a102 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -425,7 +425,7 @@ abstract class CommonDocGenerator
 			{
 				$object->fetch_projet();
 			}
-			
+
 			$resarray[$array_key.'_project_ref'] = $object->project->ref;
 			$resarray[$array_key.'_project_title'] = $object->project->title;
 			$resarray[$array_key.'_project_description'] = $object->project->description;
@@ -510,7 +510,7 @@ abstract class CommonDocGenerator
 		    '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)
 		{
@@ -527,16 +527,16 @@ abstract class CommonDocGenerator
 		$line->fetch_optionals($line->rowid,$extralabels);
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-	
+
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		if (isset($line->product_ref))
+		if (isset($line->fk_product) && $line->fk_product > 0)
 		{
-			$product = new Product($this->db);
-			$result = $product->fetch(null, $line->product_ref);
-			foreach($product->array_options as $key=>$label)
+			$tmpproduct = new Product($this->db);
+			$result = $tmpproduct->fetch($line->fk_product);
+			foreach($tmpproduct->array_options as $key=>$label)
 				$resarray["line_".$key] = $label;
-		}		
-		
+		}
+
 		return $resarray;
 	}
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 69002d9ae93..0dd9a245136 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3496,7 +3496,7 @@ abstract class CommonObject
 
 	/**
 	 *  Return if a country is inside the EEC (European Economic Community)
-	 *  @deprecated
+	 *  @deprecated	Use function isInEEC function instead
 	 *
 	 *  @return     boolean		true = country inside EEC, false = country outside EEC
 	 */
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cbd2eb5c3b3..4e8f67d6552 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -646,9 +646,10 @@ class Form
 	 *  @param	integer	$maxlength		Max length for labels (0=no limit)
 	 *  @param	string	$morecss		More css class
 	 *  @param	string	$usecodeaskey	'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+	 *  @param	int		$showempty		Show empty choice
 	 *  @return string           		HTML string with select
 	 */
-	function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0,$morecss='minwidth300',$usecodeaskey='')
+	function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
 	{
 		global $conf,$langs;
 
@@ -693,20 +694,22 @@ class Form
 
 				foreach ($countryArray as $row)
 				{
+					if (empty($showempty) && empty($row['rowid'])) continue;
+
 					if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite=0;
-						$out.= '<option a 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 b value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
+						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
 					}
 					else
 					{
-						$out.= '<option c 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']).'">';
 					}
 					if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
 					else $out.= '&nbsp;';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 4bff96700d5..3d560c9644e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -938,7 +938,7 @@ class FormFile
 	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
 	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
-	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
+	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
 	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
 	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
 	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
@@ -951,6 +951,7 @@ class FormFile
 		global $user, $conf, $langs, $hookmanager;
 		global $bc,$bcdd;
 		global $sortfield, $sortorder, $maxheightmini;
+		global $dolibarr_main_url_root;
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
@@ -1038,6 +1039,7 @@ class FormFile
 				print '<td></td>';
 				if (empty($useinecm)) print '<td></td>';
 				print '<td></td>';
+				print '<td></td>';
 				if (! $disablemove) print '<td></td>';
 				print "</tr>\n";
 			}
@@ -1047,7 +1049,8 @@ class FormFile
 			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
+			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+			print_liste_field_titre('');
 			print_liste_field_titre('');
 			if (! $disablemove) print_liste_field_titre('');
 			print "</tr>\n";
@@ -1063,7 +1066,6 @@ class FormFile
 					//var_dump($sortfield);
 					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
 				}
-				//var_dump($filearray);
 			}
 
 			$nboffiles=count($filearray);
@@ -1146,6 +1148,48 @@ class FormFile
 						else print '&nbsp;';
 						print '</td>';
 					}
+
+					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
+					print '<td align="center">';
+					if ($relativedir && $filearray[$key]['rowid'] > 0)
+					{
+						if ($editline)
+						{
+							print $langs->trans("FileSharedViaALink").' ';
+							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+						}
+						else
+						{
+							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:'');
+								//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($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+								//print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';	// No target here
+							}
+							else
+							{
+								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
+							}
+						}
+					}
+					print '</td>';
+
+					// Actions buttons
 					if (! $editline)
 					{
 						// Delete or view link
@@ -1215,6 +1259,7 @@ 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 '</td>';
@@ -1227,9 +1272,9 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				$colspan=(empty($useinecm)?'5':'5');
-				if (empty($disablemove)) $colspan++;
-				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
+				$colspan=(empty($useinecm)?'6':'6');
+				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@@ -1244,6 +1289,8 @@ class FormFile
 				}
 			}
 
+			print ajax_autoselect('downloadlink');
+
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '</form>';
@@ -1297,8 +1344,8 @@ class FormFile
 		if (! empty($addfilterfields))
 		{
 			print '<tr class="liste_titre nodrag nodrop">';
-			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 			print '<td></td>';
+			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 			print '<td></td>';
 			print '<td></td>';
 			// Action column
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 7b6ef9bbde1..14f017bef55 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -129,7 +129,7 @@ class Translate
 	 *  Return active language code for current user
 	 * 	It's an accessor for this->defaultlang
 	 *
-	 *  @param	int		$mode       0=Long language code, 1=Short language code
+	 *  @param	int		$mode       0=Long language code, 1=Short language code (en, fr, es, ...)
 	 *  @return string      		Language code used (en_US, en_AU, fr_FR, ...)
 	 */
 	function getDefaultLang($mode=0)
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 2ddc7125d4a..845a758703e 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -358,24 +358,6 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 }
 
 
-/**
- * Make content of an input box selected when we click into input field.
- *
- * @param string	$htmlname	Id of html object
- * @param string	$addlink	Add a 'link to' after
- */
-function ajax_autoselect($htmlname, $addlink='')
-{
-	global $langs;
-	$out = '<script type="text/javascript">
-               jQuery(document).ready(function () {
-				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
-				});
-		    </script>';
-	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
-	return $out;
-}
-
 /**
  * Convert a html select field into an ajax combobox.
  * Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d3b242840ae..3f7c45dda52 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -573,7 +573,7 @@ function getFormeJuridiqueLabel($code)
 }
 
 /**
- *  Return if a country is inside the EEC (European Economic Community)
+ *  Return if a country of an object is inside the EEC (European Economic Community)
  *  TODO Add a field into country dictionary.
  *
  *  @param      Object      $object    Object
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 206d1bb8099..b53e588c275 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -225,7 +225,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
 {
 	global $conf, $db;
 
-	$sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+	$sql.=" acl, position, share";
 	if ($mode) $sql.=", description";
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
@@ -258,7 +259,8 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
 					"keywords" => $obj->keywords,
 					"cover" => $obj->cover,
 					"position" => (int) $obj->position,
-					"acl" => $obj->acl
+					"acl" => $obj->acl,
+					"share" => $obj->share
 				);
 			}
 			$i++;
@@ -318,6 +320,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
 				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
 				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
 				$found=1;
 				break;
 			}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a736f3c139a..89e31d00703 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2223,13 +2223,263 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		}
 	}
 
-	if (strtoupper($countrycode) == "CA")
+	elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 		}
 	}
-
+	elseif (strtoupper($parameters['countrycode']) == "PT" )
+	{//Portugal		
+		if (dol_strlen($object) == 13)
+		{//ex: +351_ABC_DEF_GHI
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "SR" )
+	{//Suriname
+		if (dol_strlen($object) == 10)
+		{//ex: +597_ABC_DEF
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
+		}
+		elseif (dol_strlen($object) == 11)
+		{//ex: +597_ABC_DEFG
+			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "DE" )
+	{//Allemagne
+		if (dol_strlen($object) == 14)
+		{//ex:  +49_ABCD_EFGH_IJK
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
+		}
+		elseif (dol_strlen($object) == 13) 
+		{//ex: +49_ABC_DEFG_HIJ
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ES")
+	{//Espagne
+		if (dol_strlen($object) == 12) 
+		{//ex:  +34_ABC_DEF_GHI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "BF")
+	{// Burkina Faso
+		if (dol_strlen($newphone) == 12)
+		{//ex :  +22 A BC_DE_FG_HI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "RO")
+	{// Roumanie
+		if (dol_strlen($newphone) == 12)
+		{//ex :  +40 AB_CDE_FG_HI
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TR")
+	{//Turquie			
+		if (dol_strlen($object) == 13)
+		{//ex :  +90 ABC_DEF_GHIJ
+			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "US")
+	{//Etat-Unis
+		if (dol_strlen($newphone) == 12)
+		{//ex: +1 ABC_DEF_GHIJ
+			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MX")
+	{//Mexique
+		if (dol_strlen($newphone) == 12)
+		{//ex: +52 ABCD_EFG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+		}
+		elseif (dol_strlen($newphone) == 11)
+		{//ex: +52 AB_CD_EF_GH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);				
+		}
+		elseif (dol_strlen($newphone) == 13)
+		{//ex: +52 ABC_DEF_GHIJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);	
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ML")
+	{//Mali
+		if(dol_strlen($newphone) == 12)
+		{//ex: +223 AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TH")
+	{//Thaïlande
+		if(dol_strlen($newphone) == 11)
+		{//ex: +66_ABC_DE_FGH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +66_A_BCD_EF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
+		}
+		}
+	elseif (strtoupper($parameters['countrycode']) == "MU")
+	{//Maurice
+		if(dol_strlen($newphone) == 11)
+		{//ex: +230_ABC_DE_FG
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +230_ABCD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "ZA")
+	{//Afrique du sud
+		if(dol_strlen($newphone) == 12)
+		{//ex: +27_AB_CDE_FG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "SY")
+	{//Syrie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +963_AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +963_AB_CD_EF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "AE")
+	{//Emirats Arabes Unis
+		if(dol_strlen($newphone) == 12)
+		{//ex: +971_ABC_DEF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +971_ABC_DEF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+		elseif(dol_strlen($newphone) == 14)
+		{//ex: +971_ABC_DEF_GHIK
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "DZ")
+	{//Algérie
+		if(dol_strlen($newphone) == 13)
+		{//ex: +213_ABC_DEF_GHI
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "BE")
+	{//Belgique
+		if(dol_strlen($newphone) == 11)
+		{//ex: +32_ABC_DE_FGH
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+		}
+		elseif(dol_strlen($newphone) == 12)
+		{//ex: +32_ABC_DEF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "PF")
+	{//Polynésie française
+		if(dol_strlen($newphone) == 12)
+		{//ex: +689_AB_CD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "CO")
+	{//Colombie
+		if(dol_strlen($newphone) == 13)
+		{//ex: +57_ABC_DEF_GH_IJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "JO")
+	{//Jordanie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +962_A_BCD_EF_GH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MG")
+	{//Madagascar
+		if(dol_strlen($newphone) == 13)
+		{//ex: +261_AB_CD_EF_GHI 
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GB")
+	{//Royaume uni
+		if(dol_strlen($newphone) == 13)
+		{//ex: +44_ABCD_EFG_HIJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "CH")
+	{//Suisse
+		if(dol_strlen($newphone) == 12)
+		{//ex: +41_AB_CDE_FG_HI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+		}
+		elseif(dol_strlen($newphone) == 15)
+		{// +41_AB_CDE_FGH_IJKL
+			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "TN")
+	{//Tunisie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +216_AB_CDE_FGH
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GF")
+	{//Guyane francaise
+		if(dol_strlen($newphone) == 13)
+		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "GP")
+	{//Guadeloupe
+		if(dol_strlen($newphone) == 13)
+		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "MQ")
+	{//Martinique
+		if(dol_strlen($newphone) == 13)
+		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
+			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif (strtoupper($parameters['countrycode']) == "IT")
+	{//Italie
+		if(dol_strlen($newphone) == 12)
+		{//ex: +39_ABC_DEF_GHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+		}
+		elseif(dol_strlen($newphone) == 13)
+		{//ex: +39_ABC_DEF_GH_IJ
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+		}
+	}
+	elseif(strtoupper($parameters['countrycode']) == "AU")
+	{//Australie
+		 if(dol_strlen($newphone) == 12)
+		{//ex: +61_A_BCDE_FGHI
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
+		}
+	}
 	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
@@ -6844,7 +7094,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
 
 	if (empty($conf->use_javascript_ajax)) return '';
 
-	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');
+	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
 	//$mime_preview[]='archive';
 	$num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
@@ -6861,6 +7111,25 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
 }
 
 
+/**
+ * Make content of an input box selected when we click into input field.
+ *
+ * @param string	$htmlname	Id of html object
+ * @param string	$addlink	Add a 'link to' after
+ */
+function ajax_autoselect($htmlname, $addlink='')
+{
+	global $langs;
+	$out = '<script type="text/javascript">
+               jQuery(document).ready(function () {
+				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
+				});
+		    </script>';
+	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	return $out;
+}
+
+
 /**
  *	Return mime type of a file
  *
@@ -6931,6 +7200,7 @@ function dol_mimetype($file, $default='application/octet-stream', $mode=0)
 	if (preg_match('/\.gif$/i',$tmpfile))					   { $mime='image/gif';    $imgmime='image.png'; $famime='file-image-o'; }
 	if (preg_match('/\.bmp$/i',$tmpfile))					   { $mime='image/bmp';    $imgmime='image.png'; $famime='file-image-o'; }
 	if (preg_match('/\.(tif|tiff)$/i',$tmpfile))			   { $mime='image/tiff';   $imgmime='image.png'; $famime='file-image-o'; }
+	if (preg_match('/\.svg$/i',$tmpfile))					   { $mime='image/svg+xml';$imgmime='image.png'; $famime='file-image-o'; }
 	// Calendar
 	if (preg_match('/\.vcs$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
 	if (preg_match('/\.ics$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index e6f69da1d93..f0a666b03e9 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -37,7 +37,7 @@ $quality = 80;
  */
 function image_format_supported($file)
 {
-    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm';   // See also into product.class.php
+    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg';   // See also into product.class.php
 
     // Case filename is not a format image
     if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) 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 59a2d82ffc7..7c24e49e89b 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1320,7 +1320,17 @@ class pdf_einstein extends ModelePDFCommandes
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+			$carac_emetteur='';
+		 	// 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";
+		 	}
+
+		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show sender
 			$posy=42+$top_shift;
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 9b3f4e16e9b..b18f8bebf62 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -172,7 +172,7 @@ class modBlockedLog extends DolibarrModules
     	// 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=new stdClass();
     	$object->id = 1;
     	$object->element = 'module';
     	$object->ref = 'systemevent';
@@ -215,7 +215,7 @@ class modBlockedLog extends DolibarrModules
 		// 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=new stdClass();
     	$object->id = 1;
     	$object->element = 'module';
     	$object->ref = 'systemevent';
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 47d44d66164..d62576c5063 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -80,7 +80,7 @@ class modWebsite extends DolibarrModules
 
         // New pages on tabs
         // -----------------
-       	//$this->tabs[] = array('data'=>'thirdparty:+website:WebSites:website:($conf->societe->enabled && $user->rights->societe->lire):/societe/website.php?mainmenu=home&id=__ID__');  					// To add a new tab identified by code tabname1
+       	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
         // Boxes
         //------
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index a75ed1846ff..e4a63b23b3d 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -71,7 +71,8 @@ $(document).ready(function(){
 					function() {
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
-							location.href = '<?php echo dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']); ?>';
+							//console.log('<?php echo dol_escape_js($_SERVER['QUERY_STRING']); ?>');
+							location.href = '<?php echo dol_escape_js($_SERVER['PHP_SELF']).'?'.dol_escape_js($_SERVER['QUERY_STRING']); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
diff --git a/htdocs/document.php b/htdocs/document.php
index 1c722e4cb55..50f4a61186d 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -25,9 +25,9 @@
  *	\file       htdocs/document.php
  *  \brief      Wrapper to download data files
  *  \remarks    Call of this wrapper is made with URL:
- * 				document.php?modulepart=repfichierconcerne&file=relativepathoffile
- * 				document.php?modulepart=logs&file=dolibarr.log
- * 				document.php?modulepart=logs&hashp=sharekey
+ * 				DOL_URL_ROOT.'/document.php?modulepart=repfichierconcerne&file=relativepathoffile'
+ * 				DOL_URL_ROOT.'/document.php?modulepart=logs&file=dolibarr.log'
+ * 				DOL_URL_ROOT.'/document.php?hashp=sharekey'
  */
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -36,9 +36,9 @@
 //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');
 //if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
 // For bittorent link, we don't need to load/check we are into a login session
 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN"))
@@ -58,9 +58,6 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined
 	define("NOLOGIN",1);
 	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 }
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 /**
  * Header empty
@@ -75,7 +72,6 @@ function llxHeader() { }
  */
 function llxFooter() { }
 
-
 require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -103,21 +99,17 @@ if (in_array($modulepart, array('facture_paiement','unpaid')))
 
 
 /*
- * Action
+ * Actions
  */
 
 // None
 
 
+
 /*
  * View
  */
 
-// Define mime type
-$type = 'application/octet-stream';
-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
-else $type=dol_mimetype($original_file);
-
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
 if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
@@ -160,6 +152,10 @@ if (! empty($hashp))
 	}
 }
 
+// Define mime type
+$type = 'application/octet-stream';
+if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
+else $type=dol_mimetype($original_file);
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../","/", $original_file);
@@ -252,9 +248,6 @@ header('Content-Length: ' . dol_filesize($fullpath_original_file));
 header('Cache-Control: Public, must-revalidate');
 header('Pragma: public');
 
-//ob_clean();
-//flush();
-
 readfile($fullpath_original_file_osencoded);
 
 if (is_object($db)) $db->close();
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 8c62cbe18f2..e0926e0f777 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -341,13 +341,9 @@ if (! empty($object->share))
 {
 	if ($action != 'edit')
 	{
-		$modulepart='ecm';
 		$forcedownload=0;
 
 		$paramlink='';
-		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
-		//if (! empty($object->entity)) $paramlink.='&entity='.$object->entity; 					// For sharing with hash (so public files), entity is not required.
-		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
 		if (! empty($object->share)) $paramlink.=($paramlink?'&':'').'hashp='.$object->share;			// Hash for public share
 		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 453cb6068ad..588c13ca849 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -117,7 +117,7 @@ if (empty($reshook))
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		
+
         if ($ret < 0) $error++;
         if (! $error)
         {
@@ -476,7 +476,7 @@ if ($object->id > 0)
 
 
 	/*
-	 * Last supplier proposal
+	 * Latest supplier proposal
 	 */
 	$proposalstatic = new SupplierProposal($db);
 
@@ -485,7 +485,7 @@ if ($object->id > 0)
 	    $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 =".$conf->entity;
+	    $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
 	    $sql.= " ORDER BY p.date_valid DESC";
 	    $sql.= " ".$db->plimit($MAXLIST);
 
@@ -548,7 +548,7 @@ if ($object->id > 0)
 	}
 
 	/*
-	 * Last supplier orders
+	 * Latest supplier orders
 	 */
 	$orderstatic = new CommandeFournisseur($db);
 
@@ -561,6 +561,7 @@ if ($object->id > 0)
 		$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
 		$sql2.= ' WHERE c.fk_soc = s.rowid';
+		$sql2.= " AND c.entity IN (".getEntity('commande_fournisseur').")";
 		$sql2.= ' AND s.rowid = '.$object->id;
 		// Show orders with status validated, shipping started and delivered (well any order we can bill)
 		$sql2.= " AND c.fk_statut IN (5)";
@@ -578,9 +579,9 @@ if ($object->id > 0)
 
 		// TODO move to DAO class
 		$sql  = "SELECT count(p.rowid) as total";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
 		$sql.= " WHERE p.fk_soc =".$object->id;
-		$sql.= " AND p.entity =".$conf->entity;
+		$sql.= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -589,9 +590,9 @@ if ($object->id > 0)
 		}
 
 		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total_ttc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
 		$sql.= " WHERE p.fk_soc =".$object->id;
-		$sql.= " AND p.entity =".$conf->entity;
+		$sql.= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$sql.= " ORDER BY p.date_commande DESC";
 		$sql.= " ".$db->plimit($MAXLIST);
 		$resql=$db->query($sql);
@@ -652,7 +653,7 @@ if ($object->id > 0)
 	}
 
 	/*
-	 * Last supplier invoices
+	 * Latest supplier invoices
 	 */
 
 	$langs->load('bills');
@@ -666,7 +667,7 @@ if ($object->id > 0)
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
 		$sql.= ' WHERE f.fk_soc = '.$object->id;
-		$sql.= " AND f.entity =".$conf->entity;
+		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql.= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ht,f.total_tva,f.total_ttc,f.paye';
 		$sql.= ' ORDER BY f.datef DESC';
 		$resql=$db->query($sql);
@@ -694,15 +695,15 @@ if ($object->id > 0)
 				print '<td>';
 				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
 				$facturestatic->id=$obj->rowid;
-				$facturestatic->ref=($obj->ref?$obj->ref:$obj->rowid).($obj->ref_supplier?' - '.$obj->ref_supplier:'');
-                $facturestatic->ref_supplier = $obj->ref_supplier;
-                $facturestatic->total_ht = $obj->total_ht;
+				$facturestatic->ref=($obj->ref?$obj->ref:$obj->rowid);
+				$facturestatic->ref_supplier = $obj->ref_supplier;
+				$facturestatic->libelle = $obj->libelle;
+				$facturestatic->total_ht = $obj->total_ht;
                 $facturestatic->total_tva = $obj->total_tva;
                 $facturestatic->total_ttc = $obj->total_ttc;
-				//$facturestatic->ref_supplier=$obj->ref_supplier;
 				print $facturestatic->getNomUrl(1);
-				//print img_object($langs->trans('ShowBill'),'bill').' '.($obj->ref?$obj->ref:$obj->rowid).' - '.$obj->ref_supplier.'</a>';
-				print ' '.dol_trunc($obj->libelle,14);
+				print $obj->ref_supplier?' - '.$obj->ref_supplier:'';
+				print ($obj->libelle?' - ':'').dol_trunc($obj->libelle,14);
 				print '</td>';
 				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>';
 				print '<td align="right" class="nowrap">'.price($obj->amount).'</td>';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 444eb5d200a..292466ea0d8 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1929,6 +1929,8 @@ class FactureFournisseur extends CommonInvoice
             $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->libelle))
+        	$label.= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->libelle;
         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))
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 8262a5f05df..7e64b6ae951 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -35,7 +35,7 @@ $allowinstall = 0;
 $allowupgrade = false;
 $checksok = 1;
 
-$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):$langs->getDefaultLang();
+$setuplang=GETPOST("selectlang",'az09',3)?GETPOST("selectlang",'az09',3):$langs->getDefaultLang();
 $langs->setDefaultLang($setuplang);
 
 $langs->load("install");
@@ -345,6 +345,10 @@ else
 			$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
 			$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;
+
 			// 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:''));
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 5db07cd1412..229ae0a3c3e 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -42,10 +42,8 @@ error_reporting(0);
 @set_time_limit(120);
 error_reporting($err);
 
-$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto';
+$setuplang=GETPOST("selectlang",'az09',3)?GETPOST("selectlang",'az09',3):'auto';
 $langs->setDefaultLang($setuplang);
-$versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]);
-$versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]);
 
 $langs->loadLangs(array("admin","install","other"));
 
@@ -78,6 +76,7 @@ print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(G
 print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').'<br>'."\n";
 print 'Option rebuild_product_thumbs (0 or \'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs','alpha')?GETPOST('rebuild_product_thumbs','alpha'):'0').'<br>'."\n";
 print 'Option force_disable_of_modules_not_found (0 or \'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found','alpha')?GETPOST('force_disable_of_modules_not_found','alpha'):'0').'<br>'."\n";
+print 'Option clean_perm_table (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_perm_table','alpha')?GETPOST('clean_perm_table','alpha'):'0').'<br>'."\n";
 print 'Option force_utf8_on_tables, for mysql/mariadb only (0 or \'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables','alpha')?GETPOST('force_utf8_on_tables','alpha'):'0').'<br>'."\n";
 print '<br>';
 
@@ -154,13 +153,16 @@ if ($ok)
 }
 
 $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;
 
 
 /* Start action here */
 $oneoptionset=0;
 $oneoptionset=(GETPOST('standard', 'alpha') || GETPOST('restore_thirdparties_logos','alpha') || GETPOST('clean_linked_elements','alpha') || GETPOST('clean_menus','alpha')
 	|| GETPOST('clean_orphelin_dir','alpha') || GETPOST('clean_product_stock_batch','alpha') || GETPOST('set_empty_time_spent_amount','alpha') || GETPOST('rebuild_product_thumbs','alpha')
+	|| GETPOST('clean_perm_table','alpha')
 	|| GETPOST('force_disable_of_modules_not_found','alpha') || GETPOST('force_utf8_on_tables','alpha'));
 
 if ($ok && $oneoptionset)
@@ -586,8 +588,6 @@ if ($ok && GETPOST('clean_menus','alpha'))
 // clean_orphelin_dir: Run purge of directory
 if ($ok && GETPOST('clean_orphelin_dir','alpha'))
 {
-    $conf->setValues($db);
-
     $listmodulepart=array('company','invoice','invoice_supplier','propal','order','order_supplier','contract','tax');
     foreach ($listmodulepart as $modulepart)
     {
@@ -904,7 +904,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount','alpha'))
 // clean_old_module_entries: Clean data into const when files of module were removed without being
 if ($ok && GETPOST('force_disable_of_modules_not_found','alpha'))
 {
-    print '<tr><td colspan="2"><br>*** Force modules not found to be disabled</td></tr>';
+    print '<tr><td colspan="2"><br>*** Force modules not found to be disabled (only modules adding js, css or hooks can be detected as removed)</td></tr>';
 
     $arraylistofkey=array('hooks','js','css');
 
@@ -1020,6 +1020,56 @@ if ($ok && GETPOST('force_disable_of_modules_not_found','alpha'))
 }
 
 
+// clean_old_module_entries: Clean data into const when files of module were removed without being
+if ($ok && GETPOST('clean_perm_table','alpha'))
+{
+	print '<tr><td colspan="2"><br>*** Clean table user_rights from lines of external modules no more enabled</td></tr>';
+
+	$listofmods='';
+	foreach($conf->modules as $key => $val)
+	{
+		$listofmods.=($listofmods?',':'')."'".$val."'";
+	}
+	$sql = 'SELECT id, libelle, module from '.MAIN_DB_PREFIX.'rights_def WHERE module not in ('.$listofmods.') AND id > 100000';
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj=$db->fetch_object($resql);
+				if ($obj->id > 0)
+				{
+					print '<tr><td>Found line with id '.$obj->id.', label "'.$obj->libelle.'" of module "'.$obj->module.'" to delete';
+					if (GETPOST('clean_perm_table','alpha') == 'confirmed')
+					{
+						$sqldelete = 'DELETE FROM '.MAIN_DB_PREFIX.'rights_def WHERE id = '.$obj->id;
+						$resqldelete = $db->query($sqldelete);
+						if (! $resqldelete)
+						{
+							dol_print_error($db);
+						}
+						print ' - deleted';
+					}
+					print '</td></tr>';
+				}
+				$i++;
+			}
+		}
+		else
+		{
+			print '<tr><td>No lines of a disabled external module (with id > 100000) found into table rights_def</td></tr>';
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
 
 
 // clean_linked_elements: Check and clean linked elements
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 5181c35f2f9..d1f7e3eb31a 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -165,6 +165,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
         if ($db->connected)
         {
             $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;
 
             // Create admin user
             include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
@@ -298,6 +301,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
         if ($db->connected)
         {
             $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;
 
             // Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
             $tagdatabase=false;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 430c6f46c94..d20357dd20c 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -163,7 +163,13 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
     $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
     // Chargement config
-    if (! $error) $conf->setValues($db);
+    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;
+    }
 
 
     /***************************************************************************************
@@ -371,7 +377,20 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','6.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-            // No particular code
+        	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);
+
+        			// Migrate to add entity value into llx_usergroup_rights
+        			migrate_usergroup_rights_entity($db, $langs, $conf);
+        		}
+        	}
         }
 
         // Scripts for last version
@@ -3940,7 +3959,7 @@ function migrate_reset_blocked_log($db,$langs,$conf)
 						else
 						{
 							// Add set line
-							$object=new stdClass;
+							$object=new stdClass();
 							$object->id = 1;
 							$object->element = 'module';
 							$object->ref = 'systemevent';
@@ -4182,6 +4201,158 @@ function migrate_remise_except_entity($db,$langs,$conf)
 	print '</td></tr>';
 }
 
+/**
+ * Migrate to add entity value into llx_user_rights
+ *
+ * @param	DoliDB		$db				Database handler
+ * @param	Translate	$langs			Object langs
+ * @param	Conf		$conf			Object conf
+ * @return	void
+ */
+function migrate_user_rights_entity($db,$langs,$conf)
+{
+	print '<tr><td colspan="4">';
+
+	print '<b>'.$langs->trans('MigrationUserRightsEntity')."</b><br>\n";
+
+	$error = 0;
+
+	dolibarr_install_syslog("upgrade2::migrate_user_rights_entity");
+
+	$db->begin();
+
+	$sqlSelect = "SELECT u.rowid, u.entity";
+	$sqlSelect.= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sqlSelect.= " WHERE u.entity > 1";
+	//print $sqlSelect;
+
+	$resql = $db->query($sqlSelect);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
+
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+
+				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."user_rights SET";
+				$sqlUpdate.= " entity = " . $obj->entity;
+				$sqlUpdate.= " WHERE fk_user = " . $obj->rowid;
+
+				$result=$db->query($sqlUpdate);
+				if (! $result)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+
+				print ". ";
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+		$db->rollback();
+	}
+
+
+	print '</td></tr>';
+}
+
+/**
+ * Migrate to add entity value into llx_usergroup_rights
+ *
+ * @param	DoliDB		$db				Database handler
+ * @param	Translate	$langs			Object langs
+ * @param	Conf		$conf			Object conf
+ * @return	void
+ */
+function migrate_usergroup_rights_entity($db,$langs,$conf)
+{
+	print '<tr><td colspan="4">';
+
+	print '<b>'.$langs->trans('MigrationUserGroupRightsEntity')."</b><br>\n";
+
+	$error = 0;
+
+	dolibarr_install_syslog("upgrade2::migrate_usergroup_rights_entity");
+
+	$db->begin();
+
+	$sqlSelect = "SELECT u.rowid, u.entity";
+	$sqlSelect.= " FROM ".MAIN_DB_PREFIX."usergroup as u";
+	$sqlSelect.= " WHERE u.entity > 1";
+	//print $sqlSelect;
+
+	$resql = $db->query($sqlSelect);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
+
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+
+				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."usergroup_rights SET";
+				$sqlUpdate.= " entity = " . $obj->entity;
+				$sqlUpdate.= " WHERE fk_usergroup = " . $obj->rowid;
+
+				$result=$db->query($sqlUpdate);
+				if (! $result)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+
+				print ". ";
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+		$db->rollback();
+	}
+
+
+	print '</td></tr>';
+}
+
 /**
  * Migration directory
  *
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 18ec6bf8d85..7d2b878c5cc 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -75,8 +75,8 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
@@ -239,7 +239,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,8 +255,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT number
-VATIntraShort=VAT number
+VATIntra=Sales tax ID
+VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 87ef7d79b13..27a2edd1fda 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -196,6 +196,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement 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
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index c7cdd65ff4e..d0ab703e6d4 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -55,7 +55,7 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
-Banner=Bandeau
+Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Web site account
 WebsiteAccounts=Web site accounts
@@ -65,4 +65,6 @@ DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
 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 / thirdparty
\ No newline at end of file
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabber from an external site
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e6439031146..73d867e7141 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4095,9 +4095,11 @@ class Product extends CommonObject
 	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
 	 * 	@param		int		$maxWidth		Max width of original image when size='small'
 	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
+	 *  @param      int     $notitle         Do not add title tag on image
+	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
 	 */
-	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160,$nolink=0)
+	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160,$nolink=0,$notitle=0,$usesharelink=0)
 	{
 		global $conf,$user,$langs;
 
@@ -4196,15 +4198,39 @@ class Product extends CommonObject
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						if ($notitle) $alt='';
 
-						if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+						if ($usesharelink)
 						{
-							$return.= '<!-- Show thumb -->';
-							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+							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" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+								}
+								else {
+									$return.= '<!-- Show original file -->';
+									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+								}
+							}
+							else
+							{
+								$return.= '<!-- Show nophoto file (because file is not shared) -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+							}
 						}
-						else {
-							$return.= '<!-- Show original file -->';
-							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+						else
+						{
+							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+							{
+								$return.= '<!-- Show thumb -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+							}
+							else {
+								$return.= '<!-- Show original file -->';
+								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+							}
 						}
 
 						if (empty($nolink)) $return.= '</a>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 21d29a8ce89..5219291e8af 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -63,7 +63,9 @@ if (! empty($_REQUEST['search_fourn_id']))
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+
+if (empty($user->rights->fournisseur->lire)) accessforbidden();
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 257d3344ba5..fb9b9672015 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -716,7 +716,7 @@ else
 				// Ref
 				if (! empty($arrayfields['p.ref']['checked']))
 				{
-					print '<td class="tdoverflowmax150">';
+					print '<td class="tdoverflowmax200">';
 					print $product_static->getNomUrl(1);
 					print "</td>\n";
 					if (! $i) $totalarray['nbfield']++;
@@ -724,7 +724,7 @@ else
 	   			// Ref supplier
 				if (! empty($arrayfields['pfp.ref_fourn']['checked']))
 				{
-					print '<td class="tdoverflowmax150">';
+					print '<td class="tdoverflowmax200">';
 					print $product_static->getNomUrl(1);
 					print "</td>\n";
 					if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index fa3fdc6b18e..b304f65f986 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1230,7 +1230,7 @@ else
         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))
+        if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
         {
             $s.=' ';
 
@@ -1849,7 +1849,7 @@ else
             print '<td colspan="3">';
             $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))
+            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
             {
                 $s.=' &nbsp; ';
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 3f7ddbcd1cb..3e2b59ae404 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -20,8 +20,10 @@
 
 /**
  *		\file       htdocs/viewimage.php
- *		\brief      Wrapper to show images into Dolibarr screens
- *      \remarks    Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
+ *		\brief      Wrapper to show images into Dolibarr screens.
+ *		\remarks    Call to wrapper is :
+ *					DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0
+ *					DOL_URL_ROOT.'/viewimage.php?hashp=sharekey
  */
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -35,7 +37,16 @@ if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN")) define("NOLOGIN",'1');
+if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN"))
+{
+	define("NOLOGIN",'1');
+}
+// For direct external download link, we don't need to load/check we are into a login session
+if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
+{
+	define("NOLOGIN",1);
+}
+// Some value of modulepart can be used to get resources that are public so no login are required.
 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
 {
 	define("NOLOGIN",'1');
@@ -57,18 +68,20 @@ function llxHeader() { }
  */
 function llxFooter() { }
 
-require 'main.inc.php';
+require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 $action=GETPOST('action','alpha');
-$original_file=GETPOST("file",'alpha');
+$original_file=GETPOST('file','alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
+$hashp=GETPOST('hashp','aZ09');
 $modulepart=GETPOST('modulepart','alpha');
-$urlsource=GETPOST("urlsource",'alpha');
+$urlsource=GETPOST('urlsource','alpha');
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
+if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
+if (empty($original_file) && empty($hashp)) accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);
 if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility
 
 
@@ -97,9 +110,45 @@ if (GETPOST("cache",'alpha'))
     //print $dolibarr_nocache; exit;
 }
 
+// If we have a hash public (hashp), we guess the original_file.
+if (! empty($hashp))
+{
+	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+	$ecmfile=new EcmFiles($db);
+	$result = $ecmfile->fetch(0, '', '', '', $hashp);
+	if ($result > 0)
+	{
+		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory
+		$moduleparttocheck = $tmp[0];
+		if ($modulepart)	// Not required for link using public hashp
+		{
+			if ($moduleparttocheck == $modulepart)
+			{
+				// We remove first level of directory
+				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
+				//var_dump($original_file); exit;
+			}
+			else
+			{
+				accessforbidden('Bad link. File is from another module part.',0,0,1);
+			}
+		}
+		else
+		{
+			$modulepart = $moduleparttocheck;
+			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
+		}
+	}
+	else
+	{
+		$langs->load("errors");
+		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);
+	}
+}
+
 // Define mime type
 $type = 'application/octet-stream';
-if (! empty($_GET["type"])) $type=$_GET["type"];
+if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');
 else $type=dol_mimetype($original_file);
 
 // Security: Delete string ../ into $original_file
@@ -110,16 +159,49 @@ $refname=basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
-$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
+
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-$fullpath_original_file     = $check_access['original_file'];
+$fullpath_original_file     = $check_access['original_file'];               // $fullpath_original_file is now a full path name
+
+if (! empty($hashp))
+{
+	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed
+	$sqlprotectagainstexternals = '';
+}
+else
+{
+	// Basic protection (against external users only)
+	if ($user->societe_id > 0)
+	{
+		if ($sqlprotectagainstexternals)
+		{
+			$resql = $db->query($sqlprotectagainstexternals);
+			if ($resql)
+			{
+				$num=$db->num_rows($resql);
+				$i=0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($user->societe_id != $obj->fk_soc)
+					{
+						$accessallowed=0;
+						break;
+					}
+					$i++;
+				}
+			}
+		}
+	}
+}
 
 // Security:
 // Limit access if permissions are wrong
 if (! $accessallowed)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Security:
@@ -128,7 +210,7 @@ if (preg_match('/\.\./',$fullpath_original_file) || preg_match('/[<>|]/',$fullpa
 {
 	dol_syslog("Refused to deliver file ".$fullpath_original_file);
 	print "ErrorFileNameInvalid: ".$original_file;
-    exit;
+	exit;
 }
 
 
@@ -174,8 +256,10 @@ else					// Open and return file
 {
     clearstatcache();
 
+    $filename = basename($fullpath_original_file);
+
     // Output files on browser
-    dol_syslog("viewimage.php return file $fullpath_original_file content-type=$type");
+    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"]))
@@ -186,7 +270,7 @@ else					// Open and return file
         exit;*/
     }
 
-    // Les drois sont ok et fichier trouve
+    // Permissions are ok and file found, so we return it
     if ($type)
     {
         top_httphead($type);
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 51c737673a0..408f5d194ae 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -59,10 +59,12 @@ class WebsitePage extends CommonObject
 	public $keywords;
 	public $htmlheader;
 	public $content;
+	public $grabbed_from;
 	public $status;
 	public $date_creation;
 	public $date_modification;
 
+
 	// 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.
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 6f515568bc2..f57d28a2acb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1476,6 +1476,12 @@ if (count($object->records) > 0)
 		//print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
 		print '<input type="image" class="valignbottom" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
 
+		$websitepage = new WebSitePage($db);
+		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
+		{
+			$websitepage->fetch($pageid);
+		}
+
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
 		{
 			$disabled='';
@@ -1516,7 +1522,15 @@ if (count($object->records) > 0)
 				print ' &nbsp; ';
 
 				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
-				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
+				if ($websitepage->grabbed_from)
+				{
+					print '<input type="submit" class="button nobordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
+				}
+				else
+				{
+					print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
+				}
+
 				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
 				if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button nobordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 				else print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
@@ -1529,11 +1543,8 @@ if (count($object->records) > 0)
 
 		print '<div class="websitetools">';
 
-		if ($website && $pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
+		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
 		{
-			$websitepage = new WebSitePage($db);
-			$websitepage->fetch($pageid);
-
 			$realpage=$urlwithroot.'/public/website/index.php?website='.$website.'&pageref='.$websitepage->pageurl;
 			$pagealias = $websitepage->pageurl;
 
@@ -1894,8 +1905,9 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 			print '<tr><td class="titlefield">';
 			print $langs->trans("URL");
 			print '</td><td>';
-			print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="http://externalsite/pagetofetch"> ';
+			print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
 			print '<input class="button" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
+			print '<br><br>'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1');
 			print '</td></tr>';
 			print '</table>';
 
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 2e4deb372eb..6c3a1bda329 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -196,10 +196,10 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
             $ok=true;
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/(...................)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
+            preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-                if ($val[1] != 'dol_escape_htmltag(' && $val[1] != 'l_string_nohtmltag(')
+            	if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
                     $ok=false;
                     break;

From 362aec3e4b68331b3d9098234c37bd3f2252d85f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Feb 2018 19:49:50 +0100
Subject: [PATCH 123/386] NEW Add param $dolibarr_main_restrict_ip in config
 file to limit ips

---
 htdocs/conf/conf.php.example                  | 19 +++++++++----------
 htdocs/core/class/commonobject.class.php      | 14 +++++++++++---
 htdocs/main.inc.php                           | 19 +++++++++++++++++++
 .../modulebuilder/template/myobject_card.php  |  1 +
 .../modulebuilder/template/myobject_list.php  | 11 ++++++-----
 5 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 356e76ba374..7475cf54ddb 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -238,6 +238,15 @@ $dolibarr_main_prod='0';
 //
 $dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore';
 
+// $dolibarr_main_restrict_ip
+// To restrict access to backoffice to some ip addresses only.
+// Note: Pages that does not need login (like public pages, web site) are not protected with this.
+// Default value: ''
+// Examples:
+// $dolibarr_main_restrict_ip='127.0.0.1, 192.168.0.1';
+//
+$dolibarr_main_restrict_ip='';
+
 // dolibarr_nocsrfcheck
 // This parameter can be used to disable CSRF protection.
 // This might be required if you access Dolibarr behind a proxy that make
@@ -284,16 +293,6 @@ $dolibarr_nocsrfcheck='0';
 // Examples:
 // $dolibarr_strict_mode=0;
 
-// dolibarr_pdf_force_fpdf
-// Set this to 1 to use the libray FPDF instead of TCPDF. FPDF is not embedded with Dolibarr, 
-// so you also have to uncomment line $dolibarr_lib_FPDF_PATH to provide path to FPDF library.
-// Warning: FPDF does not support all features supported by TCPDF used by default. So using
-// this library instead of TCPF will break some features like transparent logo, cyrillic, arab,
-// and asiatic languages, total number of pages, ...
-// Default value: 0
-// Examples:
-// $dolibarr_pdf_force_fpdf=1;
-
 
 
 //#################################
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d1adfaf9734..8def2194fb3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -548,9 +548,10 @@ abstract class CommonObject
 	 *
 	 * @param	string	$modulepart			Module related to document
 	 * @param	int		$initsharekey		Init the share key if it was not yet defined
+	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file
 	 * @return	string						Link or empty string if there is no download link
 	 */
-	function getLastMainDocLink($modulepart, $initsharekey=0)
+	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)
 	{
 		global $user, $dolibarr_main_url_root;
 
@@ -621,10 +622,17 @@ abstract class CommonObject
 		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
 		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
 
-		$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+		if ($relativelink)
+		{
+			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
+		}
+		else
+		{
+			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+		}
 
 		// Here $ecmfile->share is defined
-		return $fulllink;
+		return $linktoreturn;
 	}
 
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2439a9fd6e0..df49c541b41 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -293,6 +293,25 @@ if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SER
 	}
 }
 
+if (! defined('NOLOGIN') && ! defined('NOIPCHECK') && ! empty($dolibarr_main_restrict_ip))
+{
+	$listofip=explode(',', $dolibarr_main_restrict_ip);
+	$found = false;
+	foreach($listofip as $ip)
+	{
+		$ip=trim($ip);
+		if ($ip == $_SERVER['REMOTE_ADDR'])
+		{
+			$found = true;
+			break;
+		}
+	}
+	if (! $found)
+	{
+		print 'Access refused by IP protection';
+		exit;
+	}
+}
 
 // Loading of additional presentation includes
 if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 68cefa714c3..bc1e9fc7d51 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -30,6 +30,7 @@
 //if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
 //if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 //if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))              define('NOIPCHECK','1');				// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //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('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ef384edb818..23a748a12dc 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -30,6 +30,7 @@
 //if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1');		// Do not check anti CSRF attack test
 //if (! defined('NOCSRFCHECK'))            define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test done when option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 //if (! defined('NOSTYLECHECK'))           define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))              define('NOIPCHECK','1');				// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //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('NOREQUIREHTML'))          define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
@@ -253,19 +254,19 @@ 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) 
+// if total resultset is smaller then paging size (filtering), goto and load page 0
+if (($page * $limit) > $nbtotalofrecords)
 {
 	$page = 0;
-	$offset = 0; 
+	$offset = 0;
 }
 // if total resultset is smaller the limit, no need to do paging.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$resql = $result;
 	$num = $nbtotalofrecords;
-} 
-else 
+}
+else
 {
 	$sql.= $db->plimit($limit+1, $offset);
 

From 540e3d6dc5c8043b2128ad30b4b29b6a758dee14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Feb 2018 01:19:31 +0100
Subject: [PATCH 124/386] USe common name for triggers
 CONTRACT_SERVICE_ACTIVATE into LINECONTRACT_ACTIVATE and
 CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE

---
 ChangeLog                              |  4 ++-
 htdocs/contrat/card.php                | 16 ++++++++--
 htdocs/contrat/class/contrat.class.php | 44 ++++++++++++++------------
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c04eaf7a42..fd18deeac14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,9 @@ WARNING:
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * Hook 'maildao' was renamed into 'mail' into the method sendfile that send emails, and method was renamed from
   'doaction' into 'sendMail'. 
-  
+* Rename trigger CONTRACT_SERVICE_ACTIVATE into LINECONTRACT_ACTIVATE and
+  CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE
+
 
 ***** ChangeLog for 7.0.0 compared to 6.0.5 *****
 For users:
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index c2b6e03ee5b..6111be6c7ee 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -810,18 +810,30 @@ if (empty($reshook))
 	else if ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 		$result = $object->reopen($user);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Close all lines
 	else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
-		$object->closeAll($user);
+		$result = $object->closeAll($user);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Close all lines
 	else if ($action == 'confirm_activate' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
-		$object->activateAll($user);
+		$result = $object->activateAll($user);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 623b968ca92..0e4b7a1c8f9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -272,7 +272,8 @@ class Contrat extends CommonObject
 		// Load lines
 		$this->fetch_lines();
 
-		$ok=true;
+		$error=0;
+
 		foreach($this->lines as $contratline)
 		{
 			// Open lines not already open
@@ -281,26 +282,27 @@ class Contrat extends CommonObject
 				$result = $contratline->active_line($user, $date_start, -1);
 				if ($result < 0)
 				{
-					$ok=false;
+					$error++;
+					$this->errors = $contratline->error;
+					$this->errors = $contratline->errors;
 					break;
 				}
 			}
 		}
 
-		if ($this->statut == 0)
+		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user);
-			if ($result < 0) $ok=false;
+			if ($result < 0) $error++;
 		}
 
-		if ($ok)
+		if (! $error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			dol_print_error($this->db,'Error in activateAll function');
 			$this->db->rollback();
 			return -1;
 		}
@@ -310,7 +312,7 @@ 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	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function closeAll(User $user, $notrigger=0)
@@ -322,7 +324,8 @@ class Contrat extends CommonObject
 
 		$now = dol_now();
 
-		$ok=true;
+		$error = 0;
+
 		foreach($this->lines as $contratline)
 		{
 			// Close lines not already closed
@@ -331,29 +334,30 @@ class Contrat extends CommonObject
 				$contratline->date_cloture=$now;
 				$contratline->fk_user_cloture=$user->id;
 				$contratline->statut='5';
-				$result=$contratline->update($user);
+				$result=$contratline->close_line($user, $now);
 				if ($result < 0)
 				{
-					$ok=false;
+					$error++;
+					$this->errors = $contratline->error;
+					$this->errors = $contratline->errors;
 					break;
 				}
 	        }
 		}
 
-		if ($this->statut == 0)
+		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $ok=false;
+			if ($result < 0) $error++;
 		}
 
-        if ($ok)
+        if (! $error)
         {
             $this->db->commit();
             return 1;
         }
         else
         {
-            dol_print_error($this->db,'Error in closeAll function');
             $this->db->rollback();
             return -1;
         }
@@ -3122,7 +3126,7 @@ class ContratLigne extends CommonObjectLine
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
-			$result = $this->call_trigger('CONTRACT_SERVICE_ACTIVATE', $user);
+			$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
@@ -3142,10 +3146,10 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  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
-	 * @return int                    <0 if KO, >0 if OK
+	 * @param    User 	$user 			Objet User who close contract
+	 * @param  	 int 	$date_end 		Date end
+	 * @param    string $comment 		A comment typed by user
+	 * @return int                    	<0 if KO, >0 if OK
 	 */
 	function close_line($user, $date_end, $comment = '')
 	{
@@ -3171,7 +3175,7 @@ class ContratLigne extends CommonObjectLine
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
-			$result = $this->call_trigger('CONTRACT_SERVICE_CLOSE', $user);
+			$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();

From 235a5f9b7fea1b3b07c3df2c31fd6801e6170450 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Fri, 16 Feb 2018 09:02:34 +0100
Subject: [PATCH 125/386] Fix : bad var name

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 62bda6b57cb..a278ad9bfd6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2231,36 +2231,36 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	}
 	elseif (strtoupper($countrycode) == "PT" )
 	{//Portugal		
-		if (dol_strlen($object) == 13)
+		if (dol_strlen($newphone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "SR" )
 	{//Suriname
-		if (dol_strlen($object) == 10)
+		if (dol_strlen($newphone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
 		}
-		elseif (dol_strlen($object) == 11)
+		elseif (dol_strlen($newphone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "DE" )
 	{//Allemagne
-		if (dol_strlen($object) == 14)
+		if (dol_strlen($newphone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
 		}
-		elseif (dol_strlen($object) == 13) 
+		elseif (dol_strlen($newphone) == 13) 
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
-		if (dol_strlen($object) == 12) 
+		if (dol_strlen($newphone) == 12) 
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
@@ -2281,7 +2281,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	}
 	elseif (strtoupper($countrycode) == "TR")
 	{//Turquie			
-		if (dol_strlen($object) == 13)
+		if (dol_strlen($newphone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}

From bd486e4cabae60ec559f12a6b88495efc8081df2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 10:29:36 +0100
Subject: [PATCH 126/386] FIX: remove var_dump

---
 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 e3c68177b41..3ab9e4e684c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -133,7 +133,7 @@ if (empty($reshook))
 		$object->fetch_thirdparty();
 		$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
 	}
-	var_dump($conf->global->MAIN_VERSION_LAST_UPGRADE, $conf->global->MAIN_VERSION_LAST_INSTALL);
+
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes')
 	{

From 905adab5176331c11b9936e06f8815723a06a272 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 11:23:59 +0100
Subject: [PATCH 127/386] NEW: supplier credit notes: display supplier
 discounts in supplier order card

---
 htdocs/commande/card.php       |  7 ++--
 htdocs/fourn/commande/card.php | 62 ++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6e1d411d55e..a56dc6cd5ac 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2038,8 +2038,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Relative and absolute discounts
 		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
+			$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 (fk_facture_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
@@ -2056,8 +2055,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 		else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
 		print '. ';
-		$absolute_discount = $soc->getAvailableDiscounts('', 'fk_facture_source IS NULL');
-		$absolute_creditnote = $soc->getAvailableDiscounts('', 'fk_facture_source IS NOT NULL');
+		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
+		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 		if ($absolute_discount) {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 81ea1a0f951..5c632530a8e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1477,6 +1477,29 @@ if ($action=='create')
 	}
 	print '</td>';
 
+	if ($societe->id > 0)
+	{
+		// Discounts for third party
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+		if ($fourn->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
+		print '. ';
+		print '<br>';
+
+		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
+
+		if ($absolute_discount)
+			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
+		else
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
+		print '.';
+		print '</td></tr>';
+	}
+
 	// Ref supplier
 	print '<tr><td>'.$langs->trans('RefSupplier').'</td><td><input name="refsupplier" type="text"></td>';
 	print '</tr>';
@@ -1857,6 +1880,45 @@ elseif (! empty($object->id))
 	print '<td>'.$author->getNomUrl(1, '', 0, 0, 0).'</td>';
 	print '</tr>';
 
+	// Relative and absolute discounts
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+	} else {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+	}
+
+	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+
+	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+	if ($societe->remise_percent)
+		print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+	else
+		print $langs->trans("CompanyHasNoRelativeDiscount");
+	print '. ';
+	$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+	$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+	$absolute_discount = price2num($absolute_discount, 'MT');
+	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+	if ($absolute_discount) {
+		if ($object->statut > CommandeFournisseur::STATUS_DRAFT) {
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+		} else {
+			// Remise dispo de type remise fixe (not credit note)
+			print '<br>';
+			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+		}
+	}
+	if ($absolute_creditnote) {
+		print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
+	}
+	if (! $absolute_discount && ! $absolute_creditnote)
+		print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+	print '</td></tr>';
+
 	// Conditions de reglement par defaut
 	$langs->load('bills');
 	print '<tr><td class="nowrap">';

From d2bb6a790b2bc98a36ecc05012362dc4656be75d Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 11:45:57 +0100
Subject: [PATCH 128/386] NEW: supplier credit notes: display supplier
 discounts in supplier proposal card

---
 htdocs/fourn/commande/card.php    |  2 +-
 htdocs/supplier_proposal/card.php | 62 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 5c632530a8e..798c6219356 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1481,7 +1481,7 @@ if ($action=='create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($fourn->remise_percent)
+		if ($societe->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
 		else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a5488959016..dcd15b61469 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1048,6 +1048,29 @@ if ($action == 'create')
 	}
 	print '</tr>' . "\n";
 
+	if ($soc->id > 0)
+	{
+		// Discounts for third party
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+		if ($fourn->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
+		print '. ';
+		print '<br>';
+
+		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);
+
+		if ($absolute_discount)
+			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
+		else
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
+		print '.';
+		print '</td></tr>';
+	}
+
 	// Terms of payment
 	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
 	$form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
@@ -1387,6 +1410,45 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 
+	// Relative and absolute discounts
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+	} else {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+	}
+
+	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+
+	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+	if ($soc->remise_percent)
+		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+	else
+		print $langs->trans("CompanyHasNoRelativeDiscount");
+	print '. ';
+	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+	$absolute_discount = price2num($absolute_discount, 'MT');
+	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+	if ($absolute_discount) {
+		if ($object->statut > SupplierProposal::STATUS_DRAFT) {
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+		} else {
+			// Remise dispo de type remise fixe (not credit note)
+			print '<br>';
+			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+		}
+	}
+	if ($absolute_creditnote) {
+		print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
+	}
+	if (! $absolute_discount && ! $absolute_creditnote)
+		print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+	print '</td></tr>';
+
 	// Payment term
 	print '<tr><td class="titlefield">';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';

From 7367769ec36f96be619cc950cc3e5d6c14c64b61 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 11:59:51 +0100
Subject: [PATCH 129/386] FIX: supplier credit notes: use correct rights in
 supplier invoice card

---
 htdocs/fourn/facture/card.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 3ab9e4e684c..ace7ce0b1b7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -268,7 +268,7 @@ if (empty($reshook))
 	}
 	
 	// Delete link of credit note to invoice
-	else if ($action == 'unlinkdiscount' && $user->rights->facture->creer)
+	else if ($action == 'unlinkdiscount' && $user->rights->fournisseur->facture->creer)
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
@@ -326,12 +326,12 @@ if (empty($reshook))
 	}
 
 	// Multicurrency Code
-	else if ($action == 'setmulticurrencycode' && $user->rights->facture->creer) {
+	else if ($action == 'setmulticurrencycode' && $user->rights->fournisseur->facture->creer) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	else if ($action == 'setmulticurrencyrate' && $user->rights->facture->creer) {
+	else if ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->facture->creer) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')));
 	}
 
@@ -385,7 +385,7 @@ if (empty($reshook))
 		$result=$object->update($user);
 		if ($result < 0) dol_print_error($db,$object->error);
 	}
-	elseif ($action == "setabsolutediscount" && $user->rights->facture->creer)
+	elseif ($action == "setabsolutediscount" && $user->rights->fournisseur->facture->creer)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 	
@@ -443,7 +443,7 @@ if (empty($reshook))
 		}
 	}
 	// Convertir en reduc
-	else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->facture->creer)
+	else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$object->fetch_thirdparty();
@@ -3108,7 +3108,7 @@ else
 					}
 
 					// For standard invoice with excess paid
-					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->facture->creer && empty($discount->id))
+					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessReceivedToReduc').'</a></div>'; // TODO translation : trop-perçu => trop payé
 					}

From fa0c65e37ee1f35d1282ff8029616fd82d65186a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 12:05:36 +0100
Subject: [PATCH 130/386] FIX: supplier credit notes: correctly handle discount
 split

---
 htdocs/comm/remx.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 072baa675fb..ad6c1f33a97 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -93,6 +93,12 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount2->fk_facture=$discount->fk_facture;
 		$newdiscount1->fk_facture_line=$discount->fk_facture_line;
 		$newdiscount2->fk_facture_line=$discount->fk_facture_line;
+		$newdiscount1->fk_invoice_supplier_source=$discount->fk_invoice_supplier_source;
+		$newdiscount2->fk_invoice_supplier_source=$discount->fk_invoice_supplier_source;
+		$newdiscount1->fk_invoice_supplier=$discount->fk_invoice_supplier;
+		$newdiscount2->fk_invoice_supplier=$discount->fk_invoice_supplier;
+		$newdiscount1->fk_invoice_supplier_line=$discount->fk_invoice_supplier_line;
+		$newdiscount2->fk_invoice_supplier_line=$discount->fk_invoice_supplier_line;
 		if ($discount->description == '(CREDIT_NOTE)' || $discount->description == '(DEPOSIT)')
 		{
 			$newdiscount1->description=$discount->description;
@@ -107,6 +113,8 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount2->fk_user=$discount->fk_user;
 		$newdiscount1->fk_soc=$discount->fk_soc;
 		$newdiscount2->fk_soc=$discount->fk_soc;
+		$newdiscount1->discount_type=$discount->discount_type;
+		$newdiscount2->discount_type=$discount->discount_type;
 		$newdiscount1->datec=$discount->datec;
 		$newdiscount2->datec=$discount->datec;
 		$newdiscount1->tva_tx=$discount->tva_tx;

From 924a9c392cd5cecf4c9e7666a9df38cf1e7f2037 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 16 Feb 2018 12:30:32 +0100
Subject: [PATCH 131/386] FIX: supplier credit notes: hide relative discounts
 until supported

---
 htdocs/fourn/commande/card.php    |  7 +++++--
 htdocs/fourn/facture/card.php     | 19 +++++++++++--------
 htdocs/supplier_proposal/card.php |  9 ++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 798c6219356..c65b7d6cf60 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1479,6 +1479,7 @@ if ($action=='create')
 
 	if ($societe->id > 0)
 	{
+/* // TODO handle supplier relative discount
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($societe->remise_percent)
@@ -1488,7 +1489,7 @@ if ($action=='create')
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
-
+*/
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 
 		if ($absolute_discount)
@@ -1894,11 +1895,13 @@ elseif (! empty($object->id))
 	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
 	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+/* // TODO handle supplier relative discount
 	if ($societe->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
 	else
 		print $langs->trans("CompanyHasNoRelativeDiscount");
 	print '. ';
+*/
 	$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 	$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 	$absolute_discount = price2num($absolute_discount, 'MT');
@@ -1908,7 +1911,7 @@ elseif (! empty($object->id))
 			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 		} else {
 			// Remise dispo de type remise fixe (not credit note)
-			print '<br>';
+//			print '<br>';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
 		}
 	}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ace7ce0b1b7..255c917b6a9 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1917,6 +1917,7 @@ if ($action == 'create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+/* // TODO handle supplier relative discount
 		if ($societe->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
 		else
@@ -1924,6 +1925,7 @@ if ($action == 'create')
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
+*/
 		if ($absolute_discount)
 			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
 		else
@@ -2417,15 +2419,16 @@ else
 		
 		print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
 		print '</td><td>';
+/* // TODO handle supplier relative discount
 		if ($societe->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
 		else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
 		// print ' ('.$addrelativediscount.')';
-		
+*/
 		// Is there is commercial discount or down payment available ?
 		if ($absolute_discount > 0) {
-			print '. ';
+//			print '. ';
 			if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
 				if ($object->statut == 0) {
 					print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
@@ -2433,7 +2436,7 @@ else
 				} else {
 					if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
 						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-						print '<br>' . $text . '.<br>';
+						print '<!--<br>-->' . $text . '.<br>';
 					} else {
 						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 						$text2 = $langs->trans("AbsoluteDiscountUse");
@@ -2442,7 +2445,7 @@ else
 				}
 			} else {
 				// Discount available of type fixed amount (not credit note)
-				print '<br>';
+//				print '<br>';
 				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
 			}
 		} else {
@@ -2450,10 +2453,10 @@ else
 			{
 				if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
 					print ' (' . $addabsolutediscount . ')<br>';
-				else
-					print '. ';
+//				else
+//					print '. ';
 			} else
-				print '. ';
+			print '. ';
 		}
 		// Is there credit notes availables ?
 		if ($absolute_creditnote > 0)
@@ -2468,7 +2471,7 @@ else
 				}
 			} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 				// There is credit notes discounts available
-				if (! $absolute_discount) print '<br>';
+//				if (! $absolute_discount) print '<br>';
 				// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
 				$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
 				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index dcd15b61469..ba78c78dade 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1050,16 +1050,17 @@ if ($action == 'create')
 
 	if ($soc->id > 0)
 	{
+/* // TODO handle supplier relative discount
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($fourn->remise_percent)
+		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
 		else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
-
+*/
 		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);
 
 		if ($absolute_discount)
@@ -1424,11 +1425,13 @@ if ($action == 'create')
 	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
 	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+/* // TODO handle supplier relative discount
 	if ($soc->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 	else
 		print $langs->trans("CompanyHasNoRelativeDiscount");
 	print '. ';
+*/
 	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 	$absolute_discount = price2num($absolute_discount, 'MT');
@@ -1438,7 +1441,7 @@ if ($action == 'create')
 			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 		} else {
 			// Remise dispo de type remise fixe (not credit note)
-			print '<br>';
+//			print '<br>';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
 		}
 	}

From d233c152a7af042fa6ba716b8b66f19c8d75a7db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Feb 2018 14:18:05 +0100
Subject: [PATCH 132/386] Code comment

---
 htdocs/compta/facture/class/facture.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 12d6fa10769..7edc3b65b41 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3235,7 +3235,6 @@ class Facture extends CommonInvoice
 		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
 		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
-		//$sql.= ' WHERE pf.'.$field.' = 1';
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
 		$sql.= ' AND p.fk_paiement = t.id';
 		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';

From ab6d0d2530ecffabbe66a3076d87c3e21ab6da79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Feb 2018 01:16:52 +0100
Subject: [PATCH 133/386] Fix errors

---
 htdocs/contrat/class/contrat.class.php |   4 +-
 htdocs/core/lib/functions.lib.php      | 100 ++++++++++++-------------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0e4b7a1c8f9..190de79aa17 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -283,7 +283,7 @@ class Contrat extends CommonObject
 				if ($result < 0)
 				{
 					$error++;
-					$this->errors = $contratline->error;
+					$this->error = $contratline->error;
 					$this->errors = $contratline->errors;
 					break;
 				}
@@ -338,7 +338,7 @@ class Contrat extends CommonObject
 				if ($result < 0)
 				{
 					$error++;
-					$this->errors = $contratline->error;
+					$this->error = $contratline->error;
 					$this->errors = $contratline->errors;
 					break;
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 62bda6b57cb..0cc2fb0446f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2205,19 +2205,19 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		if (dol_strlen($phone) == 10) {
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,2).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2);
 		}
-		elseif (dol_strlen($newphone) == 7)
+		elseif (dol_strlen($phone) == 7)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2);
 		}
-		elseif (dol_strlen($newphone) == 9)
+		elseif (dol_strlen($phone) == 9)
 		{
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2);
 		}
-		elseif (dol_strlen($newphone) == 11)
+		elseif (dol_strlen($phone) == 11)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
-		elseif (dol_strlen($newphone) == 12)
+		elseif (dol_strlen($phone) == 12)
 		{
 			$newphone=substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
@@ -2230,252 +2230,252 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 		}
 	}
 	elseif (strtoupper($countrycode) == "PT" )
-	{//Portugal		
-		if (dol_strlen($object) == 13)
+	{//Portugal
+		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "SR" )
 	{//Suriname
-		if (dol_strlen($object) == 10)
+		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
 		}
-		elseif (dol_strlen($object) == 11)
+		elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "DE" )
 	{//Allemagne
-		if (dol_strlen($object) == 14)
+		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
 		}
-		elseif (dol_strlen($object) == 13) 
+		elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
-		if (dol_strlen($object) == 12) 
+		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
-		if (dol_strlen($newphone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
-		if (dol_strlen($newphone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TR")
-	{//Turquie			
-		if (dol_strlen($object) == 13)
+	{//Turquie
+		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
-		if (dol_strlen($newphone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
-		if (dol_strlen($newphone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
 		}
-		elseif (dol_strlen($newphone) == 11)
+		elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);				
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
-		elseif (dol_strlen($newphone) == 13)
+		elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);	
+			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ML")
 	{//Mali
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
-		if(dol_strlen($newphone) == 11)
+		if(dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
 		}
-		elseif(dol_strlen($newphone) == 12)
+		elseif(dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
 		}
 		}
 	elseif (strtoupper($countrycode) == "MU")
 	{//Maurice
-		if(dol_strlen($newphone) == 11)
+		if(dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
-		elseif(dol_strlen($newphone) == 12)
+		elseif(dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-		elseif(dol_strlen($newphone) == 13)
+		elseif(dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
 		}
-		elseif(dol_strlen($newphone) == 13)
+		elseif(dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-		elseif(dol_strlen($newphone) == 14)
+		elseif(dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
-		if(dol_strlen($newphone) == 11)
+		if(dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
 		}
-		elseif(dol_strlen($newphone) == 12)
+		elseif(dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
-		if(dol_strlen($newphone) == 13)
-		{//ex: +261_AB_CD_EF_GHI 
+		if(dol_strlen($phone) == 13)
+		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-		elseif(dol_strlen($newphone) == 15)
+		elseif(dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
-		if(dol_strlen($newphone) == 13)
+		if(dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "IT")
 	{//Italie
-		if(dol_strlen($newphone) == 12)
+		if(dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-		elseif(dol_strlen($newphone) == 13)
+		elseif(dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
 	}
 	elseif(strtoupper($countrycode) == "AU")
 	{//Australie
-		 if(dol_strlen($newphone) == 12)
+		 if(dol_strlen($phone) == 12)
 		{//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
 		}

From 60a77a6d857953afcf2c908f233ff28a083340e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 14:56:37 +0100
Subject: [PATCH 134/386] Add option to grab images into same dir or subdir

---
 htdocs/core/lib/website.lib.php            | 105 +++--
 htdocs/langs/en_US/website.lang            |   5 +
 htdocs/website/class/websitepage.class.php |   5 +-
 htdocs/website/index.php                   | 476 +++++++++++----------
 4 files changed, 315 insertions(+), 276 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 8a7e14f8b0d..785231c6c87 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -222,9 +222,11 @@ function includeContainer($containeralias)
  * @param 	string		$tmp			Content to parse
  * @param 	string		$action			Var $action
  * @param	string		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
+ * @param	int			$grabimages		0=Do not grab images, 1=Grab images
+ * @param	string		$grabimagesinto	'root' or 'subpage'
  * @return	void
  */
-function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0)
+function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0, $grabimages=1, $grabimagesinto='subpage')
 {
 	global $conf;
 
@@ -252,15 +254,18 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$dirforimages = '/'.$objectpage->pageurl;
+		if ($grabimagesinto == 'root') $dirforimages='';
+
+		// Define $filetosave and $filename
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 		if (preg_match('/^http/', $regs[2][$key]))
 		{
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 		}
-
-		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
@@ -272,30 +277,33 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 
 		if (empty($alreadygrabbed[$urltograbbis]))
 		{
-			$tmpgeturl = getURLContent($urltograbbis);
-			if ($tmpgeturl['curl_error_no'])
+			if ($grabimages)
 			{
-				$error++;
-				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-				$action='create';
-			}
-			elseif ($tmpgeturl['http_code'] != '200')
-			{
-				$error++;
-				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-				$action='create';
-			}
-			else
-			{
-				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
+				$tmpgeturl = getURLContent($urltograbbis);
+				if ($tmpgeturl['curl_error_no'])
+				{
+					$error++;
+					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+					$action='create';
+				}
+				elseif ($tmpgeturl['http_code'] != '200')
+				{
+					$error++;
+					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+					$action='create';
+				}
+				else
+				{
+					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
-				dol_mkdir(dirname($filetosave));
+					dol_mkdir(dirname($filetosave));
 
-				$fp = fopen($filetosave, "w");
-				fputs($fp, $tmpgeturl['content']);
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					$fp = fopen($filetosave, "w");
+					fputs($fp, $tmpgeturl['content']);
+					fclose($fp);
+					if (! empty($conf->global->MAIN_UMASK))
+						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 		}
 
@@ -344,30 +352,33 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 
 		if (empty($alreadygrabbed[$urltograbbis]))
 		{
-			$tmpgeturl = getURLContent($urltograbbis);
-			if ($tmpgeturl['curl_error_no'])
+			if ($grabimages)
 			{
-				$error++;
-				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-				$action='create';
-			}
-			elseif ($tmpgeturl['http_code'] != '200')
-			{
-				$error++;
-				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-				$action='create';
-			}
-			else
-			{
-				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
+				$tmpgeturl = getURLContent($urltograbbis);
+				if ($tmpgeturl['curl_error_no'])
+				{
+					$error++;
+					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+					$action='create';
+				}
+				elseif ($tmpgeturl['http_code'] != '200')
+				{
+					$error++;
+					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+					$action='create';
+				}
+				else
+				{
+					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
-				dol_mkdir(dirname($filetosave));
+					dol_mkdir(dirname($filetosave));
 
-				$fp = fopen($filetosave, "w");
-				fputs($fp, $tmpgeturl['content']);
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					$fp = fopen($filetosave, "w");
+					fputs($fp, $tmpgeturl['content']);
+					fclose($fp);
+					if (! empty($conf->global->MAIN_UMASK))
+						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 		}
 
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 996c6160deb..7a5c3a60849 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -69,3 +69,8 @@ WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts
 YouMustDefineTheHomePage=You must first define the default Home page
 OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabber 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
\ No newline at end of file
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 408f5d194ae..f4848c70c91 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -113,13 +113,16 @@ class WebsitePage extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
+		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
+
 		return $this->createCommon($user, $notrigger);
 	}
 
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id           Id object. If this is 0, the default page of website_id will be used, if not defined, the first one found.
+	 * @param int    $id           Id object. If this is 0, the value into $page will be used. If not found of $page not defined, the default page of website_id will be used or the first page found if not set.
 	 * @param string $website_id   Web site id (page name must also be filled if this parameter is used)
 	 * @param string $page         Page name (website id must also be filled if this parameter is used)
 	 *
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 8db771113ca..156d3ef8229 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -261,6 +261,9 @@ if ($action == 'addcontainer')
 	if (GETPOST('fetchexternalurl','alpha'))
 	{
 		$urltograb=GETPOST('externalurl','alpha');
+		$grabimages=GETPOST('grabimages','alpha');
+		$grabimagesinto=GETPOST('grabimagesinto','alpha');
+		//var_dump($grabimages);exit;
 	}
 
 	if ($urltograb)
@@ -275,234 +278,248 @@ if ($action == 'addcontainer')
 		{
 			$urltograb.='/';
 		}
+		$pageurl = dol_sanitizeFileName(preg_replace('/[\/\.]/','-', preg_replace('/\/+$/', '', $urltograbwithoutdomainandparam)));
 
 		$urltograbdirwithoutslash = dirname($urltograb.'.');
 		$urltograbdirrootwithoutslash = getRootURLFromURL($urltograbdirwithoutslash);
 		// Exemple, now $urltograbdirwithoutslash is https://www.dolimed.com/screenshots
 		// and $urltograbdirrootwithoutslash is https://www.dolimed.com
 
-		$tmp = getURLContent($urltograb);
-		if ($tmp['curl_error_no'])
+		// Check pageurl is not already used
+		$tmpwebsitepage = new WebsitePage($db);
+		$result = $tmpwebsitepage->fetch(0, $object->id, $pageurl);
+		if ($result > 0)
 		{
+			setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
 			$error++;
-			setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
 			$action='createcontainer';
 		}
-		elseif ($tmp['http_code'] != '200')
+
+		if (! $error)
 		{
-			$error++;
-			setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
-			$action='createcontainer';
-		}
-		else
-		{
-			// Remove comments
-			$tmp['content'] = removeHtmlComment($tmp['content']);
-
-			preg_match('/<head>(.*)<\/head>/is', $tmp['content'], $reg);
-			$head = $reg[1];
-
-			$objectpage->type_container = 'page';
-   			$objectpage->pageurl = dol_sanitizeFileName(preg_replace('/[\/\.]/','-', preg_replace('/\/+$/', '', $urltograbwithoutdomainandparam)));
-   			if (empty($objectpage->pageurl))
-   			{
-   				$tmpdomain = getDomainFromURL($urltograb);
-   				$objectpage->pageurl=$tmpdomain.'-home';
-   			}
-
-			if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
+			$tmp = getURLContent($urltograb);
+			if ($tmp['curl_error_no'])
 			{
-				$objectpage->title = $regtmp[1];
+				$error++;
+				setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
+				$action='createcontainer';
 			}
-			if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
+			elseif ($tmp['http_code'] != '200')
 			{
-				$objectpage->description = $regtmp[1];
+				$error++;
+				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
+				$action='createcontainer';
 			}
-			if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp))
+			else
 			{
-				$objectpage->keywords = $regtmp[1];
+				// Remove comments
+				$tmp['content'] = removeHtmlComment($tmp['content']);
+
+				preg_match('/<head>(.*)<\/head>/is', $tmp['content'], $reg);
+				$head = $reg[1];
+
+				$objectpage->type_container = 'page';
+	   			$objectpage->pageurl = $pageurl;
+	   			if (empty($objectpage->pageurl))
+	   			{
+	   				$tmpdomain = getDomainFromURL($urltograb);
+	   				$objectpage->pageurl=$tmpdomain.'-home';
+	   			}
+
+				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
+				{
+					$objectpage->title = $regtmp[1];
+				}
+				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
+				{
+					$objectpage->description = $regtmp[1];
+				}
+				if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp))
+				{
+					$objectpage->keywords = $regtmp[1];
+				}
+				if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp))
+				{
+					$tmplang=explode('-', $regtmp[1]);
+					$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
+				}
+
+				$objectpage->content = $tmp['content'];
+				$objectpage->content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $objectpage->content);
+				$objectpage->content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $objectpage->content);
+
+				$absoluteurlinaction=$urltograbdirwithoutslash;
+				// TODO Replace 'action="$urltograbdirwithoutslash' into action="/"
+				// TODO Replace 'action="$urltograbdirwithoutslash..."' into   action="..."
+				// TODO Replace 'a href="$urltograbdirwithoutslash' into a href="/"
+				// TODO Replace 'a href="$urltograbdirwithoutslash..."' into a href="..."
+
+				// Now loop to fetch all css files. Include them inline into header of page
+				$objectpage->htmlheader = $tmp['content'];
+				$objectpage->htmlheader = preg_replace('/^.*<head(\s[^>]*)*>/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<\/head(\s[^>]*)*>.*$/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<base(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="robot(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="keywords(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="title(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="description(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="generator(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				//$objectpage->htmlheader = preg_replace('/<meta name="verify-v1[^>]*>\n*/ims', '', $objectpage->htmlheader);
+				//$objectpage->htmlheader = preg_replace('/<meta name="msvalidate.01[^>]*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<title>[^<]*<\/title>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="shortcut[^>]*>\n/ims', '', $objectpage->htmlheader);
+
+				// Now loop to fetch JS
+				$tmp = $objectpage->htmlheader;
+
+				preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
+				foreach ($regs[0] as $key => $val)
+				{
+					dol_syslog("We will grab the resource found into script tag ".$regs[2][$key]);
+
+					$linkwithoutdomain = $regs[2][$key];
+					if (preg_match('/^\//', $regs[2][$key]))
+					{
+						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+					}
+					else
+					{
+						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
+					}
+
+					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+					if (preg_match('/^http/', $regs[2][$key]))
+					{
+						$urltograbbis = $regs[2][$key];
+						$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
+						//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+					}
+
+					//print $domaintograb.' - '.$domaintograbbis.' - '.$urltograbdirwithoutslash.' - ';
+					//print $linkwithoutdomain.' - '.$urltograbbis."<br>\n";
+
+					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
+					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
+					$domaintograbbis = getDomainFromURL($urltograbbis);
+					if ($domaintograb != $domaintograbbis) continue;
+
+					/*
+	    			$tmpgeturl = getURLContent($urltograbbis);
+	    			if ($tmpgeturl['curl_error_no'])
+	    			{
+	    				$error++;
+	    				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+	    				$action='createcontainer';
+	    			}
+					elseif ($tmpgeturl['http_code'] != '200')
+					{
+						$error++;
+						setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+						$action='createcontainer';
+					}
+					else
+	    			{
+	    				dol_mkdir(dirname($filetosave));
+
+	    				$fp = fopen($filetosave, "w");
+	    				fputs($fp, $tmpgeturl['content']);
+	    				fclose($fp);
+	    				if (! empty($conf->global->MAIN_UMASK))
+	    					@chmod($file, octdec($conf->global->MAIN_UMASK));
+	    			}
+					*/
+
+					//$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+					$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '', $tmp);
+				}
+				$objectpage->htmlheader = trim($tmp);
+
+
+				// Now loop to fetch CSS
+				$pagecsscontent = "\n".'<style>'."\n";
+
+				preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
+				foreach ($regs[0] as $key => $val)
+				{
+					dol_syslog("We will grab the resource found into link tag ".$regs[2][$key]);
+
+					$linkwithoutdomain = $regs[2][$key];
+					if (preg_match('/^\//', $regs[2][$key]))
+					{
+						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+					}
+					else
+					{
+						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
+					}
+
+					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+					if (preg_match('/^http/', $regs[2][$key]))
+					{
+						$urltograbbis = $regs[2][$key];
+						$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
+						//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+					}
+
+					//print $domaintograb.' - '.$domaintograbbis.' - '.$urltograbdirwithoutslash.' - ';
+					//print $linkwithoutdomain.' - '.$urltograbbis."<br>\n";
+
+					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
+					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
+					$domaintograbbis = getDomainFromURL($urltograbbis);
+					if ($domaintograb != $domaintograbbis) continue;
+
+					$tmpgeturl = getURLContent($urltograbbis);
+					if ($tmpgeturl['curl_error_no'])
+					{
+						$error++;
+						setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+						$action='createcontainer';
+					}
+					elseif ($tmpgeturl['http_code'] != '200')
+					{
+						$error++;
+						setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+						$action='createcontainer';
+					}
+					else
+					{
+						//dol_mkdir(dirname($filetosave));
+
+						//$fp = fopen($filetosave, "w");
+						//fputs($fp, $tmpgeturl['content']);
+						//fclose($fp);
+						//if (! empty($conf->global->MAIN_UMASK))
+						//	@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+						//	$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+						$pagecsscontent.='/* Content of file '.$urltograbbis.' */'."\n";
+
+						getAllImages($object, $objectpage, $urltograbbis, $tmpgeturl['content'], $action, 1, $grabimages, $grabimagesinto);
+
+						$pagecsscontent.=$tmpgeturl['content']."\n";
+
+						$objectpage->htmlheader = preg_replace('/'.preg_quote($regs[0][$key],'/').'\n*/ims', '', $objectpage->htmlheader);
+					}
+				}
+
+				$pagecsscontent.='</style>'."\n";
+				//var_dump($pagecsscontent);
+
+				//print dol_escape_htmltag($tmp);exit;
+				$objectpage->htmlheader .= $pagecsscontent;
+
+
+				// Now loop to fetch all images into page
+				$tmp = $objectpage->content;
+
+				getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1, $grabimages, $grabimagesinto);
+
+				//print dol_escape_htmltag($tmp);exit;
+				$objectpage->content = $tmp;
+
+				$objectpage->grabbed_from = $urltograb;
 			}
-			if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp))
-			{
-				$tmplang=explode('-', $regtmp[1]);
-				$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
-			}
-
-			$objectpage->content = $tmp['content'];
-			$objectpage->content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $objectpage->content);
-			$objectpage->content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $objectpage->content);
-
-			$absoluteurlinaction=$urltograbdirwithoutslash;
-			// TODO Replace 'action="$urltograbdirwithoutslash' into action="/"
-			// TODO Replace 'action="$urltograbdirwithoutslash..."' into   action="..."
-			// TODO Replace 'a href="$urltograbdirwithoutslash' into a href="/"
-			// TODO Replace 'a href="$urltograbdirwithoutslash..."' into a href="..."
-
-			// Now loop to fetch all css files. Include them inline into header of page
-			$objectpage->htmlheader = $tmp['content'];
-			$objectpage->htmlheader = preg_replace('/^.*<head(\s[^>]*)*>/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<\/head(\s[^>]*)*>.*$/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<base(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<meta name="robot(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<meta name="keywords(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<meta name="title(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<meta name="description(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<meta name="generator(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-			//$objectpage->htmlheader = preg_replace('/<meta name="verify-v1[^>]*>\n*/ims', '', $objectpage->htmlheader);
-			//$objectpage->htmlheader = preg_replace('/<meta name="msvalidate.01[^>]*>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<title>[^<]*<\/title>\n*/ims', '', $objectpage->htmlheader);
-			$objectpage->htmlheader = preg_replace('/<link[^>]*rel="shortcut[^>]*>\n/ims', '', $objectpage->htmlheader);
-
-			// Now loop to fetch JS
-			$tmp = $objectpage->htmlheader;
-
-			preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
-			foreach ($regs[0] as $key => $val)
-			{
-				dol_syslog("We will grab the resource found into script tag ".$regs[2][$key]);
-
-				$linkwithoutdomain = $regs[2][$key];
-				if (preg_match('/^\//', $regs[2][$key]))
-				{
-					$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-				}
-				else
-				{
-					$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
-				}
-
-				//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
-				if (preg_match('/^http/', $regs[2][$key]))
-				{
-					$urltograbbis = $regs[2][$key];
-					$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-				}
-
-				//print $domaintograb.' - '.$domaintograbbis.' - '.$urltograbdirwithoutslash.' - ';
-				//print $linkwithoutdomain.' - '.$urltograbbis."<br>\n";
-
-				// Test if this is an external URL of grabbed web site. If yes, we do not load resource
-				$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
-				$domaintograbbis = getDomainFromURL($urltograbbis);
-				if ($domaintograb != $domaintograbbis) continue;
-
-				/*
-    			$tmpgeturl = getURLContent($urltograbbis);
-    			if ($tmpgeturl['curl_error_no'])
-    			{
-    				$error++;
-    				setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-    				$action='createcontainer';
-    			}
-				elseif ($tmpgeturl['http_code'] != '200')
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-					$action='createcontainer';
-				}
-				else
-    			{
-    				dol_mkdir(dirname($filetosave));
-
-    				$fp = fopen($filetosave, "w");
-    				fputs($fp, $tmpgeturl['content']);
-    				fclose($fp);
-    				if (! empty($conf->global->MAIN_UMASK))
-    					@chmod($file, octdec($conf->global->MAIN_UMASK));
-    			}
-				*/
-
-				//$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-				$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '', $tmp);
-			}
-			$objectpage->htmlheader = trim($tmp);
-
-
-			// Now loop to fetch CSS
-			$pagecsscontent = "\n".'<style>'."\n";
-
-			preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
-			foreach ($regs[0] as $key => $val)
-			{
-				dol_syslog("We will grab the resource found into link tag ".$regs[2][$key]);
-
-				$linkwithoutdomain = $regs[2][$key];
-				if (preg_match('/^\//', $regs[2][$key]))
-				{
-					$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-				}
-				else
-				{
-					$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
-				}
-
-				//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
-				if (preg_match('/^http/', $regs[2][$key]))
-				{
-					$urltograbbis = $regs[2][$key];
-					$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-				}
-
-				//print $domaintograb.' - '.$domaintograbbis.' - '.$urltograbdirwithoutslash.' - ';
-				//print $linkwithoutdomain.' - '.$urltograbbis."<br>\n";
-
-				// Test if this is an external URL of grabbed web site. If yes, we do not load resource
-				$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
-				$domaintograbbis = getDomainFromURL($urltograbbis);
-				if ($domaintograb != $domaintograbbis) continue;
-
-				$tmpgeturl = getURLContent($urltograbbis);
-				if ($tmpgeturl['curl_error_no'])
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-					$action='createcontainer';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-					$action='createcontainer';
-				}
-				else
-				{
-					//dol_mkdir(dirname($filetosave));
-
-					//$fp = fopen($filetosave, "w");
-					//fputs($fp, $tmpgeturl['content']);
-					//fclose($fp);
-					//if (! empty($conf->global->MAIN_UMASK))
-					//	@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-					//	$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-					$pagecsscontent.='/* Content of file '.$urltograbbis.' */'."\n";
-
-					getAllImages($object, $objectpage, $urltograbbis, $tmpgeturl['content'], $action, 1);
-
-					$pagecsscontent.=$tmpgeturl['content']."\n";
-
-					$objectpage->htmlheader = preg_replace('/'.preg_quote($regs[0][$key],'/').'\n*/ims', '', $objectpage->htmlheader);
-				}
-			}
-
-			$pagecsscontent.='</style>'."\n";
-			//var_dump($pagecsscontent);
-
-			//print dol_escape_htmltag($tmp);exit;
-			$objectpage->htmlheader .= $pagecsscontent;
-
-
-			// Now loop to fetch all images
-			$tmp = $objectpage->content;
-
-			getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1);
-
-			//print dol_escape_htmltag($tmp);exit;
-			$objectpage->content = $tmp;
-
-			$objectpage->grabbed_from = $urltograb;
 		}
 	}
 	else
@@ -1895,27 +1912,30 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<!-- Edit or create page/container -->'."\n";
 	//print '<div class="fichecenter">';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
+	if ($action == 'createcontainer')
 	{
-		if ($action == 'createcontainer')
-		{
-			print '<br>';
+		print '<br>';
 
-			print ' * '.$langs->trans("CreateByFetchingExternalPage").'<br><hr>';
-			print '<table class="border" width="100%">';
-			print '<tr><td class="titlefield">';
-			print $langs->trans("URL");
-			print '</td><td>';
-			print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
-			print '<input class="button" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
-			print '<br><br>'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1');
-			print '</td></tr>';
-			print '</table>';
+		print ' * '.$langs->trans("CreateByFetchingExternalPage").'<br><hr>';
+		print '<table class="border" width="100%">';
+		print '<tr><td class="titlefield">';
+		print $langs->trans("URL");
+		print '</td><td>';
+		print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
+		print '<input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
+		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 '<br>';
+		print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
+		print '<br>'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1');
+		print '</td></tr>';
+		print '</table>';
 
-			print '<br>';
+		print '<br>';
 
-			print ' * '.$langs->trans("OrEnterPageInfoManually").'<br><hr>';
-		}
+		print ' * '.$langs->trans("OrEnterPageInfoManually").'<br><hr>';
 	}
 
 	print '<table class="border" width="100%">';

From f5ad93b272cfcc0d699ee3b9130640520ff5b6d3 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 19 Feb 2018 15:52:07 +0100
Subject: [PATCH 135/386] NEW: supplier credit notes: handle Excess Paid +
 translation

---
 htdocs/comm/remx.php                          | 29 ++++++++++---------
 htdocs/core/class/commonobject.class.php      |  8 ++++-
 htdocs/core/class/discount.class.php          |  6 ++--
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/lib/doc.lib.php                   | 12 ++++++--
 htdocs/core/lib/pdf.lib.php                   | 14 +++++++--
 htdocs/core/tpl/objectline_view.tpl.php       | 11 +++++--
 .../fourn/class/fournisseur.facture.class.php |  2 ++
 htdocs/fourn/facture/card.php                 | 10 +++----
 htdocs/langs/en_US/bills.lang                 |  9 +++++-
 htdocs/langs/en_US/companies.lang             |  6 ++--
 htdocs/societe/consumption.php                | 11 +++++--
 12 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index ad6c1f33a97..177b4456912 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -276,12 +276,12 @@ if ($socid > 0)
 		dol_print_error($db);
 	}
 
-	print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>'; // TODO adapt text
+	print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
 	print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
 	if (! empty($user->fk_soc))    // No need to show this for external users
 	{
-		print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>'; // TODO adapt text
+		print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
     	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 	}
 
@@ -307,12 +307,12 @@ if ($socid > 0)
 			dol_print_error($db);
 		}
 		
-		print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>'; // TODO adapt text
+		print '<tr><td class="titlefield">'.$langs->trans("SupplierAbsoluteDiscountAllUsers").'</td>';
 		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		
 		if (! empty($user->fk_soc))    // No need to show this for external users
 		{
-			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>'; // TODO adapt text
+			print '<tr><td>'.$langs->trans("SupplierAbsoluteDiscountMy").'</td>';
 			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
 	}
@@ -330,9 +330,10 @@ if ($socid > 0)
     	print '<div class="underbanner clearboth"></div>';
     	print '<table class="border" width="100%">';
 		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-	    	print '<tr><td>'.$langs->trans('DiscountType').'</td>';
-	    	print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
-	    	print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label></td></tr>';
+			print '<tr><td>'.$langs->trans('DiscountType').'</td>';
+			print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+			print ' <input type="radio" name="discount_type" id="discount_type_1" selected 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")).'">';
@@ -401,7 +402,7 @@ if ($socid > 0)
 	if ($resql)
 	{
 		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', ''); // TODO translate
+			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
 		}
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
@@ -536,7 +537,7 @@ if ($socid > 0)
 		$resql=$db->query($sql);
 		if ($resql)
 		{
-			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', ''); // TODO translate
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 			print '<table width="100%" class="noborder">';
 			print '<tr class="liste_titre">';
 			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -585,7 +586,7 @@ if ($socid > 0)
 						$facturefournstatic->id=$obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref=$obj->ref;
 						$facturefournstatic->type=$obj->type;
-						print preg_replace('/\(EXCESS PAID\)/',$langs->trans("ExcessPaid"),$obj->description).' '.$facturefournstatic->getNomURl(1); // TODO translate ExcessPaid
+						print preg_replace('/\(EXCESS PAID\)/',$langs->trans("ExcessPaid"),$obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
 					}
 					else
@@ -705,7 +706,7 @@ if ($socid > 0)
 	if ($resql2)
 	{
 		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', ''); // TODO translate
+			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
 		}
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
@@ -855,7 +856,7 @@ if ($socid > 0)
 		if ($resql) $resql2=$db->query($sql2);
 		if ($resql2)
 		{
-			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', ''); // TODO translate
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
 			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -934,12 +935,12 @@ if ($socid > 0)
 						print $obj->description;
 						print '</td>';
 					}
-					print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>'; // TODO adapt to supplier invoice of use getNomUrl
+					print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
 					print '<td align="right">'.price($obj->amount_ht).'</td>';
 					print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
 					print '<td align="right">'.price($obj->amount_ttc).'</td>';
 					print '<td align="center">';
-					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>'; // TODO getNomUrl ?
+					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>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e45acea7675..5abf5e3a0e1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3963,7 +3963,13 @@ abstract class CommonObject
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			} // TODO handle (EXCESS PAID)
+			}
+			elseif ($line->desc == '(EXCESS PAID)')
+			{
+				$discount=new DiscountAbsolute($this->db);
+				$discount->fetch($line->fk_remise_except);
+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+			}
 			else
 			{
 				$this->tpl['description'] = dol_trunc($line->desc,60);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index b62e35c183e..b71d84130a1 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -46,6 +46,7 @@ class DiscountAbsolute
     public $fk_facture;			    // Id invoice when a discount line is used into an invoice (for credit note)
     public $fk_facture_source;		// Id facture avoir a l'origine de la remise
     public $ref_facture_source;	    // Ref facture avoir a l'origine de la remise
+    public $ref_invoive_supplier_source;
 
     /**
      *	Constructor
@@ -568,10 +569,11 @@ class DiscountAbsolute
         $result='';
 
         if ($option == 'invoice') {
+            $facid=! empty($this->discount_type)?$this->fk_invoice_supplier_source:$this->fk_facture_source;
             $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
             $linkend='</a>';
-            $ref=$this->ref_facture_source;
+            $ref=! empty($this->discount_type)?$this->ref_invoice_supplier_source:$this->ref_facture_source;
             $picto='bill';
         }
         if ($option == 'discount') {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e6ab69dff95..f65a3bec36c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1236,7 +1236,7 @@ class Form
 					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc=preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
 					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc=preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
 					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc=preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
-					// TODO handle (EXCESS PAID)
+					if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc=preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
 
 					$selectstring='';
 					if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected';
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 20eaa9a71f7..447c7c2149e 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -73,13 +73,15 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$discount->ref_facture_source);
+			$sourceref=!empty($discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
 		}
 		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 		    $discount=new DiscountAbsolute($db);
 		    $discount->fetch($line->fk_remise_except);
 		    $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$discount->ref_facture_source);
+		    $sourceref=!empty($discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
 		    // Add date of deposit
 		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
 		}
@@ -88,7 +90,13 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		} // TODO handle (EXCESS PAID)
+		}
+		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+		{
+			$discount=new DiscountAbsolute($db);
+			$discount->fetch($line->fk_remise_except);
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+		}
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 0fb649506cb..31fcc519051 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1236,13 +1236,15 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$discount->ref_facture_source);
+			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
 		}
 		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$discount->ref_facture_source);
+			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
 			// Add date of deposit
 			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
 		}
@@ -1251,7 +1253,13 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		} // TODO handle (EXCESS PAID)
+		}
+		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		{
+			$discount=new DiscountAbsolute($db);
+			$discount->fetch($object->lines[$i]->fk_remise_except);
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+		}
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index bc5d950ab8e..6371e289207 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -72,7 +72,8 @@ if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
 		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); // TODO handle (EXCESS PAID)
+		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -100,7 +101,13 @@ if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			} // TODO handle (EXCESS PAID)
+			}
+			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+			{
+				$discount=new DiscountAbsolute($this->db);
+				$discount->fetch($line->fk_remise_except);
+				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+			}
 			else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 3fe59d66ff7..4ebab7d0bc4 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1049,6 +1049,8 @@ class FactureFournisseur extends CommonInvoice
             }
         }
 
+        // TODO Delete related discounts
+
 		if (! $error)
 		{
 			// Delete linked object
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 255c917b6a9..ca29e7299a6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2167,10 +2167,10 @@ else
 
 		// Confirmation de la conversion de l'avoir en reduc
 		if ($action == 'converttoreduc') {
-			if($object->type == FactureFournisseur::TYPE_STANDARD) $type_fac = 'ExcessReceived'; // TODO translation trop-perçu => trop-payé
+			if($object->type == FactureFournisseur::TYPE_STANDARD) $type_fac = 'ExcessPaid';
 			elseif($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $type_fac = 'CreditNote';
 			elseif($object->type == FactureFournisseur::TYPE_DEPOSIT) $type_fac = 'Deposit';
-			$text = $langs->trans('ConfirmConvertToReduc', strtolower($langs->transnoentities($type_fac))); // TODO translation client => fournisseur
+			$text = $langs->trans('ConfirmConvertToReducSupplier', strtolower($langs->transnoentities($type_fac)));
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $langs->trans('ConvertToReduc'), $text, 'confirm_converttoreduc', '', "yes", 2);
 		}
 
@@ -2872,7 +2872,7 @@ else
 					print ' :</td>';
 					print '<td align="right">' . price($obj->amount_ttc) . '</td>';
 					print '<td align="right">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>'; // TODO unlinkdiscount
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
 					print '</td></tr>';
 					$i ++;
 					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
@@ -2929,7 +2929,7 @@ else
 			if ($resteapayeraffiche >= 0)
 				print $langs->trans('RemainderToPay');
 			else
-				print $langs->trans('ExcessReceived');
+				print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td align="right" class="'.($resteapayeraffiche?'amountremaintopay':$cssforamountpaymentcomplete).'">' . price($resteapayeraffiche) . '</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3113,7 +3113,7 @@ else
 					// For standard invoice with excess paid
 					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessReceivedToReduc').'</a></div>'; // TODO translation : trop-perçu => trop payé
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a></div>';
 					}
 					// For credit note
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() == 0) {
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 668090129ff..62386adbe99 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -67,6 +67,7 @@ PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so 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 absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -91,7 +92,7 @@ PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -110,6 +111,7 @@ DoPayment=Enter payment
 DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
 ConvertExcessReceivedToReduc=Convert excess received into future discount
+ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -220,6 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessPaid=Excess paid
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
@@ -284,15 +287,19 @@ Deposits=Down payments
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Down payments from invoice %s
 DiscountFromExcessReceived=Payments from excess received of invoice %s
+DiscountFromExcessPaid=Payments from excess paid of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
 NewRelativeDiscount=New relative discount
+DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
 DiscountStillRemaining=Discounts available
 DiscountAlreadyCounted=Discounts already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Supplier discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7d2b878c5cc..2eb1ba88e57 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -271,8 +271,10 @@ CompanyHasAbsoluteDiscount=This customer has discount available (credits notes o
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 1420562da19..1a6a4be6199 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -490,7 +490,8 @@ if ($sql_select)
 			$txt='';
 			print img_object($langs->trans("ShowReduc"),'reduc').' ';
 			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); // TODO handle (EXCESS PAID)
+			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -510,6 +511,12 @@ if ($sql_select)
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
 				}
+				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				{
+					$discount=new DiscountAbsolute($db);
+					$discount->fetch($objp->fk_remise_except);
+					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+				}
 				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);
@@ -517,7 +524,7 @@ if ($sql_select)
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 					// Add date of deposit
 					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				} // TODO handle (EXCESS PAID)
+				}
 				else
 				{
 					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);

From f3114765a3ed5b3b483a9f7aafcc6202250871e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 16:46:29 +0100
Subject: [PATCH 136/386] Work on website module

---
 htdocs/core/lib/website.lib.php |  41 +++++++++
 htdocs/langs/en_US/website.lang |   4 +-
 htdocs/website/index.php        | 144 ++++++++++++++++++--------------
 3 files changed, 123 insertions(+), 66 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 785231c6c87..dbd3acd794a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -164,6 +164,47 @@ function dolWebsiteSaveContent($content)
 */
 
 
+/**
+ * Make a redirect to another container
+ *
+ * @param 	string	$containeralias		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
+ * @return  void
+ */
+function redirectToContainer($containeralias)
+{
+	global $db, $website;
+
+	$newurl = '';
+
+	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
+	{
+		// Check new container exists
+		$tmpwebsitepage=new WebsitePage($db);
+		$result = $tmpwebsitepage->fetch(0, $website->id, $containeralias);
+		unset($tmpwebsitepage);
+		if ($result > 0)
+		{
+			$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containeralias, $_SERVER["REQUEST_URI"]);
+		}
+	}
+	else								// When page called from virtual host server
+	{
+		$newurl = '/'.$containeralias;
+	}
+
+	if ($newurl)
+	{
+		header("Location: ".$newurl);
+		exit;
+	}
+	else
+	{
+		print "Error, page contains a reditect to the alias page '".$containeralias."' that does not exists in web site '".$website->ref."'";
+		exit;
+	}
+}
+
+
 /**
  * Clean an HTML page to report only content, so we can include it into another page.
  * It outputs content of file sanitized from html and body part.
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 7a5c3a60849..df799470b6d 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -41,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 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, $langs, $db, $mysoc, $user, $website.<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-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 access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+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, $langs, $db, $mysoc, $user, $website.<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:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&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 access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added
@@ -68,7 +68,7 @@ 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 / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
 OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabber from an external site
+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
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 156d3ef8229..55119ef418d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -210,6 +210,7 @@ if ($action == 'addsite')
 	if (! $error && ! preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF','alpha')))
 	{
 		$error++;
+		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("Ref")), null, 'errors');
 	}
 
@@ -330,6 +331,10 @@ if ($action == 'addcontainer')
 				{
 					$objectpage->title = $regtmp[1];
 				}
+				if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp))
+				{
+					if (empty($objectpage->title)) $objectpage->title = $regtmp[1];		// If title not found into <title>, we get it from <meta title>
+				}
 				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
 				{
 					$objectpage->description = $regtmp[1];
@@ -344,6 +349,8 @@ if ($action == 'addcontainer')
 					$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
 				}
 
+				$tmp['content'] = preg_replace('/\s*<meta name="generator"[^"]+content="([^"]+)"\s*\/?>/ims', '', $tmp['content']);
+
 				$objectpage->content = $tmp['content'];
 				$objectpage->content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $objectpage->content);
 				$objectpage->content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $objectpage->content);
@@ -359,11 +366,12 @@ if ($action == 'addcontainer')
 				$objectpage->htmlheader = preg_replace('/^.*<head(\s[^>]*)*>/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<\/head(\s[^>]*)*>.*$/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<base(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-				$objectpage->htmlheader = preg_replace('/<meta name="robot(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-				$objectpage->htmlheader = preg_replace('/<meta name="keywords(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-				$objectpage->htmlheader = preg_replace('/<meta name="title(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-				$objectpage->htmlheader = preg_replace('/<meta name="description(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
-				$objectpage->htmlheader = preg_replace('/<meta name="generator(\s[^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta http-equiv="content-type"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="robots"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="title"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="description"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="keywords"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<meta name="generator"([^>]*)*>\n*/ims', '', $objectpage->htmlheader);
 				//$objectpage->htmlheader = preg_replace('/<meta name="verify-v1[^>]*>\n*/ims', '', $objectpage->htmlheader);
 				//$objectpage->htmlheader = preg_replace('/<meta name="msvalidate.01[^>]*>\n*/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<title>[^<]*<\/title>\n*/ims', '', $objectpage->htmlheader);
@@ -432,7 +440,7 @@ if ($action == 'addcontainer')
 					//$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 					$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '', $tmp);
 				}
-				$objectpage->htmlheader = trim($tmp);
+				$objectpage->htmlheader = trim($tmp)."\n";
 
 
 				// Now loop to fetch CSS
@@ -503,11 +511,11 @@ if ($action == 'addcontainer')
 					}
 				}
 
-				$pagecsscontent.='</style>'."\n";
+				$pagecsscontent.='</style>';
 				//var_dump($pagecsscontent);
 
 				//print dol_escape_htmltag($tmp);exit;
-				$objectpage->htmlheader .= $pagecsscontent;
+				$objectpage->htmlheader .= trim($pagecsscontent)."\n";
 
 
 				// Now loop to fetch all images into page
@@ -543,18 +551,21 @@ if ($action == 'addcontainer')
 	{
 		if (empty($objectpage->pageurl))
 		{
+			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
 			$error++;
 			$action='createcontainer';
 		}
 		else if (! preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
 		{
+			$langs->load("errors");
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
 			$error++;
 			$action='createcontainer';
 		}
 		if (empty($objectpage->title))
 		{
+			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_TITLE")), null, 'errors');
 			$error++;
 			$action='createcontainer';
@@ -915,14 +926,16 @@ if ($action == 'setashome')
 if ($action == 'updatemeta')
 {
 	$db->begin();
+
 	$object->fetch(0, $website);
 
 	$objectpage->fk_website = $object->id;
 
 	// Check parameters
-	if (! preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
+	if (! preg_match('/^[a-z0-9\-\_]+$/i',  GETPOST('WEBSITE_PAGENAME', 'alpha')))
 	{
 		$error++;
+		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
 		$action='editmeta';
 	}
@@ -931,7 +944,7 @@ if ($action == 'updatemeta')
 	if ($res <= 0)
 	{
 		$error++;
-		dol_print_error($db, 'Page not found');
+		setEventMessages('Page not found '.$objectpage->error, $objectpage->errors, 'errors');
 	}
 
 	if (! $error)
@@ -944,7 +957,7 @@ if ($action == 'updatemeta')
 		$objectpage->description = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG', 'aZ09');
-		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
+		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
 
 		$res = $objectpage->update($user);
 		if (! $res > 0)
@@ -952,67 +965,70 @@ if ($action == 'updatemeta')
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 		}
+	}
 
-		if (! $error)
+	if (! $error)
+	{
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
+
+	if (! $error)
+	{
+		$filemaster=$pathofwebsite.'/master.inc.php';
+		$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
+		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+
+		dol_mkdir($pathofwebsite);
+
+
+		// Now generate the master.inc.php page
+		dol_syslog("We regenerate the master file (because we update meta)");
+		dol_delete_file($filemaster);
+
+		$mastercontent = '<?php'."\n";
+		$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
+		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+		//$mastercontent.= "include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';"."\n";
+		//$mastercontent.= '$website = new WebSite($db)'."\n";
+		$mastercontent.= '?>'."\n";
+		$result = file_put_contents($filemaster, $mastercontent);
+		if (! empty($conf->global->MAIN_UMASK))
+			@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+
+
+		// Now generate the alias.php page
+		if (! empty($fileoldalias))
 		{
-			$db->commit();
+			dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
+			dol_delete_file($fileoldalias);
+		}
 
-			$filemaster=$pathofwebsite.'/master.inc.php';
-			$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
-			$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+		// Save page alias
+		$result=dolSavePageAlias($filealias, $object, $objectpage);
+		if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 
-			dol_mkdir($pathofwebsite);
-
-
-			// Now generate the master.inc.php page
-			dol_syslog("We regenerate the master file (because we update meta)");
-			dol_delete_file($filemaster);
-
-			$mastercontent = '<?php'."\n";
-			$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
-			$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-			//$mastercontent.= "include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';"."\n";
-			//$mastercontent.= '$website = new WebSite($db)'."\n";
-			$mastercontent.= '?>'."\n";
-			$result = file_put_contents($filemaster, $mastercontent);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-
-			if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-
-
-			// Now generate the alias.php page
-			if (! empty($fileoldalias))
-			{
-				dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
-				dol_delete_file($fileoldalias);
-			}
-
-			// Save page alias
-			$result=dolSavePageAlias($filealias, $object, $objectpage);
-			if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
-
-			// Save page of content
-			$result=dolSavePageContent($filetpl, $object, $objectpage);
-			if ($result)
-			{
-				setEventMessages($langs->trans("Saved"), null, 'mesgs');
-				//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
-				//exit;
-			}
-			else
-			{
-				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
-				//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
-	   			//exit;
-			}
-
-			$action='preview';
+		// Save page of content
+		$result=dolSavePageContent($filetpl, $object, $objectpage);
+		if ($result)
+		{
+			setEventMessages($langs->trans("Saved"), null, 'mesgs');
+			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+			//exit;
 		}
 		else
 		{
-			$db->rollback();
+			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
+			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+   			//exit;
 		}
+
+		$action='preview';
 	}
 }
 

From 57b8df400806f726946cb4ccca55f44dac548dc8 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 19 Feb 2018 17:32:11 +0100
Subject: [PATCH 137/386] FIX: supplier credit notes: delete discount when
 deleting linked invoice/invoice line

---
 .../fourn/class/fournisseur.facture.class.php | 68 +++++++++++++++++--
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 4ebab7d0bc4..570966d8600 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -925,13 +925,14 @@ class FactureFournisseur extends CommonInvoice
     		}
     		
     		$facligne=new SupplierInvoiceLine($this->db);
-    		$facligne->fk_facture=$this->id;
+    		$facligne->fk_facture_fourn=$this->id;
     		$facligne->fk_remise_except=$remise->id;
     		$facligne->desc=$remise->description;   	// Description ligne
     		$facligne->vat_src_code=$remise->vat_src_code;
     		$facligne->tva_tx=$remise->tva_tx;
     		$facligne->subprice = -$remise->amount_ht;
     		$facligne->fk_product=0;					// Id produit predefini
+    		$facligne->product_type=0;
     		$facligne->qty=1;
     		$facligne->remise_percent=0;
     		$facligne->rang=-1;
@@ -1030,6 +1031,33 @@ class FactureFournisseur extends CommonInvoice
             // Fin appel triggers
         }
 
+		if (! $error) {
+			// If invoice was converted into a discount not yet consumed, we remove discount
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'societe_remise_except';
+			$sql .= ' WHERE fk_invoice_supplier_source = ' . $rowid;
+			$sql .= ' AND fk_invoice_supplier_line IS NULL';
+			$resql = $this->db->query($sql);
+
+			// If invoice has consumned discounts
+			$this->fetch_lines();
+			$list_rowid_det = array ();
+			foreach ($this->lines as $key => $invoiceline) {
+				$list_rowid_det[] = $invoiceline->rowid;
+			}
+
+			// Consumned discounts are freed
+			if (count($list_rowid_det)) {
+				$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'societe_remise_except';
+				$sql .= ' SET fk_invoice_supplier = NULL, fk_invoice_supplier_line = NULL';
+				$sql .= ' WHERE fk_invoice_supplier_line IN (' . join(',', $list_rowid_det) . ')';
+
+				dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+				if (! $this->db->query($sql)) {
+					$error ++;
+				}
+			}
+		}
+
         if (! $error)
         {
             $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
@@ -1049,8 +1077,6 @@ class FactureFournisseur extends CommonInvoice
             }
         }
 
-        // TODO Delete related discounts
-
 		if (! $error)
 		{
 			// Delete linked object
@@ -1769,6 +1795,22 @@ class FactureFournisseur extends CommonInvoice
 	        $rowid = $this->id;
         }
 
+		$this->db->begin();
+
+		// Libere remise liee a ligne de facture
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'societe_remise_except';
+		$sql .= ' SET fk_invoice_supplier_line = NULL';
+		$sql .= ' WHERE fk_invoice_supplier_line = ' . $rowid;
+
+		dol_syslog(get_class($this) . "::deleteline", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if (! $result)
+		{
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return - 2;
+		}
+
 	    $line = new SupplierInvoiceLine($this->db);
 
 	    if ($line->fetch($rowid) < 1) {
@@ -1778,12 +1820,24 @@ class FactureFournisseur extends CommonInvoice
 	    $res = $line->delete($notrigger);
 
 	    if ($res < 1) {
-		    $this->errors[] = $line->error;
+			$this->errors[] = $line->error;
+			$this->db->rollback();
+			return - 3;
 	    } else {
-		    $res = $this->update_price();
-	    }
+			$res = $this->update_price();
 
-    	return $res;
+			if ($res > 0)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return - 4;
+			}
+	    }
     }
 
 

From a66f7b8bc84428b5c285b46cb2d93d4779226558 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 19 Feb 2018 17:32:59 +0100
Subject: [PATCH 138/386] FIX: supplier credit notes: wrong discount filters

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index df5e78b8712..ab75eaa86de 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2989,11 +2989,11 @@ else if ($id > 0 || ! empty($ref))
 	$resteapayeraffiche = $resteapayer;
 
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
-		$filterabsolutediscount = "fk_facture IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		$filtercreditnote = "fk_facture IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$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 IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-		$filtercreditnote = "fk_facture IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+		$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 = $soc->getAvailableDiscounts('', $filterabsolutediscount);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ca29e7299a6..fa046a7a97c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2143,11 +2143,11 @@ else
 		$resteapayeraffiche = $resteapayer;
 
 		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
-			$filterabsolutediscount = "fk_invoice_supplier IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			$filterabsolutediscount = "fk_invoice_supplier IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
-			$filtercreditnote = "fk_invoice_supplier IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+			$filtercreditnote = "fk_invoice_supplier_source NOT IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
 		
 		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);

From a0078baeb6d3dbb8879a864974f612959be745bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 18:07:59 +0100
Subject: [PATCH 139/386] Fix webpage

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 55119ef418d..5afea1d8bb3 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -287,13 +287,16 @@ if ($action == 'addcontainer')
 		// and $urltograbdirrootwithoutslash is https://www.dolimed.com
 
 		// Check pageurl is not already used
-		$tmpwebsitepage = new WebsitePage($db);
-		$result = $tmpwebsitepage->fetch(0, $object->id, $pageurl);
-		if ($result > 0)
+		if ($pageurl)
 		{
-			setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
-			$error++;
-			$action='createcontainer';
+			$tmpwebsitepage = new WebsitePage($db);
+			$result = $tmpwebsitepage->fetch(0, $object->id, $pageurl);
+			if ($result > 0)
+			{
+				setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
+				$error++;
+				$action='createcontainer';
+			}
 		}
 
 		if (! $error)
@@ -2003,7 +2006,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $langs->trans('WEBSITE_PAGENAME');
 	print '</td><td>';
-	print '<input type="text" class="flat maxwidth300" name="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
 	print '</td></tr>';
 
 	print '<tr><td class="fieldrequired">';

From 576fda9c4a465c67f649261ff54bc0a5b24228aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 18:17:42 +0100
Subject: [PATCH 140/386] Sort

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 5afea1d8bb3..d2ee6f0c6c9 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1454,7 +1454,7 @@ if (count($object->records) > 0)
 	{
 		print '</div>';	// Close current websitebar to open a new one
 
-		$array=$objectpage->fetchAll($object->id);
+		$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);
 

From 1ee128ff13b478252b2c2f0a030af78fdb994e77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 19:47:42 +0100
Subject: [PATCH 141/386] NEW Add type of website container/page into
 dictionary

---
 htdocs/admin/dict.php                         | 36 +++++------
 htdocs/core/class/html.formother.class.php    |  2 +-
 htdocs/core/class/html.formwebsite.class.php  | 63 +++++++++++++++++++
 .../mysql/data/llx_c_type_container.sql       | 37 +++++++++++
 .../install/mysql/migration/7.0.0-8.0.0.sql   | 16 +++++
 .../mysql/tables/llx_c_type_container.key.sql | 21 +++++++
 .../mysql/tables/llx_c_type_container.sql     | 36 +++++++++++
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/website/index.php                      |  5 +-
 9 files changed, 193 insertions(+), 24 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_c_type_container.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_type_container.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_type_container.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 438c7cd5227..fbb0b5f38c5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -93,7 +93,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.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,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,26,0,);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,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,26,0,25,0);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -121,7 +121,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
 $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp";
 $tabname[24]= MAIN_DB_PREFIX."c_type_resource";
-//$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+$tabname[25]= MAIN_DB_PREFIX."c_type_container";
 $tabname[26]= MAIN_DB_PREFIX."c_units";
 $tabname[27]= MAIN_DB_PREFIX."c_stcomm";
 $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
@@ -160,7 +160,7 @@ $tablib[21]= "DictionaryAvailability";
 $tablib[22]= "DictionarySource";
 $tablib[23]= "DictionaryRevenueStamp";
 $tablib[24]= "DictionaryResourceType";
-//$tablib[25]= "DictionaryEMailTemplates";
+$tablib[25]= "DictionaryTypeOfContainer";
 $tablib[26]= "DictionaryUnits";
 $tablib[27]= "DictionaryProspectStatus";
 $tablib[28]= "DictionaryHolidayTypes";
@@ -199,7 +199,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $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";
-//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
+$tabsql[25]= "SELECT rowid   as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity IN (".getEntity('c_type_container').")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
@@ -237,8 +237,8 @@ $tabsqlsort[20]="code ASC, libelle ASC";
 $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
 $tabsqlsort[23]="country ASC, taux ASC";
-$tabsqlsort[24]="code ASC,label ASC";
-//$tabsqlsort[25]="label ASC";
+$tabsqlsort[24]="code ASC, label ASC";
+$tabsqlsort[25]="t.module ASC, t.code ASC, t.label ASC";
 $tabsqlsort[26]="code ASC";
 $tabsqlsort[27]="code ASC";
 $tabsqlsort[28]="country ASC, code ASC";
@@ -277,7 +277,7 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
-//$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
+$tabfield[25]= "code,label";
 $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
@@ -316,7 +316,7 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
-//$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
+$tabfieldvalue[25]= "code,label";
 $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";
@@ -355,7 +355,7 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
-//$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
+$tabfieldinsert[25]= "code,label";
 $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,affect,delay,newbymonth,fk_country";
@@ -396,7 +396,7 @@ $tabrowid[21]= "rowid";
 $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
 $tabrowid[24]= "";
-//$tabrowid[25]= "";
+$tabrowid[25]= "";
 $tabrowid[26]= "";
 $tabrowid[27]= "id";
 $tabrowid[28]= "";
@@ -435,7 +435,7 @@ $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
 $tabcond[23]= true;
 $tabcond[24]= ! empty($conf->resource->enabled);
-//$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
+$tabcond[25]= ! empty($conf->website->enabled);
 $tabcond[26]= ! empty($conf->product->enabled);
 $tabcond[27]= ! empty($conf->societe->enabled);
 $tabcond[28]= ! empty($conf->holiday->enabled);
@@ -474,7 +474,7 @@ $tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array('revenuestamp_type'=>'FixedOfPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-//$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
 $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
@@ -513,7 +513,7 @@ $tabfieldcheck[21] = array();
 $tabfieldcheck[22] = array();
 $tabfieldcheck[23] = array();
 $tabfieldcheck[24] = array();
-//$tabfieldcheck[25] = array();
+$tabfieldcheck[25] = array();
 $tabfieldcheck[26] = array();
 $tabfieldcheck[27] = array();
 $tabfieldcheck[28] = array();
@@ -1072,8 +1072,7 @@ if ($id)
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); $class='width100'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
-            	if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
-            	else $valuetoshow=$langs->trans("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,''));
@@ -1298,12 +1297,7 @@ if ($id)
             if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
             if ($fieldlist[$field]=='position')        { $align='right'; }
-            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
-            {
-                //if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
-                //else $valuetoshow=$langs->trans("Label");
-                $valuetoshow=$langs->trans("Label");
-            }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
             if ($fieldlist[$field]=='libelle_facture') {
                 //$valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
                 $valuetoshow=$langs->trans("LabelOnDocuments");
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index af9bd644caf..3339b2b054e 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1184,7 +1184,7 @@ class FormOther
 
 
     /**
-     *  Return a HTML select list of bank accounts
+     *  Return a HTML select list of a dictionary
      *
      *  @param  string	$htmlname          	Name of select zone
      *  @param	string	$dictionarytable	Dictionary table
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 6981ecc343f..4f92b2e9449 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -95,4 +95,67 @@ class FormWebsite
         return $out;
     }
 
+
+    /**
+     *  Return a HTML select list of a 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
+     */
+    function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    {
+    	global $langs, $conf, $user;
+
+    	$langs->load("admin");
+
+    	$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";
+
+    	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);
+    	}
+    }
+
 }
diff --git a/htdocs/install/mysql/data/llx_c_type_container.sql b/htdocs/install/mysql/data/llx_c_type_container.sql
new file mode 100644
index 00000000000..1e915412a12
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_type_container.sql
@@ -0,0 +1,37 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2004-2009 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-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@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
+-- 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.
+--
+
+--
+-- Type of website page/container
+--
+
+insert into llx_c_type_container (code,label,module,active) values ('page',     'Page',     'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('banner',   'Banner',   'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('blogpost', 'BlogPost', 'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('other',    'Other',    'system', 1);
+
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 9bfe0bd2915..014f2d5eeff 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
@@ -35,3 +35,19 @@ ALTER TABLE llx_projet ADD COLUMN bill_time integer DEFAULT 0;
 ALTER TABLE llx_societe ADD COLUMN order_min_amount double(24,8) DEFAULT NULL AFTER outstanding_limit;
 ALTER TABLE llx_societe ADD COLUMN supplier_order_min_amount double(24,8) DEFAULT NULL AFTER order_min_amount;
 
+
+create table llx_c_type_container
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  code          varchar(32) NOT NULL,
+  entity		integer	DEFAULT 1 NOT NULL,	-- multi company id
+  label 	    varchar(64)	NOT NULL,
+  module     	varchar(32) NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_type_container ADD UNIQUE INDEX uk_c_type_container_id (code, entity);
+
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_c_type_container.key.sql b/htdocs/install/mysql/tables/llx_c_type_container.key.sql
new file mode 100644
index 00000000000..7a81f352f63
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_type_container.key.sql
@@ -0,0 +1,21 @@
+-- ========================================================================
+-- Copyright (C) 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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+
+ALTER TABLE llx_c_type_container ADD UNIQUE INDEX uk_c_type_container_id (code, entity);
+
diff --git a/htdocs/install/mysql/tables/llx_c_type_container.sql b/htdocs/install/mysql/tables/llx_c_type_container.sql
new file mode 100644
index 00000000000..33be89a67f4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_type_container.sql
@@ -0,0 +1,36 @@
+-- ========================================================================
+-- Copyright (C) 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 <http://www.gnu.org/licenses/>.
+--
+-- Defini les types de contact d'un element sert de reference pour
+-- la table llx_element_contact
+--
+-- element est le nom de la table utilisant le type de contact.
+-- i.e. contact, facture, projet, societe (sans le llx_ devant).
+-- Libelle est un texte decrivant le type de contact.
+-- active precise si cette valeur est 'active' ou 'archive'.
+--
+-- ========================================================================
+
+create table llx_c_type_container
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  code          varchar(32) NOT NULL,
+  entity		integer	DEFAULT 1 NOT NULL,	-- multi company id
+  label 	    varchar(64)	NOT NULL,
+  module     	varchar(32) NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 537da9bdb0b..91a503ba6a6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -885,6 +885,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
 DictionaryPaymentConditions=Payment terms
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Paper formats
 DictionaryFormatCards=Cards formats
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d2ee6f0c6c9..77edf7728c3 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formwebsite.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
@@ -1245,6 +1246,7 @@ if (GETPOST('exportsite','alpha'))
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 $formwebsite = new FormWebsite($db);
+$formother = new FormOther($db);
 
 $help_url='';
 
@@ -1999,8 +2001,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
-	$arrayoftype=array('page'=>$langs->trans("Page"), 'banner'=>$langs->trans("Banner"), 'blogpost'=>$langs->trans("BlogPost"), 'other'=>$langs->trans("Other"));
-	print $form->selectarray('WEBSITE_TYPE_CONTAINER', $arrayoftype, $type_container);
+	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER')?GETPOST('WEBSITE_TYPE_CONTAINER'):'page'));
 	print '</td></tr>';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';

From 31d0679876fc3b1952b00922cd19d3b0c7f724f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 19:52:51 +0100
Subject: [PATCH 142/386] Add data

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

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 014f2d5eeff..a0ec8f58e37 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
@@ -48,6 +48,11 @@ create table llx_c_type_container
 
 ALTER TABLE llx_c_type_container ADD UNIQUE INDEX uk_c_type_container_id (code, entity);
 
+insert into llx_c_type_container (code,label,module,active) values ('page',     'Page',     'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('banner',   'Banner',   'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('blogpost', 'BlogPost', 'system', 1);
+insert into llx_c_type_container (code,label,module,active) values ('other',    'Other',    'system', 1);
+
 
 
 

From 3eef9fd57a300540b1eca48a275e4e88cade3906 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 21:31:03 +0100
Subject: [PATCH 143/386] Fix doc

---
 htdocs/langs/en_US/website.lang |  7 +++---
 htdocs/website/index.php        | 40 +++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index df799470b6d..035d0661c95 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -34,9 +34,10 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on <strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.<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=Preview %s in a new tab.<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.  
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+CheckVirtualHostPerms=Check also that virtual host has read access on files into<br><strong>%s</strong>
+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
 SyntaxHelp=Help on specific syntax tips
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 77edf7728c3..1b4bd000e38 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1413,29 +1413,37 @@ if (count($object->records) > 0)
 
 	if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
 	{
-		print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/website/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
-		print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
+		$urlext=$virtualurl;
+		$urlint=$urlwithroot.'/public/website/index.php?website='.$website;
+
+		$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+		print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/website/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($htmltext).'">';
+		print $form->textwithpicto('', $htmltext, 1, 'preview');
 		print '</a>';
 
 		print '<div class="websiteinputurl" id="websiteinputurl">';
 		print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
 		//print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
-		$htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
+		$htmltext =$langs->trans("SetHereVirtualHost", $dataroot);
+		$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
 		print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
 		print '</div>';
 
-		$urlext=$virtualurl;
-		$urlint=$urlwithroot.'/public/website/index.php?website='.$website;
 		if (empty($object->fk_default_home))
 		{
+			$htmltext = '<span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br>'.$langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
+			$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
 			print '<span class="websitebuttonsitepreview websitebuttonsitepreviewdisabled cursornotallowed" id="previewsiteextdisabled" href="" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
-			print $form->textwithpicto('', '<span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br>'.$langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
+			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</span>';
 		}
 		else
 		{
+			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
+			$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
 			print '<a class="websitebuttonsitepreview'.($urlext?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
-			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
+			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</a>';
 		}
 	}
@@ -1585,8 +1593,11 @@ if (count($object->records) > 0)
 			$realpage=$urlwithroot.'/public/website/index.php?website='.$website.'&pageref='.$websitepage->pageurl;
 			$pagealias = $websitepage->pageurl;
 
-			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
-			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview');
+			$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+
+			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($htmltext).'">';
+			print $form->textwithpicto('', $htmltext, 1, 'preview');
 			print '</a>';       // View page in new Tab
 
 			print '<div class="websiteinputurl" id="websiteinputpage">';
@@ -1597,8 +1608,11 @@ if (count($object->records) > 0)
 
 			$urlext=$virtualurl.'/'.$pagealias.'.php';
 			$urlint=$urlwithroot.'/public/website/index.php?website='.$website;
-			print '<a class="websitebuttonsitepreview'.($virtualurl?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
-			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $virtualurl?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
+
+			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $virtualurl?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
+
+			print '<a class="websitebuttonsitepreview'.($virtualurl?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($htmltext).'">';
+			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</a>';
 			//print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
 
@@ -1884,7 +1898,9 @@ if ($action == 'createsite')
 	print '</td></tr>';
 
 	print '<tr><td>';
-	print $form->textwithpicto($langs->trans('Virtualhost'), $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>'), 1, 'help', '', 0, 2, 'tooltipvirtual');
+	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
+	$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'tooltipvirtual');
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" name="WEBSITE_DESCRIPTION" value="'.dol_escape_htmltag($sitedesc).'">';
 	print '</td></tr>';

From bfbe03d55d9f7e736bdb099f23e38944e14b93f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 21:57:30 +0100
Subject: [PATCH 144/386] Fix tooltip doc

---
 htdocs/langs/en_US/website.lang |  4 +++-
 htdocs/website/index.php        | 23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 035d0661c95..6e67062b859 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -35,7 +35,9 @@ SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-CheckVirtualHostPerms=Check also that virtual host has read access on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that virtual host has <strong>%s</strong> on files into<br><strong>%s</strong>
+ReadPerm=Read permission
+WritePerm=Write permission
 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
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1b4bd000e38..84d2c19b9de 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1417,7 +1417,8 @@ if (count($object->records) > 0)
 		$urlint=$urlwithroot.'/public/website/index.php?website='.$website;
 
 		$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot);
-		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
 		print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/website/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($htmltext).'">';
 		print $form->textwithpicto('', $htmltext, 1, 'preview');
 		print '</a>';
@@ -1426,14 +1427,18 @@ if (count($object->records) > 0)
 		print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
 		//print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
 		$htmltext =$langs->trans("SetHereVirtualHost", $dataroot);
-		$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+		$htmltext.='<br>';
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
 		print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
 		print '</div>';
 
 		if (empty($object->fk_default_home))
 		{
 			$htmltext = '<span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br>'.$langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
-			$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>';
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
 			print '<span class="websitebuttonsitepreview websitebuttonsitepreviewdisabled cursornotallowed" id="previewsiteextdisabled" href="" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</span>';
@@ -1441,7 +1446,9 @@ if (count($object->records) > 0)
 		else
 		{
 			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
-			$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>';
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
 			print '<a class="websitebuttonsitepreview'.($urlext?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</a>';
@@ -1594,7 +1601,8 @@ if (count($object->records) > 0)
 			$pagealias = $websitepage->pageurl;
 
 			$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot);
-			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
 
 			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($htmltext).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview');
@@ -1899,7 +1907,10 @@ if ($action == 'createsite')
 
 	print '<tr><td>';
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
-	$htmltext.='<br><br>'.$langs->trans("CheckVirtualHostPerms", DOL_DOCUMENT_ROOT);
+	$htmltext.='<br>';
+	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'tooltipvirtual');
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" name="WEBSITE_DESCRIPTION" value="'.dol_escape_htmltag($sitedesc).'">';

From 1f412bd1d487ad7e22041ed75a3b2778b7eb0b24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 22:10:15 +0100
Subject: [PATCH 145/386] Fix infinite redirects

---
 htdocs/core/lib/website.lib.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index dbd3acd794a..c8e59c4e6af 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -184,7 +184,23 @@ function redirectToContainer($containeralias)
 		unset($tmpwebsitepage);
 		if ($result > 0)
 		{
-			$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containeralias, $_SERVER["REQUEST_URI"]);
+			$currenturi = $_SERVER["REQUEST_URI"];
+			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
+			{
+				if ($regtmp[0] == $containeralias)
+				{
+					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containeralias."' in web site '".$website->ref."'";
+					exit;
+				}
+				else
+				{
+					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containeralias, $currenturi);
+				}
+			}
+			else
+			{
+				$newurl = $currenturi.'&pageref='.urlencode($containeralias);
+			}
 		}
 	}
 	else								// When page called from virtual host server
@@ -199,7 +215,7 @@ function redirectToContainer($containeralias)
 	}
 	else
 	{
-		print "Error, page contains a reditect to the alias page '".$containeralias."' that does not exists in web site '".$website->ref."'";
+		print "Error, page contains a redirect to the alias page '".$containeralias."' that does not exists in web site '".$website->ref."'";
 		exit;
 	}
 }

From 1cb58a308c0de687982e71f16a9f789dba02150f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 22:25:12 +0100
Subject: [PATCH 146/386] Fix redirect

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index c8e59c4e6af..b4475d5f907 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -205,7 +205,7 @@ function redirectToContainer($containeralias)
 	}
 	else								// When page called from virtual host server
 	{
-		$newurl = '/'.$containeralias;
+		$newurl = '/'.$containeralias.'.php';
 	}
 
 	if ($newurl)

From 5ada5c18f91a2a287019229da81d29594e6363bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 23:19:54 +0100
Subject: [PATCH 147/386] url in generator

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index b4475d5f907..ac1016af7b8 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -515,7 +515,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 	$tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
 	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
 	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.'" />'."\n";
+	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
 	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
 	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?websiteid='.$object->id.'" type="text/css" />'."\n";
 	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";

From 9230c6757b7bdcc233aceecfc3c793ceaff925b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 23:31:35 +0100
Subject: [PATCH 148/386] Fix error when removing dir with some subdirs

---
 htdocs/ecm/dir_card.php     | 27 ++++++++++++++++++---------
 htdocs/langs/en_US/ecm.lang |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index e313787b01f..e2b031305d9 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -160,23 +160,28 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	{
 		// Fetch was already done
 		$result=$ecmdir->delete($user);
+		if ($result <= 0)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans($ecmdir->error,$ecmdir->label), null, 'errors');
+		}
 	}
 	else
 	{
-		$resbool = dol_delete_dir($upload_dir);
+		$resbool = dol_delete_dir($upload_dir, 1);
 		if ($resbool) $result = 1;
-		else $result = 0;
+		else
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
+			$result = 0;
+		}
 	}
 	if ($result > 0)
 	{
 		header("Location: ".$backtourl);
 		exit;
 	}
-	else
-	{
-		$langs->load('errors');
-		setEventMessages($langs->trans($ecmdir->error,$ecmdir->label), null, 'errors');
-	}
 }
 
 // Update dirname or description
@@ -281,6 +286,7 @@ if ($module == 'ecm')
 llxHeader();
 
 // Built the file List
+$filearrayall=dol_dir_list($upload_dir,"all",0,'','',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 $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)
@@ -469,7 +475,7 @@ if ($action != 'edit' && $action != 'delete')
 		print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
-	if (count($filearray) == 0)
+	if (count($filearrayall) == 0)
 	{
 		if ($permtoadd)
 		{
@@ -482,7 +488,10 @@ if ($action != 'edit' && $action != 'delete')
 	}
 	else
 	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("CannotRemoveDirectoryContainsFiles").'">'.$langs->trans('Delete').'</a>';
+		if (count($filearray) > 0)
+			print '<a class="butActionRefused" href="#" title="'.$langs->trans("CannotRemoveDirectoryContainsFiles").'">'.$langs->trans('Delete').'</a>';
+		else
+			print '<a class="butActionRefused" href="#" title="'.$langs->trans("CannotRemoveDirectoryContainsFilesOrDirs").'">'.$langs->trans('Delete').'</a>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index fe5600004ed..588044f18df 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -39,6 +39,7 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
 CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
 ECMFileManager=File manager
 ECMSelectASection=Select a directory in the tree...

From 5f51af505f698e4bb5a75d1e3fd4be1c2e9a4af8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2018 23:52:45 +0100
Subject: [PATCH 149/386] NEW Can delete dir content in media and ECM module
 recursively

---
 htdocs/core/class/html.form.class.php   |  2 +-
 htdocs/ecm/class/ecmdirectory.class.php | 18 ++++++++++----
 htdocs/ecm/dir_card.php                 | 33 +++++++++++++++++++------
 htdocs/langs/en_US/other.lang           |  2 ++
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4e8f67d6552..ba0ea7a37c2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3652,7 +3652,7 @@ class Form
 						$more.='<tr>';
 						$more.='<td>'.$input['label'].' </td><td align="left">';
 						$more.='<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
-						if (! is_bool($input['value']) && $input['value'] != 'false') $more.=' checked';
+						if (! is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more.=' checked';
 						if (is_bool($input['value']) && $input['value']) $more.=' checked';
 						if (isset($input['disabled'])) $more.=' disabled';
 						$more.=' /></td>';
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 019a749b6ef..a3669f909e9 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -325,11 +325,12 @@ class EcmDirectory // extends CommonObject
 	/**
 	 * 	Delete object on database and/or on disk
 	 *
-	 *	@param	User	$user		User that delete
-	 *  @param	string		$mode		'all'=delete all, 'databaseonly'=only database entry, 'fileonly' (not implemented)
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@param	User	$user					User that delete
+	 *  @param	string	$mode					'all'=delete all, 'databaseonly'=only database entry, 'fileonly' (not implemented)
+	 *  @param	int		$deletedirrecursive		1=Agree to delete content recursiveley (otherwise an error will be returned when trying to delete)
+	 *	@return	int								<0 if KO, >0 if OK
 	 */
-	function delete($user, $mode='all')
+	function delete($user, $mode='all', $deletedirrecursive=0)
 	{
 		global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -368,7 +369,14 @@ class EcmDirectory // extends CommonObject
 		if ($mode != 'databaseonly')
 		{
 			$file = $conf->ecm->dir_output . "/" . $relativepath;
-			$result=@dol_delete_dir($file);
+			if ($deletedirrecursive)
+			{
+				$result=@dol_delete_dir_recursive($file, 0, 0);
+			}
+			else
+			{
+				$result=@dol_delete_dir($file, 0);
+			}
 		}
 
 		if ($result || ! @is_dir(dol_osencode($file)))
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index e2b031305d9..14f0ee18e8c 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -156,10 +156,12 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	$backtourl = DOL_URL_ROOT."/ecm/index.php";
 	if ($module == 'medias') $backtourl = DOL_URL_ROOT."/website/index.php?file_manager=1";
 
+	$deletedirrecursive = (GETPOST('deletedirrecursive','alpha') == 'on' ? 1 : 0);
+
 	if ($module == 'ecm')
 	{
 		// Fetch was already done
-		$result=$ecmdir->delete($user);
+		$result=$ecmdir->delete($user, 'all', $deletedirrecursive);
 		if ($result <= 0)
 		{
 			$langs->load('errors');
@@ -168,7 +170,14 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	}
 	else
 	{
-		$resbool = dol_delete_dir($upload_dir, 1);
+		if ($deletedirrecursive)
+		{
+			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
+		}
+		else
+		{
+			$resbool = dol_delete_dir($upload_dir, 1);
+		}
 		if ($resbool) $result = 1;
 		else
 		{
@@ -475,8 +484,8 @@ if ($action != 'edit' && $action != 'delete')
 		print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
-	if (count($filearrayall) == 0)
-	{
+	//if (count($filearrayall) == 0)
+	//{
 		if ($permtoadd)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir'.($module?'&module='.$module:'').'&section='.$section.'">'.$langs->trans('Delete').'</a>';
@@ -485,14 +494,14 @@ if ($action != 'edit' && $action != 'delete')
 		{
 			print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 		}
-	}
+	/*}
 	else
 	{
 		if (count($filearray) > 0)
 			print '<a class="butActionRefused" href="#" title="'.$langs->trans("CannotRemoveDirectoryContainsFiles").'">'.$langs->trans('Delete').'</a>';
 		else
 			print '<a class="butActionRefused" href="#" title="'.$langs->trans("CannotRemoveDirectoryContainsFilesOrDirs").'">'.$langs->trans('Delete').'</a>';
-	}
+	}*/
 	print '</div>';
 }
 
@@ -506,7 +515,17 @@ if ($action == 'delete')
 if ($action == 'delete_dir')
 {
 	$relativepathwithoutslash=preg_replace('/[\/]$/','',$relativepath);
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section','alpha').($module?'&module='.$module:''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$relativepathwithoutslash), 'confirm_deletedir', '', 1, 1);
+
+	//Form to close proposal (signed or not)
+	if (count($filearrayall) > 0)
+	{
+		$langs->load("other");
+		$formquestion = array(
+			array('type' => 'checkbox', 'name' => 'deletedirrecursive', 'label' => $langs->trans("ContentOfDirectoryIsNotEmpty").'<br>'.$langs->trans("DeleteAlsoContentRecursively"),'value' => '0')				// Field to complete private note (not replace)
+		);
+	}
+
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section','alpha').($module?'&module='.$module:''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
 }
 
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 1585504479e..c4cb693716d 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date

From 6ef3b330e45b1370566889b1874e997f7033522d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 00:04:43 +0100
Subject: [PATCH 150/386] Fix output dir of grab

---
 htdocs/core/lib/website.lib.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index ac1016af7b8..b4c542edf9c 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -289,11 +289,14 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 
 	$error=0;
 
+	dol_syslog("Call getAllImages with grabimagesinto=".$grabimagesinto);
+
 	$alreadygrabbed=array();
 
 	if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
 	$urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
+	// Search X in "img...src=X"
 	preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $tmp, $regs);
 
 	foreach ($regs[0] as $key => $val)
@@ -388,16 +391,20 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+
+		$dirforimages = '/'.$objectpage->pageurl;
+		if ($grabimagesinto == 'root') $dirforimages='';
+
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 
 		if (preg_match('/^http/', $regs[2][$key]))
 		{
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 		}
 
-		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);

From 0a00bdcb7319d929eb54e5d7aa5f81a4fe663147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 05:45:42 +0100
Subject: [PATCH 151/386] FIX Search criteria on vat

---
 htdocs/accountancy/customer/lines.php      | 43 ++++++++-----------
 htdocs/accountancy/expensereport/lines.php | 48 +++++++++------------
 htdocs/accountancy/supplier/lines.php      | 50 +++++++++-------------
 3 files changed, 58 insertions(+), 83 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 2d197de8c9f..c4c3d03ee97 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -113,7 +113,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
-	$sql1 .= " SET l.fk_code_ventilation=" . $account_parent;
+	$sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent','int');
 	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
 
 	dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1);
@@ -204,7 +204,7 @@ if (strlen(trim($search_account))) {
 	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("fd.tva_tx", $search_vat);
+	$sql .= natural_search("fd.tva_tx", price2num($search_vat), 1);
 }
 if ($search_month > 0)
 {
@@ -223,7 +223,7 @@ if (strlen(trim($search_country))) {
 	$sql .= natural_search("co.label", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
-	$sql .= natural_search("s.tva_intra", $search_tva_intra);
+	$sql .= natural_search("s.tva_intra", $search_tvaintra);
 }
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
@@ -245,28 +245,19 @@ if ($result) {
 	$i = 0;
 
 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_invoice)
-		$param .= "&search_invoice=" . $search_invoice;
-	if ($search_ref)
-		$param .= "&search_ref=" . $search_ref;
-	if ($search_label)
-		$param .= "&search_label=" . $search_label;
-	if ($search_desc)
-		$param .= "&search_desc=" . $search_desc;
-	if ($search_account)
-		$param .= "&search_account=" . $search_account;
-	if ($search_vat)
-		$param .= "&search_vat=" . $search_vat;
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_country)
-		$param .= "&search_country=" . $search_country;
-	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;
-
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
+	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
+	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
+	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
+	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
+	if ($search_country)  	$param .= "&search_country=" . urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -370,7 +361,7 @@ if ($result) {
 		print '</a>';
 		print '</td>';
 
-		print '<td align="center">' . $objp->country .'</td>';
+		print '<td>' . $objp->country .'</td>';
 
 		print '<td>' . $objp->tva_intra . '</td>';
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index df039bf4093..5c7347403d9 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -61,10 +61,10 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if ($page < 0) $page = 0;
-$offset = $conf->liste_limit * $page;
+if (empty($page) || $page < 0) $page = 0;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+$offset = $limit * $page;
 if (! $sortfield)
 	$sortfield = "erd.date, erd.rowid";
 if (! $sortorder) {
@@ -170,19 +170,19 @@ if (strlen(trim($search_expensereport))) {
 	$sql .= " AND er.ref like '%" . $search_expensereport . "%'";
 }
 if (strlen(trim($search_label))) {
-	$sql .= " AND f.label like '%" . $search_label . "%'";
+	$sql .= natural_search("f.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-	$sql .= " AND er.comments like '%" . $search_desc . "%'";
+	$sql .= natural_search("er.comments", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-	$sql .= " AND erd.total_ht like '%" . $search_amount . "%'";
+	$sql .= natural_search("erd.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
+	$sql .= natural_search("erd.tva_tx", price2num($search_vat), 1);
 }
 if ($search_month > 0)
 {
@@ -219,25 +219,18 @@ if ($result) {
 	$i = 0;
 
 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_expensereport)
-		$param .= "&search_expensereport=" . $search_expensereport;
-	if ($search_label)
-		$param .= "&search_label=" . $search_label;
-	if ($search_desc)
-		$param .= "&search_desc=" . $search_desc;
-	if ($search_account)
-		$param .= "&search_account=" . $search_account;
-	if ($search_vat)
-		$param .= "&search_vat=" . $search_vat;
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_country)
-		$param .= "&search_country=" . $search_country;
-	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($search_expensereport) $param .= "&search_expensereport=" . urlencode($search_expensereport);
+	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
+	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
+	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
+	if ($search_country)	$param .= "&search_country=" . urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -297,7 +290,6 @@ if ($result) {
 
 	$expensereport_static = new ExpenseReport($db);
 
-	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
@@ -347,7 +339,7 @@ if ($result) {
 
 	print '</form>';
 } else {
-	print $db->error();
+	print $db->lasterror();
 }
 
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index b8b1ed9206d..af9d82e5056 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -65,8 +65,8 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if ($page < 0) $page = 0;
-$offset = $conf->liste_limit * $page;
+if (empty($page) || $page < 0) $page = 0;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortfield)
@@ -195,10 +195,10 @@ if (strlen(trim($search_amount))) {
 	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= natural_search("aa.account_number", $search_account, 1);
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("l.tva_tx", $search_vat, 1);
+	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
 if ($search_month > 0)
 {
@@ -214,10 +214,10 @@ else if ($search_year > 0)
 	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
 if (strlen(trim($search_country))) {
-	$sql .= " AND (co.label like'" . $search_country . "%')";
+	$sql .= natural_search("co.label", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
-	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
+	$sql .= natural_search("s.tva_intra", $search_tvaintra);
 }
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
@@ -241,27 +241,19 @@ if ($result) {
 	$i = 0;
 
 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_invoice)
-		$param .= "&search_invoice=" . $search_invoice;
-	if ($search_ref)
-		$param .= "&search_ref=" . $search_ref;
-	if ($search_label)
-		$param .= "&search_label=" . $search_label;
-	if ($search_desc)
-		$param .= "&search_desc=" . $search_desc;
-	if ($search_account)
-		$param .= "&search_account=" . $search_account;
-	if ($search_vat)
-		$param .= "&search_vat=" . $search_vat;
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_country)
-		$param .= "&search_country=" . $search_country;
-	if ($search_tvaintra)
-		$param .= "&search_tvaintra=" . $search_tvaintra;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
+	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
+	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
+	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
+	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
+	if ($search_country) 	$param .= "&search_country=" . urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -277,7 +269,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
 
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account($account_parent, 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 
 	$moreforfilter = '';
@@ -389,7 +381,7 @@ if ($result) {
 
     print '</form>';
 } else {
-	print $db->error();
+	print $db->lasterror();
 }
 
 

From eb0073c33015835bf6dffc5e43fa07feeb29e0ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 05:53:53 +0100
Subject: [PATCH 152/386] Fix upgrade missing steps

---
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql | 11 +++++++++++
 htdocs/install/upgrade2.php                    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 4ffe73ac6ea..6e9e480cdb0 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
@@ -684,3 +684,14 @@ ALTER TABLE llx_resource ADD fk_country integer DEFAULT NULL;
 ALTER TABLE llx_resource ADD INDEX idx_resource_fk_country (fk_country);
 ALTER TABLE llx_resource ADD CONSTRAINT fk_resource_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_country (rowid);
 
+
+create table llx_facture_rec_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (fk_object);
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index d20357dd20c..560bf3d2593 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3977,7 +3977,7 @@ function migrate_reset_blocked_log($db,$langs,$conf)
 					}
 					else
 					{
-						print ' - '.$langs->trans('AlreadyInV7');
+						print ' - '.$langs->trans('AlreadyInV7').'<br>';
 					}
 				}
 				else

From bcb39e57fb45ad0a85875e4bcae6eba18cef1799 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 20 Feb 2018 10:08:55 +0100
Subject: [PATCH 153/386] FIX: supplier credit notes: wrong credit note filter

---
 htdocs/fourn/facture/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index fa046a7a97c..d9fcf57a4a6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2147,7 +2147,7 @@ else
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
-			$filtercreditnote = "fk_invoice_supplier_source NOT IS NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
 		
 		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
@@ -2426,6 +2426,7 @@ else
 			print $langs->trans("CompanyHasNoRelativeDiscount");
 		// print ' ('.$addrelativediscount.')';
 */
+
 		// Is there is commercial discount or down payment available ?
 		if ($absolute_discount > 0) {
 //			print '. ';

From 17c210ca98481134b7d9ac3b45e35d26224c673d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 11:16:13 +0100
Subject: [PATCH 154/386] Normalize links href to Dolibarr internal naming

---
 htdocs/website/index.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 84d2c19b9de..959529eb44e 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -527,6 +527,11 @@ if ($action == 'addcontainer')
 
 				getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1, $grabimages, $grabimagesinto);
 
+				// Normalize links href to Dolibarr internal naming
+				$tmp = preg_replace('/a href="\/([^\/"]+)\/([^\/"]+)"/', 'a href="/\1-\2.php"', $tmp);
+				$tmp = preg_replace('/a href="\/([^\/"]+)\/([^\/"]+)\/([^\/"]+)"/', 'a href="/\1-\2-\3.php"', $tmp);
+				$tmp = preg_replace('/a href="\/([^\/"]+)\/([^\/"]+)\/([^\/"]+)\/([^\/"]+)"/', 'a href="/\1-\2-\3-\4.php"', $tmp);
+
 				//print dol_escape_htmltag($tmp);exit;
 				$objectpage->content = $tmp;
 

From a4f2a2532de1a07670e6b1662b062deb353a92ca Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 20 Feb 2018 11:41:57 +0100
Subject: [PATCH 155/386] FIX: supplier credit notes: use MAIN_FEATURES_LEVEL

---
 htdocs/fourn/commande/card.php    |  77 ++++++-----
 htdocs/fourn/facture/card.php     | 217 +++++++++++++++---------------
 htdocs/supplier_proposal/card.php |  81 +++++------
 3 files changed, 193 insertions(+), 182 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index c65b7d6cf60..6cd17690c24 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1477,7 +1477,7 @@ if ($action=='create')
 	}
 	print '</td>';
 
-	if ($societe->id > 0)
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $societe->id > 0)
 	{
 /* // TODO handle supplier relative discount
 		// Discounts for third party
@@ -1881,46 +1881,49 @@ elseif (! empty($object->id))
 	print '<td>'.$author->getNomUrl(1, '', 0, 0, 0).'</td>';
 	print '</tr>';
 
-	// Relative and absolute discounts
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	} else {
-		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
-	}
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
 
-	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-
-	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-/* // TODO handle supplier relative discount
-	if ($societe->remise_percent)
-		print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
-	else
-		print $langs->trans("CompanyHasNoRelativeDiscount");
-	print '. ';
-*/
-	$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
-	$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
-	$absolute_discount = price2num($absolute_discount, 'MT');
-	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-	if ($absolute_discount) {
-		if ($object->statut > CommandeFournisseur::STATUS_DRAFT) {
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+		// Relative and absolute discounts
+		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			// Remise dispo de type remise fixe (not credit note)
-//			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
 		}
+	
+		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+	
+		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+/* // TODO handle supplier relative discount
+		if ($societe->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+*/
+		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+		$absolute_discount = price2num($absolute_discount, 'MT');
+		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+		if ($absolute_discount) {
+			if ($object->statut > CommandeFournisseur::STATUS_DRAFT) {
+				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+			} else {
+				// Remise dispo de type remise fixe (not credit note)
+//				print '<br>';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+			}
+		}
+		if ($absolute_creditnote) {
+			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
+		}
+		if (! $absolute_discount && ! $absolute_creditnote)
+			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+		print '</td></tr>';
 	}
-	if ($absolute_creditnote) {
-		print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-	}
-	if (! $absolute_discount && ! $absolute_creditnote)
-		print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
-	print '</td></tr>';
 
 	// Conditions de reglement par defaut
 	$langs->load('bills');
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d9fcf57a4a6..0344890458b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1913,7 +1913,7 @@ if ($action == 'create')
 
 	print '</td></tr>';
 
-	if ($societe->id > 0)
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $societe->id > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
@@ -2410,90 +2410,93 @@ else
             print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
         }
         print '</td></tr>';
-        
-        // Relative and absolute discounts
-        $addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-        $addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-        $addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-        $viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
-		
-		print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
-		print '</td><td>';
-/* // TODO handle supplier relative discount
-		if ($societe->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		// print ' ('.$addrelativediscount.')';
-*/
 
-		// Is there is commercial discount or down payment available ?
-		if ($absolute_discount > 0) {
-//			print '. ';
-			if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-				if ($object->statut == 0) {
-					print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-					print '. ';
-				} else {
-					if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-						print '<!--<br>-->' . $text . '.<br>';
+        if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+        
+	        // Relative and absolute discounts
+	        $addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+	        $addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+	        $addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+	        $viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
+			
+			print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
+			print '</td><td>';
+/* // TODO handle supplier relative discount
+			if ($societe->remise_percent)
+				print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+			else
+				print $langs->trans("CompanyHasNoRelativeDiscount");
+			print ' ('.$addrelativediscount.')';
+*/
+	
+			// Is there is commercial discount or down payment available ?
+			if ($absolute_discount > 0) {
+//				print '. ';
+				if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+					if ($object->statut == 0) {
+						print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+						print '. ';
 					} else {
-						$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-						$text2 = $langs->trans("AbsoluteDiscountUse");
-						print $form->textwithpicto($text, $text2);
+						if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+							print '<!--<br>-->' . $text . '.<br>';
+						} else {
+							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+							$text2 = $langs->trans("AbsoluteDiscountUse");
+							print $form->textwithpicto($text, $text2);
+						}
 					}
+				} else {
+					// Discount available of type fixed amount (not credit note)
+//					print '<br>';
+					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
 				}
 			} else {
-				// Discount available of type fixed amount (not credit note)
-//				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
+				if ($absolute_creditnote > 0) 		// If not, link will be added later
+				{
+					if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
+						print ' (' . $addabsolutediscount . ')<br>';
+//					else
+//						print '. ';
+				} else
+				print '. ';
 			}
-		} else {
-			if ($absolute_creditnote > 0) 		// If not, link will be added later
+			// Is there credit notes availables ?
+			if ($absolute_creditnote > 0)
 			{
+				// If validated, we show link "add credit note to payment"
+				if ($object->statut != FactureFournisseur::STATUS_VALIDATED || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+					if ($object->statut == 0 && $object->type != FactureFournisseur::TYPE_DEPOSIT) {
+						$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
+						print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
+					} else {
+						print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
+					}
+				} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
+					// There is credit notes discounts available
+//					if (! $absolute_discount) print '<br>';
+					// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
+					$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
+					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
+				}
+			}
+			if (! $absolute_discount && ! $absolute_creditnote) {
+				print $langs->trans("CompanyHasNoAbsoluteDiscount");
 				if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
 					print ' (' . $addabsolutediscount . ')<br>';
-//				else
-//					print '. ';
-			} else
-			print '. ';
-		}
-		// Is there credit notes availables ?
-		if ($absolute_creditnote > 0)
-		{
-			// If validated, we show link "add credit note to payment"
-			if ($object->statut != FactureFournisseur::STATUS_VALIDATED || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
-				if ($object->statut == 0 && $object->type != FactureFournisseur::TYPE_DEPOSIT) {
-					$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
-					print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
-				} else {
-					print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
-				}
-			} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
-				// There is credit notes discounts available
-//				if (! $absolute_discount) print '<br>';
-				// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
-				$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
+				else
+					print '. ';
 			}
-		}
-		if (! $absolute_discount && ! $absolute_creditnote) {
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-			if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
-				print ' (' . $addabsolutediscount . ')<br>';
-			else
-				print '. ';
-		}
-		// if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
-		// {
-		// if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
-		// print ' &nbsp; - &nbsp; ';
-		// print $addabsolutediscount;
-		// print ' &nbsp; - &nbsp; '.$addcreditnote; // We disbale link to credit note
-		// }
-		print '</td></tr>';
-			
+			// if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
+			// {
+			// if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
+			// print ' &nbsp; - &nbsp; ';
+			// print $addabsolutediscount;
+			// print ' &nbsp; - &nbsp; '.$addcreditnote; // We disbale link to credit note
+			// }
+			print '</td></tr>';
+        }
+				
         // Label
         print '<tr>';
         print '<td>'.$form->editfieldkey("Label",'label',$object->label,$object,($user->rights->fournisseur->facture->creer)).'</td>';
@@ -2852,37 +2855,39 @@ else
 			$creditnoteamount = 0;
 			$depositamount = 0;
 
-			$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-			$sql .= " re.description, re.fk_invoice_supplier_source";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
-			$sql .= " WHERE fk_invoice_supplier = " . $object->id;
-			$resql = $db->query($sql);
-			if ($resql) {
-				$num = $db->num_rows($resql);
-				$i = 0;
-				$invoice = new FactureFournisseur($db);
-				while ($i < $num) {
-					$obj = $db->fetch_object($resql);
-					$invoice->fetch($obj->fk_invoice_supplier_source);
-					print '<tr><td colspan="' . $nbcols . '" align="right">';
-					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-						print $langs->trans("CreditNote") . ' ';
-					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
-						print $langs->trans("Deposit") . ' ';
-					print $invoice->getNomUrl(0);
-					print ' :</td>';
-					print '<td align="right">' . price($obj->amount_ttc) . '</td>';
-					print '<td align="right">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
-					print '</td></tr>';
-					$i ++;
-					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-						$creditnoteamount += $obj->amount_ttc;
-					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
-						$depositamount += $obj->amount_ttc;
+			if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+				$sql .= " re.description, re.fk_invoice_supplier_source";
+				$sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
+				$sql .= " WHERE fk_invoice_supplier = " . $object->id;
+				$resql = $db->query($sql);
+				if ($resql) {
+					$num = $db->num_rows($resql);
+					$i = 0;
+					$invoice = new FactureFournisseur($db);
+					while ($i < $num) {
+						$obj = $db->fetch_object($resql);
+						$invoice->fetch($obj->fk_invoice_supplier_source);
+						print '<tr><td colspan="' . $nbcols . '" align="right">';
+						if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+							print $langs->trans("CreditNote") . ' ';
+						if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+							print $langs->trans("Deposit") . ' ';
+						print $invoice->getNomUrl(0);
+						print ' :</td>';
+						print '<td align="right">' . price($obj->amount_ttc) . '</td>';
+						print '<td align="right">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
+						print '</td></tr>';
+						$i ++;
+						if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+							$creditnoteamount += $obj->amount_ttc;
+						if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+							$depositamount += $obj->amount_ttc;
+					}
+				} else {
+					dol_print_error($db);
 				}
-			} else {
-				dol_print_error($db);
 			}
 
 
@@ -3097,7 +3102,7 @@ else
 				}
 
 				// Reverse back money or convert to reduction
-				if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD) {
+				if ($conf->global->MAIN_FEATURES_LEVEL > 0 && ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD)) {
 					// For credit note only
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0)
 					{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ba78c78dade..17e5a2be199 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1048,11 +1048,11 @@ if ($action == 'create')
 	}
 	print '</tr>' . "\n";
 
-	if ($soc->id > 0)
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $soc->id > 0)
 	{
-/* // TODO handle supplier relative discount
 		// Discounts for third party
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';		
+/* // TODO handle supplier relative discount
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
 		else
@@ -1411,46 +1411,49 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 
-	// Relative and absolute discounts
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	} else {
-		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
-	}
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
 
-	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-
-	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-/* // TODO handle supplier relative discount
-	if ($soc->remise_percent)
-		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-	else
-		print $langs->trans("CompanyHasNoRelativeDiscount");
-	print '. ';
-*/
-	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
-	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
-	$absolute_discount = price2num($absolute_discount, 'MT');
-	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-	if ($absolute_discount) {
-		if ($object->statut > SupplierProposal::STATUS_DRAFT) {
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+		// Relative and absolute discounts
+		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			// Remise dispo de type remise fixe (not credit note)
-//			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
 		}
+	
+		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+	
+		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+/* // TODO handle supplier relative discount
+		if ($soc->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+*/
+		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+		$absolute_discount = price2num($absolute_discount, 'MT');
+		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+		if ($absolute_discount) {
+			if ($object->statut > SupplierProposal::STATUS_DRAFT) {
+				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+			} else {
+				// Remise dispo de type remise fixe (not credit note)
+//				print '<br>';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
+			}
+		}
+		if ($absolute_creditnote) {
+			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
+		}
+		if (! $absolute_discount && ! $absolute_creditnote)
+			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+		print '</td></tr>';
 	}
-	if ($absolute_creditnote) {
-		print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-	}
-	if (! $absolute_discount && ! $absolute_creditnote)
-		print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
-	print '</td></tr>';
 
 	// Payment term
 	print '<tr><td class="titlefield">';

From 95be1550100ff94cc1a1529c21dccbb536f5452f Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 20 Feb 2018 12:26:29 +0100
Subject: [PATCH 156/386] FIX: supplier credit notes: harmonize discount
 filters

---
 htdocs/comm/card.php                            |  2 +-
 htdocs/comm/propal/card.php                     | 15 +++++++++++----
 htdocs/commande/card.php                        |  4 ++--
 htdocs/compta/facture/prelevement.php           | 16 ++++++++++++----
 htdocs/core/class/html.form.class.php           | 12 ++++++------
 htdocs/expedition/shipment.php                  | 14 +++++++++++---
 htdocs/fourn/commande/card.php                  |  4 ++--
 htdocs/societe/class/api_thirdparties.class.php | 10 ++++++++--
 htdocs/supplier_proposal/card.php               |  4 ++--
 9 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d732a10a347..81443f04d62 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -392,7 +392,7 @@ if ($object->id > 0)
 	print '</td></tr></table>';
 	print '</td>';
 	print '<td>';
-	$amount_discount=$object->getAvailableDiscounts(); // TODO adapt to supplier discounts
+	$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");
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 54e3cf36c45..4291b22508d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1873,14 +1873,22 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Link for thirdparty discounts
+	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>';
 	if ($soc->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 	else
 		print $langs->trans("CompanyHasNoRelativeDiscount");
 	print '. ';
-	$absolute_discount = $soc->getAvailableDiscounts('', 'fk_facture_source IS NULL');
-	$absolute_creditnote = $soc->getAvailableDiscounts('', 'fk_facture_source IS NOT NULL');
+	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
+	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
 	$absolute_discount = price2num($absolute_discount, 'MT');
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 	if ($absolute_discount) {
@@ -1888,9 +1896,8 @@ if ($action == 'create')
 			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 0, 0, -1, $conf->currency));
 		} else {
 			// Remise dispo de type non avoir
-			$filter = 'fk_facture_source IS NULL';
 			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filter, 0, '', 1);
+			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1);
 		}
 	}
 	if ($absolute_creditnote) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a56dc6cd5ac..6cd21df9c78 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2041,8 +2041,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$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 (fk_facture_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-			$filtercreditnote = "fk_facture_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+			$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)%')";
 		}
 
 		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 989e742afee..6065ad9cd6f 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -140,8 +140,16 @@ if ($object->id > 0)
 	if ($object->paye) $resteapayer=0;
 	$resteapayeraffiche=$resteapayer;
 
-	$absolute_discount=$object->thirdparty->getAvailableDiscounts('','fk_facture_source IS NULL');
-	$absolute_creditnote=$object->thirdparty->getAvailableDiscounts('','fk_facture_source IS NOT NULL');
+	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=$object->thirdparty->getAvailableDiscounts('',$filterabsolutediscount);
+	$absolute_creditnote=$object->thirdparty->getAvailableDiscounts('',$filtercreditnote);
 	$absolute_discount=price2num($absolute_discount,'MT');
 	$absolute_creditnote=price2num($absolute_creditnote,'MT');
 
@@ -282,7 +290,7 @@ if ($object->id > 0)
 		else
 		{
 			// Remise dispo de type non avoir
-			$filter='fk_facture_source IS NULL';
+			$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NULL':"fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 			print '<br>';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$object->thirdparty->id,$absolute_discount,$filter,$resteapayer,'',1);
 		}
@@ -302,7 +310,7 @@ if ($object->id > 0)
 		else
 		{
 			// Remise dispo de type avoir
-			$filter='fk_facture_source IS NOT NULL';
+			$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NOT NULL':"fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
 			if (! $absolute_discount) print '<br>';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id_for_payment',$object->thirdparty->id,$absolute_creditnote,$filter,$resteapayer,'',1);
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f65a3bec36c..aafe9b81cc1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4235,23 +4235,23 @@ class Form
 			if(! empty($discount_type)) {
 				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (! $filter || $filter=="fk_invoice_supplier IS NOT NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
+					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
 					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
 				}
 				else
 				{
-					if (! $filter || $filter=="fk_invoice_supplier IS NOT NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
 					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
 				}
 			} else {
 				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (! $filter || $filter=="fk_facture IS NOT NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
+					if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
 					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
 				}
 				else
 				{
-					if (! $filter || $filter=="fk_facture IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
 					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
 				}
 			}
@@ -4271,9 +4271,9 @@ class Form
 				if ($nbqualifiedlines > 0)
 				{
 					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
-					if(! empty($discount_type) && $filter && $filter != "fk_invoice_supplier IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
+					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 IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
+					if(empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
 						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
 
 					print '>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index a358d349531..cf0cc1d6d24 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -329,12 +329,20 @@ if ($id > 0 || ! empty($ref))
 	    print '<table class="border" width="100%">';
 
 		// 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)%')";
+	    }
+
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
 		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
 		else print $langs->trans("CompanyHasNoRelativeDiscount");
 		print '. ';
-		$absolute_discount=$soc->getAvailableDiscounts('','fk_facture_source IS NULL');
-		$absolute_creditnote=$soc->getAvailableDiscounts('','fk_facture_source IS NOT NULL');
+		$absolute_discount=$soc->getAvailableDiscounts('',$filterabsolutediscount);
+		$absolute_creditnote=$soc->getAvailableDiscounts('',$filtercreditnote);
 		$absolute_discount=price2num($absolute_discount,'MT');
 		$absolute_creditnote=price2num($absolute_creditnote,'MT');
 		if ($absolute_discount)
@@ -346,7 +354,7 @@ if ($id > 0 || ! empty($ref))
 			else
 			{
 				// Remise dispo de type non avoir
-				$filter='fk_facture_source IS NULL';
+				$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NULL':"fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 				print '<br>';
 				$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter, 0, '', 1);
 			}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6cd17690c24..0111a8d11c7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1888,8 +1888,8 @@ elseif (! empty($object->id))
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
 	
 		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index fa52c73f597..49901c420f0 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -83,8 +83,14 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$filterabsolutediscount = "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (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');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 17e5a2be199..259d3d0a5ca 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1418,8 +1418,8 @@ if ($action == 'create')
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (fk_invoice_supplier_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
 	
 		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';

From 346a0becac95403b643149534ab654eede388031 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 13:20:24 +0100
Subject: [PATCH 157/386] Propagate context

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 190de79aa17..12e08984411 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -279,6 +279,8 @@ class Contrat extends CommonObject
 			// Open lines not already open
 			if ($contratline->statut != 4)
 			{
+				$contratline->context = $this->context;
+
 				$result = $contratline->active_line($user, $date_start, -1);
 				if ($result < 0)
 				{

From 522caa4cf0c64399d66c8fbf88aebce7e695fda7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 15:26:40 +0100
Subject: [PATCH 158/386] Merge #7989

---
 .../class/accountancycategory.class.php       | 402 +++++++++++++++---
 1 file changed, 336 insertions(+), 66 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 3e661958931..effae05da0f 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -28,27 +28,356 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 /**
  * Class to manage categories of an accounting account
  */
-class AccountancyCategory
+class AccountancyCategory 	// extends CommonObject
 {
-	private $db;
-	public $error;
-	public $errors = array ();
-	public $element = 'accounting_category';
-	public $table_element = 'c_accounting_category';
+	public $db;							//!< To store db handler
+	public $error;							//!< To return error code (or message)
+	public $errors=array();				//!< To return several error codes (or messages)
+	public $element='c_accounting_category';			//!< Id that identify managed objects
+	public $table_element='c_accounting_category';	//!< Name of table without prefix where object is stored
+
 	public $id;
+	public $code;
+	public $label;
+	public $range_account;
+	public $sens;
+	public $category_type;
+	public $formula;
+	public $position;
+	public $fk_country;
+	public $active;
+
 	public $lines_cptbk;
 	public $lines_display;
 	public $sdc;
 
+
 	/**
 	 * Constructor
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-	public function __construct($db) {
+	public function __construct($db)
+	{
 		$this->db = $db;
 	}
 
+
+	var $id;
+	var $code;
+	var $label;
+	var $range_account;
+	var $sens;
+	var $category_type;
+	var $formula;
+	var $position;
+	var $fk_country;
+	var $active;
+
+
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  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
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->code)) $this->code=trim($this->code);
+		if (isset($this->label)) $this->label=trim($this->label);
+		if (isset($this->range_account)) $this->range_account=trim($this->range_account);
+		if (isset($this->sens)) $this->sens=trim($this->sens);
+		if (isset($this->category_type)) $this->category_type=trim($this->category_type);
+		if (isset($this->formula)) $this->formula=trim($this->formula);
+		if (isset($this->position)) $this->position=trim($this->position);
+		if (isset($this->fk_country)) $this->fk_country=trim($this->fk_country);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_accounting_category(";
+		$sql.= "rowid,";
+		$sql.= "code,";
+		$sql.= "label,";
+		$sql.= "range_account,";
+		$sql.= "sens,";
+		$sql.= "category_type,";
+		$sql.= "formula,";
+		$sql.= "position,";
+		$sql.= "fk_country,";
+		$sql.= "active";
+		$sql.= ") VALUES (";
+		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").",";
+		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
+		$sql.= " ".(! isset($this->range_account)?'NULL':"'".$this->db->escape($this->range_account)."'").",";
+		$sql.= " ".(! isset($this->sens)?'NULL':"'".$this->sens."'").",";
+		$sql.= " ".(! isset($this->category_type)?'NULL':"'".$this->category_type."'").",";
+		$sql.= " ".(! isset($this->formula)?'NULL':"'".$this->db->escape($this->formula)."'").",";
+		$sql.= " ".(! isset($this->position)?'NULL':"'".$this->position."'").",";
+		$sql.= " ".(! isset($this->fk_country)?'NULL':"'".$this->fk_country."'").",";
+		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'")."";
+		$sql.= ")";
+
+		$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."c_accounting_category");
+
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// 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;
+		}
+	}
+
+
+	/**
+	 *  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
+	 */
+	function fetch($id,$code='',$label='')
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.code,";
+		$sql.= " t.label,";
+		$sql.= " t.range_account,";
+		$sql.= " t.sens,";
+		$sql.= " t.category_type,";
+		$sql.= " t.formula,";
+		$sql.= " t.position,";
+		$sql.= " t.fk_country,";
+		$sql.= " t.active";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
+		if ($id)   $sql.= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+
+		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          = $obj->code;
+				$this->label         = $obj->label;
+				$this->range_account = $obj->range_account;
+				$this->sens          = $obj->sens;
+				$this->category_type = $obj->category_type;
+				$this->formula       = $obj->formula;
+				$this->position      = $obj->position;
+				$this->fk_country    = $obj->fk_country;
+				$this->active        = $obj->active;
+			}
+			$this->db->free($resql);
+
+			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
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->code)) $this->code=trim($this->code);
+		if (isset($this->label)) $this->label=trim($this->label);
+		if (isset($this->range_account)) $this->range_account=trim($this->range_account);
+		if (isset($this->sens)) $this->sens=trim($this->sens);
+		if (isset($this->category_type)) $this->category_type=trim($this->category_type);
+		if (isset($this->formula)) $this->formula=trim($this->formula);
+		if (isset($this->position)) $this->position=trim($this->position);
+		if (isset($this->fk_country)) $this->fk_country=trim($this->fk_country);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_accounting_category SET";
+		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
+		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " range_account=".(isset($this->range_account)?"'".$this->db->escape($this->range_account)."'":"null").",";
+		$sql.= " sens=".(isset($this->sens)?$this->sens:"null").",";
+		$sql.= " category_type=".(isset($this->category_type)?$this->category_type:"null").",";
+		$sql.= " formula=".(isset($this->formula)?"'".$this->db->escape($this->formula)."'":"null").",";
+		$sql.= " position=".(isset($this->position)?$this->position:"null").",";
+		$sql.= " fk_country=".(isset($this->fk_country)?$this->fk_country:"null").",";
+		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
+		$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(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// 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  User	$user        User that delete
+	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_accounting_category";
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$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 call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// 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;
+		}
+	}
+
+
 	/**
 	 * Function to select all accounting accounts from an accounting category
 	 *
@@ -443,65 +772,6 @@ class AccountancyCategory
 	}
 
 
-	// calcule
-
-	/* I try to replace this with dol_eval()
-
-	const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';
-
-	const PARENTHESIS_DEPTH = 10;
-
-	public function calculate($input)
-	{
-		global $langs;
-
-		if(strpos($input, '+') != null || strpos($input, '-') != null || strpos($input, '/') != null || strpos($input, '*') != null){
-			//  Remove white spaces and invalid math chars
-			$input = str_replace($langs->trans("ThousandSeparator"), '', $input);
-			$input = str_replace(',', '.', $input);
-			$input = preg_replace('[^0-9\.\+\-\*\/\(\)]', '', $input);
-
-			//  Calculate each of the parenthesis from the top
-			$i = 0;
-			while(strpos($input, '(') || strpos($input, ')')){
-				$input = preg_replace_callback('/\(([^\(\)]+)\)/', 'self::callback', $input);
-
-				$i++;
-				if($i > self::PARENTHESIS_DEPTH){
-					break;
-				}
-			}
-
-			//  Calculate the result
-			if(preg_match(self::PATTERN, $input, $match)){
-				return $this->compute($match[0]);
-			}
-
-			return 0;
-		}
-
-		return $input;
-	}
-
-	private function compute($input){
-		$compute = create_function('', 'return '.$input.';');
-
-		return 0 + $compute();
-	}
-
-	private function callback($input){
-		if(is_numeric($input[1])){
-			return $input[1];
-		}
-		elseif(preg_match(self::PATTERN, $input[1], $match)){
-			return $this->compute($match[0]);
-		}
-
-		return 0;
-	}
-	*/
-
-
 	/**
 	 * Get all accounting account of a group.
 	 * You must choose between first parameter (personalized group) or the second (free criteria filter)

From 15ba0c3b49b6ba69461e4e7fb085109705392854 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 15:35:42 +0100
Subject: [PATCH 159/386] Close #7989 Merge manually in existing class

---
 .../class/accountancycategory.class.php       | 25 -------------------
 htdocs/core/modules/modAccounting.class.php   | 21 ++++++++++++++++
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index effae05da0f..dae58bf1520 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -52,30 +52,6 @@ class AccountancyCategory 	// extends CommonObject
 	public $sdc;
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	var $id;
-	var $code;
-	var $label;
-	var $range_account;
-	var $sens;
-	var $category_type;
-	var $formula;
-	var $position;
-	var $fk_country;
-	var $active;
-
-
-
 
 	/**
 	 *  Constructor
@@ -85,7 +61,6 @@ class AccountancyCategory 	// extends CommonObject
 	function __construct($db)
 	{
 		$this->db = $db;
-		return 1;
 	}
 
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 3f8a7c092b8..059118e2663 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2016-2017 Laurent Destailleur 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2017      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
@@ -235,5 +236,25 @@ class modAccounting extends DolibarrModules
         $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.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').') ';
 
+
+        // Imports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]="Chartofaccounts"; // 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('aa'=>MAIN_DB_PREFIX.'accounting_account');
+        $this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
+        $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.pcg_subtype'=>'Pcgsubtype*','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'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+        $this->import_convertvalue_array[$r]=array(
+	        'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountingCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+	        'aa.account_parent'=>array('rule'=>'zeroifnull'),
+        );
+        $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"SALES","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+
 	}
 }

From 809ef1bd00d2a8f31a6eec49c228dce1ea7a289c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 18:09:38 +0100
Subject: [PATCH 160/386] FIX Trigger *_MODIFY must be called when editing a
 property event extra. Clean duplicate trigggers "*_CLONE"

---
 ChangeLog                                             |  4 +++-
 htdocs/comm/card.php                                  |  2 +-
 htdocs/comm/propal/card.php                           |  2 +-
 htdocs/comm/propal/class/propal.class.php             |  5 -----
 htdocs/commande/card.php                              |  2 +-
 htdocs/commande/class/commande.class.php              |  5 -----
 htdocs/compta/facture/card.php                        |  2 +-
 htdocs/compta/facture/class/facture.class.php         |  5 -----
 htdocs/compta/facture/fiche-rec.php                   |  2 +-
 htdocs/contrat/card.php                               |  2 +-
 htdocs/contrat/class/contrat.class.php                | 11 -----------
 htdocs/expedition/card.php                            |  2 +-
 htdocs/expedition/shipment.php                        |  2 +-
 htdocs/expensereport/card.php                         |  2 +-
 htdocs/expensereport/class/expensereport.class.php    |  5 -----
 htdocs/fichinter/card.php                             |  2 +-
 htdocs/fichinter/class/fichinter.class.php            |  5 -----
 htdocs/fourn/card.php                                 |  8 ++++----
 htdocs/fourn/class/fournisseur.commande.class.php     |  5 -----
 htdocs/fourn/commande/card.php                        |  2 +-
 htdocs/fourn/facture/card.php                         |  2 +-
 htdocs/livraison/card.php                             |  2 +-
 ...nterface_99_modMyModule_MyModuleTriggers.class.php | 11 ++++-------
 htdocs/product/stock/productlot_card.php              |  2 +-
 htdocs/societe/card.php                               |  2 +-
 htdocs/supplier_proposal/card.php                     |  2 +-
 .../class/supplier_proposal.class.php                 |  5 -----
 27 files changed, 27 insertions(+), 74 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd18deeac14..5aff4d6d3ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,9 @@ Following changes may create regressions for some external modules, but were nec
   'doaction' into 'sendMail'. 
 * Rename trigger CONTRACT_SERVICE_ACTIVATE into LINECONTRACT_ACTIVATE and
   CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE
-
+* Remove triggers *_CLONE. The trigger CREATE with context 'createfromclone' is already called so this is 
+  a duplicated feature. Cloning is not a business event, the business event is CREATE, so no trigger required.
+ 
 
 ***** ChangeLog for 7.0.0 compared to 6.0.5 *****
 For users:
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 81443f04d62..506b0c6fa8d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -195,7 +195,7 @@ if (empty($reshook))
         if ($ret < 0) $error++;
         if (! $error)
         {
-			$result = $object->insertExtraFields();
+        	$result = $object->insertExtraFields('COMPANY_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 54e3cf36c45..9c72170b880 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1234,7 +1234,7 @@ if (empty($reshook))
 		if ($ret < 0) $error++;
 		if (! $error)
 		{
-			$result = $object->insertExtraFields();
+			$result = $object->insertExtraFields('PROPAL_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5efc1cf9db4..312d228b2d4 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1289,11 +1289,6 @@ class Propal extends CommonObject
 				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$clonedObj,$action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 			}
-
-			// Call trigger
-			$result=$clonedObj->call_trigger('PROPAL_CLONE',$user);
-			if ($result < 0) { $error++; }
-			// End call triggers
 		}
 
 		unset($this->context['createfromclone']);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6e1d411d55e..54c7db7d6ca 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1281,7 +1281,7 @@ if (empty($reshook))
 			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
 																								  // some hooks
 			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
+				$result = $object->insertExtraFields('ORDER_MODIFY');
 				if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 65b704693fb..8f2f233fb10 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1073,11 +1073,6 @@ class Commande extends CommonOrder
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
-
-            // Call trigger
-            $result=$this->call_trigger('ORDER_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
         }
 
         unset($this->context['createfromclone']);
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 19612349214..ab7e0826553 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2119,7 +2119,7 @@ if (empty($reshook))
 			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
 			// some hooks
 			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
+				$result = $object->insertExtraFields('BILL_MODIFY');
 				if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7edc3b65b41..184b9c80f3c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -958,11 +958,6 @@ class Facture extends CommonInvoice
 				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 			}
-
-            // Call trigger
-            $result=$this->call_trigger('BILL_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
 		}
 
 		unset($this->context['createfromclone']);
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index af81e797252..f869c01aa53 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -450,7 +450,7 @@ if (empty($reshook))
 		if ($ret < 0) $error++;
 
 		if (! $error) {
-			$result = $object->insertExtraFields();
+			$result = $object->insertExtraFields('BILLREC_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 6111be6c7ee..cdbcb46f815 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -881,7 +881,7 @@ if (empty($reshook))
 		if ($ret < 0) $error++;
 
 		if (! $error) {
-			$result = $object->insertExtraFields();
+			$result = $object->insertExtraFields('CONTRACT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 12e08984411..cf809adfc6c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2430,17 +2430,6 @@ class Contrat extends CommonObject
 
 		}
 
-		if (! $notrigger && empty($error))
-		{
-			// Call trigger
-			$clonedObj->old_copy=$this;
-			$result = $clonedObj->call_trigger('CONTRACT_CLONE', $user);
-			if ($result < 0) {
-				$error ++;
-			}
-			// End call triggers
-		}
-
 		unset($this->context['createfromclone']);
 
 		// End
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 9f48d27ca00..8fc21e0653e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -168,7 +168,7 @@ if (empty($reshook))
 	        $parameters = array('id' => $object->id);
 	        $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 	        if (empty($reshook)) {
-	            $result = $object->insertExtraFields();
+	            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
        			if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index a358d349531..d172d1034ca 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -193,7 +193,7 @@ if (empty($reshook))
             $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
             // some hooks
             if (empty($reshook)) {
-                $result = $object->insertExtraFields();
+                $result = $object->insertExtraFields('SHIPMENT_MODIFY');
        			if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 6d989e6efc0..59c8b719d4e 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -299,7 +299,7 @@ if (empty($reshook))
             $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
             // some hooks
             if (empty($reshook)) {
-                $result = $object->insertExtraFields();
+            	$result = $object->insertExtraFields('FICHINTER_MODIFY');
        			if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b1523f3bbf9..5674192906c 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -341,11 +341,6 @@ class ExpenseReport extends CommonObject
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
-
-            // Call trigger
-            $result=$this->call_trigger('EXPENSEREPORT_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
         }
 
         unset($this->context['createfromclone']);
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 81e7fe9ac54..e7839f66da2 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -755,7 +755,7 @@ if (empty($reshook))
 			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook))
 			{
-				$result=$object->insertExtraFields();
+				$result=$object->insertExtraFields('INTERVENTION_MODIFY');
 				if ($result < 0)
 				{
 					$error++;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 6ee279d2015..49db7cddc00 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1107,11 +1107,6 @@ class Fichinter extends CommonObject
 				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 			}
-
-			// Call trigger
-			$result=$this->call_trigger('INTERVENTION_CLONE',$user);
-			if ($result < 0) $error++;
-			// End call triggers
 		}
 
 		unset($this->context['createfromclone']);
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 588c13ca849..6f06a6778fd 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -101,7 +101,7 @@ if (empty($reshook))
 		$result=$object->setPaymentMethods(GETPOST('mode_reglement_supplier_id','int'));
 		if ($result < 0) dol_print_error($db,$object->error);
 	}
-	
+
 	// update supplier order min amount
 	if ($action == 'setsupplier_order_min_amount')
 	{
@@ -121,7 +121,7 @@ if (empty($reshook))
         if ($ret < 0) $error++;
         if (! $error)
         {
-            $result = $object->insertExtraFields();
+            $result = $object->insertExtraFields('COMPANY_MODIFY');
             if ($result < 0) $error++;
         }
         if ($error) $action = 'edit_extras';
@@ -255,14 +255,14 @@ if ($object->id > 0)
 	}
 	print "</td>";
 	print '</tr>';
-	
+
 	print '<tr class="nowrap">';
 	print '<td>';
 	print $form->editfieldkey("OrderMinAmount",'supplier_order_min_amount',$object->supplier_order_min_amount,$object,$user->rights->societe->creer);
 	print '</td><td>';
 	$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 	print $form->editfieldval("OrderMinAmount",'supplier_order_min_amount',$object->supplier_order_min_amount,$object,$user->rights->societe->creer,$limit_field_type,($object->supplier_order_min_amount != '' ? price($object->supplier_order_min_amount) : ''));
-	
+
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 38d0e42d36a..957794efd46 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1368,11 +1368,6 @@ class CommandeFournisseur extends CommonOrder
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
-
-			// Call trigger
-			$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
-			if ($result < 0) $error++;
-			// End call triggers
         }
 
 		unset($this->context['createfromclone']);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 81ea1a0f951..da3f79d94d0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -963,7 +963,7 @@ if (empty($reshook))
 			{
 				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$object->insertExtraFields();
+					$result=$object->insertExtraFields('ORDER_SUPPLIER_MODIFY');
 
 					if ($result < 0)
 					{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 761d5d591e3..cfba614492e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1274,7 +1274,7 @@ if (empty($reshook))
 				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
 
-					$result=$object->insertExtraFields();
+					$result=$object->insertExtraFields('BILL_SUPPLIER_MODIFY');
 
 					if ($result < 0)
 					{
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b0de98ae2eb..41091b36e08 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -206,7 +206,7 @@ if ($action == 'update_extras')
 		$parameters = array('id' => $object->id);
 		$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
-			$result = $object->insertExtraFields();
+			$result = $object->insertExtraFields('DELIVERY_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
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 e413c969119..f9984e8fb40 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
@@ -151,13 +151,13 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		    case 'STOCK_MOVEMENT':
 
 		        //MYECMDIR
-		    case 'MYECMDIR_DELETE':
 		    case 'MYECMDIR_CREATE':
 		    case 'MYECMDIR_MODIFY':
+		    case 'MYECMDIR_DELETE':
 
 		        // Customer orders
 		    case 'ORDER_CREATE':
-		    case 'ORDER_CLONE':
+		    case 'ORDER_MODIFY':
 		    case 'ORDER_VALIDATE':
 		    case 'ORDER_DELETE':
 		    case 'ORDER_CANCEL':
@@ -170,7 +170,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 
 		        // Supplier orders
 		    case 'ORDER_SUPPLIER_CREATE':
-		    case 'ORDER_SUPPLIER_CLONE':
+		    case 'ORDER_SUPPLIER_MODIFY':
 		    case 'ORDER_SUPPLIER_VALIDATE':
 		    case 'ORDER_SUPPLIER_DELETE':
 		    case 'ORDER_SUPPLIER_APPROVE':
@@ -184,7 +184,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 
 		        // Proposals
 		    case 'PROPAL_CREATE':
-		    case 'PROPAL_CLONE':
 		    case 'PROPAL_MODIFY':
 		    case 'PROPAL_VALIDATE':
 		    case 'PROPAL_SENTBYMAIL':
@@ -197,7 +196,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 
 		        // SupplierProposal
 		    case 'SUPPLIER_PROPOSAL_CREATE':
-		    case 'SUPPLIER_PROPOSAL_CLONE':
 		    case 'SUPPLIER_PROPOSAL_MODIFY':
 		    case 'SUPPLIER_PROPOSAL_VALIDATE':
 		    case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
@@ -210,8 +208,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 
 		        // Contracts
 		    case 'CONTRACT_CREATE':
-		    case 'CONTRACT_ACTIVATE':
 		    case 'CONTRACT_MODIFY':
+		    case 'CONTRACT_ACTIVATE':
 		    case 'CONTRACT_CANCEL':
 		    case 'CONTRACT_CLOSE':
 		    case 'CONTRACT_DELETE':
@@ -221,7 +219,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 
 		        // Bills
 		    case 'BILL_CREATE':
-		    case 'BILL_CLONE':
 		    case 'BILL_MODIFY':
 		    case 'BILL_VALIDATE':
 		    case 'BILL_UNVALIDATE':
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 3a8f4cbff4e..1d9a7420740 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -135,7 +135,7 @@ if (empty($reshook))
             $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
             // some hooks
             if (empty($reshook)) {
-                $result = $object->insertExtraFields();
+                $result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
        			if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index dcacf89d643..b48c80a7a24 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -334,7 +334,7 @@ if (empty($reshook))
 
         if (! $error)
         {
-            $result = $object->insertExtraFields();
+            $result = $object->insertExtraFields('COMPANY_MODIFY');
    			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a5488959016..440551bd925 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -934,7 +934,7 @@ if (empty($reshook))
 
 		if (! $error)
 		{
-			$result = $object->insertExtraFields();
+			$result = $object->insertExtraFields('SUPPLIER_PROPOSAL_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index e43404777b6..d71f9a02a1f 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1101,11 +1101,6 @@ class SupplierProposal extends CommonObject
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
-
-            // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
         }
 
         // End

From 71cbcce3a2bf4918c3495e55b5c52d5b1fa2a9dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 18:10:11 +0100
Subject: [PATCH 161/386] NEW Can select sample to use when creating a new page

---
 htdocs/core/class/html.formwebsite.class.php  | 45 +++++++++++++++++++
 htdocs/langs/en_US/website.lang               |  5 ++-
 htdocs/website/index.php                      | 15 ++++++-
 ...te.html => page-sample-corporatehome.html} |  0
 htdocs/website/page-sample-empty.html         | 10 +++++
 5 files changed, 72 insertions(+), 3 deletions(-)
 rename htdocs/website/{pagetemplate.html => page-sample-corporatehome.html} (100%)
 create mode 100644 htdocs/website/page-sample-empty.html

diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 4f92b2e9449..e7cd6d447a0 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -158,4 +158,49 @@ class FormWebsite
     	}
     }
 
+
+    /**
+     *  Return a HTML select list of a 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
+     */
+    function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    {
+    	global $langs, $conf, $user;
+
+    	$langs->load("admin");
+
+    	$arrayofsamples=array('corporatehome'=>'CorporateHomePage', 'empty'=>'EmptyPage');
+
+    	$out = '';
+
+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    	if ($useempty == 1 || ($useempty == 2 && $num > 1))
+    	{
+    		$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>';
+    		$i++;
+    	}
+    	$out .= "</select>";
+
+    	return $out;
+    }
+
 }
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 6e67062b859..a4c7d9e0211 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -4,6 +4,7 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
 DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. 
 WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
@@ -76,4 +77,6 @@ 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
\ No newline at end of file
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
\ No newline at end of file
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 959529eb44e..084ef28c2d0 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -153,7 +153,7 @@ $htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/jquery
 $htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>'."\n";
 $htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js"></script>'."\n";
 $htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta.2/js/bootstrap.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=relativepathtomyfile.js"></script>'."\n";
+$htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=js/myfile.js"></script>'."\n";
 
 
 /*
@@ -552,8 +552,13 @@ if ($action == 'addcontainer')
 		$substitutionarray=array();
 		$substitutionarray['__WEBSITE_CREATE_BY__']=$user->getFullName($langs);
 
+		$sample = GETPOST('sample','alpha');
+		if (empty($sample)) $sample='empty';
+
+		$pathtosample = DOL_DOCUMENT_ROOT.'/website/page-sample-'.$sample.'.html';
+
 		// Init content with content into pagetemplate.html, blogposttempltate.html, ...
-		$objectpage->content = make_substitutions(@file_get_contents(DOL_DOCUMENT_ROOT.'/website/'.$objectpage->type_container.'template.html'), $substitutionarray);
+		$objectpage->content = make_substitutions(@file_get_contents($pathtosample), $substitutionarray);
 	}
 
 	if (! $error)
@@ -2036,6 +2041,12 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER')?GETPOST('WEBSITE_TYPE_CONTAINER'):'page'));
 	print '</td></tr>';
 
+	print '<tr><td class="titlefield fieldrequired">';
+	print $langs->trans('WEBSITE_PAGE_EXAMPLE');
+	print '</td><td>';
+	print $formwebsite->selectSampleOfContainer('sample', (GETPOST('sample')?GETPOST('sample'):'corporatehomepage'));
+	print '</td></tr>';
+
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $langs->trans('WEBSITE_PAGENAME');
 	print '</td><td>';
diff --git a/htdocs/website/pagetemplate.html b/htdocs/website/page-sample-corporatehome.html
similarity index 100%
rename from htdocs/website/pagetemplate.html
rename to htdocs/website/page-sample-corporatehome.html
diff --git a/htdocs/website/page-sample-empty.html b/htdocs/website/page-sample-empty.html
new file mode 100644
index 00000000000..313c398a86e
--- /dev/null
+++ b/htdocs/website/page-sample-empty.html
@@ -0,0 +1,10 @@
+<div class="dolcontenteditable" contenteditable="true">
+<div style="text-align: center"><h1>__[MAIN_INFO_SOCIETE_NOM]__</h1><br>
+__(MyContainerTitle)__
+</div>
+</div>
+<div class="dolcontenteditable" contenteditable="true">
+<br>
+<div style="text-align: center">Created by: __WEBSITE_CREATE_BY__</div>
+<br>
+</div>

From e465b0c40ebfd4eb71952491f6de147ba716baf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 19:19:27 +0100
Subject: [PATCH 162/386] Fix extrafield date or datetime with bad timezone

---
 htdocs/core/class/commonobject.class.php | 18 ++++++++++++++++--
 htdocs/core/class/extrafields.class.php  |  4 ++--
 htdocs/core/tpl/extrafields_view.tpl.php | 12 ++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8def2194fb3..07993bb1d97 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4481,7 +4481,7 @@ abstract class CommonObject
 		if (! is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			// TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
+			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
 			// global $extrafields;
 			//if (! is_object($extrafields))
 			//{
@@ -4496,6 +4496,10 @@ abstract class CommonObject
 			}
 			$optionsArray = $extrafields->attributes[$this->table_element]['label'];
 		}
+		else
+		{
+			dol_syslog("Warning: fetch_optionals was called with param $optionsArray defined when you should pass null now", LOG_WARNING);
+		}
 
 		$table_element = $this->table_element;
 		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
@@ -4529,7 +4533,17 @@ abstract class CommonObject
 						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
 						{
 							// we can add this attribute to object
-							$this->array_options["options_".$key]=$value;
+							if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+							{
+								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
+								$this->array_options["options_".$key]=$this->db->jdate($value);
+							}
+							else
+							{
+								$this->array_options["options_".$key]=$value;
+							}
+
+							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
 						}
 					}
 				}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index a127ce706e9..ee165ac6808 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1404,12 +1404,12 @@ class ExtraFields
 		if ($type == 'date')
 		{
 			$showsize=10;
-			$value=dol_print_date($value, 'day', 'tzuser');
+			$value=dol_print_date($value, 'day');
 		}
 		elseif ($type == 'datetime')
 		{
 			$showsize=19;
-			$value=dol_print_date($value, 'dayhour', 'tzuser');
+			$value=dol_print_date($value, 'dayhour');
 		}
 		elseif ($type == 'int')
 		{
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9d638426bc3..3559df44c9c 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -107,8 +107,16 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
 			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.'" colspan="'.$cols.'">';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime'))) {
-				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime')))
+			{
+				$datenotinstring = $object->array_options['options_' . $key];
+				// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
+				if (! is_numeric($object->array_options['options_' . $key]))	// For backward compatibility
+				{
+					$datenotinstring = $db->jdate($datenotinstring);
+				}
+				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
+				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $datenotinstring;
 			}
 
 			//TODO Improve element and rights detection

From 8b54a805935b2766f3d41d3c56803875e68428f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 19:20:03 +0100
Subject: [PATCH 163/386] Fix oldcopy not saved before calling trigger

---
 htdocs/contrat/card.php                |  3 +++
 htdocs/contrat/class/contrat.class.php | 13 +++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index cdbcb46f815..0bbb509b7fa 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -94,6 +94,7 @@ $permissionnote=$user->rights->contrat->creer;	// Used by the include of actions
 $permissiondellink=$user->rights->contrat->creer;	// Used by the include of actions_dellink.inc.php
 
 
+
 /*
  * Actions
  */
@@ -875,6 +876,8 @@ if (empty($reshook))
 	}
 	else if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index cf809adfc6c..537e37071bc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -609,7 +609,7 @@ class Contrat extends CommonObject
 				$this->mise_en_service			= $this->db->jdate($result["datemise"]);
 
 				$this->date_contrat				= $this->db->jdate($result["datecontrat"]);
-				$this->date_creation				= $this->db->jdate($result["datecontrat"]);
+				$this->date_creation			= $this->db->jdate($result["datecontrat"]);
 
 				$this->fin_validite				= $this->db->jdate($result["fin_validite"]);
 				$this->date_cloture				= $this->db->jdate($result["date_cloture"]);
@@ -634,16 +634,13 @@ class Contrat extends CommonObject
 
 				$this->db->free($resql);
 
-				// Retreive all extrafield for thirdparty
-				// fetch optionals attributes and labels
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+
+				$this->fetch_optionals($this->id, null);
+
 
 				/*
 				 * Lines
-				*/
+				 */
 
 				$this->lines  = array();
 

From c4130730cb00cc75a08cc2a2eff4be533e62dd18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2018 19:38:18 +0100
Subject: [PATCH 164/386] Clean code around fetch_optionals()

---
 htdocs/adherents/class/adherent.class.php     |  7 +-
 htdocs/categories/class/categorie.class.php   |  4 +-
 htdocs/comm/action/class/actioncomm.class.php |  3 +
 htdocs/comm/propal/class/propal.class.php     |  7 +-
 htdocs/commande/class/commande.class.php      |  7 +-
 htdocs/compta/bank/class/account.class.php    |  7 +-
 .../facture/class/facture-rec.class.php       |  7 +-
 htdocs/compta/facture/class/facture.class.php | 24 +++----
 htdocs/contact/class/contact.class.php        |  9 +--
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/core/class/ctyperesource.class.php     | 65 +++++++++----------
 htdocs/don/class/don.class.php                |  7 +-
 htdocs/ecm/class/ecmfiles.class.php           |  8 +--
 htdocs/expedition/class/expedition.class.php  |  7 +-
 htdocs/fichinter/class/fichinter.class.php    |  9 ++-
 .../class/fournisseur.commande.class.php      |  7 +-
 .../fourn/class/fournisseur.facture.class.php |  5 +-
 htdocs/livraison/class/livraison.class.php    |  8 +--
 htdocs/product/class/product.class.php        |  8 +--
 .../stock/class/mouvementstock.class.php      |  7 +-
 .../product/stock/class/productlot.class.php  |  7 +-
 .../class/productstockentrepot.class.php      | 65 +++++++++----------
 htdocs/projet/class/project.class.php         |  3 +-
 htdocs/projet/class/task.class.php            |  5 +-
 htdocs/resource/class/dolresource.class.php   |  8 +--
 htdocs/societe/class/societe.class.php        |  7 +-
 .../class/supplier_proposal.class.php         | 14 ++--
 htdocs/user/class/user.class.php              |  7 +-
 htdocs/user/class/usergroup.class.php         |  7 +-
 29 files changed, 135 insertions(+), 198 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index bd0722ae63e..5691cd6687b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1156,12 +1156,9 @@ class Adherent extends CommonObject
 
 				$this->model_pdf        = $obj->model_pdf;
 
-				// Retreive all extrafield for thirdparty
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				// Load other properties
 				$result=$this->fetch_subscriptions();
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 46063c0f8c4..5b824d8c959 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -236,7 +236,9 @@ class Categorie extends CommonObject
 				$this->type			= $res['type'];
 				$this->entity		= $res['entity'];
 
-				$this->fetch_optionals($this->id,null);
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
 				$this->db->free($resql);
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9e0a0d6321d..5f094856e1c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -465,7 +465,10 @@ class ActionComm extends CommonObject
 		// Load source object
 		$objFrom = clone $this;
 
+		// Retreive all extrafield
+		// fetch optionals attributes and labels
 		$this->fetch_optionals();
+
 //		$this->fetch_userassigned();
 		$this->fetchResources();
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 312d228b2d4..1380b02d339 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1434,12 +1434,9 @@ class Propal extends CommonObject
 					$this->brouillon = 1;
 				}
 
-				// Retreive all extrafield for invoice
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				$this->db->free($resql);
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8f2f233fb10..f89bcf534a2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1668,12 +1668,9 @@ class Commande extends CommonOrder
 
                 if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
-                // Retrieve all extrafields for invoice
+                // Retreive all extrafield
                 // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+                $this->fetch_optionals();
 
                 $this->db->free($result);
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 1dba4a5b221..719a48c3e3c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -913,12 +913,9 @@ 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 for thirdparty
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				return 1;
 			}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 1636be2aace..84b61817a28 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -381,12 +381,9 @@ class FactureRec extends CommonInvoice
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
-				// Retreive all extrafield for thirdparty
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				/*
 				 * Lines
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 184b9c80f3c..aba627dd8a2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -790,14 +790,17 @@ class Facture extends CommonInvoice
 		// Charge facture source
 		$facture=new Facture($this->db);
 
-                $this->fetch_optionals();
-                if(!empty($this->array_options)){
-                    $facture->array_options = $this->array_options;
-                }
+		// Retreive all extrafield
+		// fetch optionals attributes and labels
+		$this->fetch_optionals();
 
-                foreach($this->lines as &$line){
+        if(!empty($this->array_options)){
+                    $facture->array_options = $this->array_options;
+        }
+
+        foreach($this->lines as &$line){
                     $line->fetch_optionals();//fetch extrafields
-                }
+        }
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
@@ -1328,16 +1331,13 @@ class Facture extends CommonInvoice
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
-				// Retrieve all extrafield for invoice
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				/*
 				 * Lines
-				*/
+				 */
 
 				$this->lines  = array();
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f616ca728b6..eca1174bb59 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -801,12 +801,9 @@ class Contact extends CommonObject
 					}
 				}
 
-				// Retreive all extrafield for contact
-                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
 				return 1;
 			}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 537e37071bc..9d40001ad50 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -635,7 +635,9 @@ class Contrat extends CommonObject
 				$this->db->free($resql);
 
 
-				$this->fetch_optionals($this->id, null);
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
 
 				/*
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 1de616210e4..a5a6ea879ce 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -48,14 +48,14 @@ class Ctyperesource
 
 	/**
 	 */
-	
+
 	public $code;
 	public $label;
 	public $active;
 
 	/**
 	 */
-	
+
 
 	/**
 	 * Constructor
@@ -82,7 +82,7 @@ class Ctyperesource
 		$error = 0;
 
 		// Clean parameters
-		
+
 		if (isset($this->code)) {
 			 $this->code = trim($this->code);
 		}
@@ -93,26 +93,26 @@ class Ctyperesource
 			 $this->active = trim($this->active);
 		}
 
-		
+
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		
+
 		$sql.= 'code,';
 		$sql.= 'label';
 		$sql.= 'active';
 
-		
+
 		$sql .= ') VALUES (';
-		
+
 		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
 		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
-		
+
 		$sql .= ')';
 
 		$this->db->begin();
@@ -165,18 +165,18 @@ class Ctyperesource
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
-		
+
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
 
-		
+
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if ($id)   $sql.= " WHERE t.id = ".$id;
 		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
 		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
-		
-		
+
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
@@ -184,25 +184,20 @@ class Ctyperesource
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
-				
+
 				$this->code = $obj->code;
 				$this->label = $obj->label;
 				$this->active = $obj->active;
 
-				
+
 			}
-			
+
 			// Retrieve all extrafields for invoice
 			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
+			// $this->fetch_optionals();
+
 			// $this->fetch_lines();
-			
+
 			$this->db->free($resql);
 
 			if ($numrows) {
@@ -236,12 +231,12 @@ class Ctyperesource
 
 		$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
@@ -251,7 +246,7 @@ class Ctyperesource
 				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 			}
 		}
-		
+
 		if (count($sqlwhere) > 0) {
 			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
 		}
@@ -270,12 +265,12 @@ class Ctyperesource
 				$line = new self($this->db);
 
 				$line->id = $obj->rowid;
-				
+
 				$line->code = $obj->code;
 				$line->label = $obj->label;
 				$line->active = $obj->active;
 
-				
+
 			}
 			$this->db->free($resql);
 
@@ -303,7 +298,7 @@ class Ctyperesource
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		// Clean parameters
-		
+
 		if (isset($this->code)) {
 			 $this->code = trim($this->code);
 		}
@@ -319,12 +314,12 @@ class Ctyperesource
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		
+
 		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"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;
 
 		$this->db->begin();
@@ -387,7 +382,7 @@ class Ctyperesource
 		}
 
 		// If you need to delete child tables to, you can insert them here
-		
+
 		if (!$error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
@@ -468,7 +463,7 @@ class Ctyperesource
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-		
+
 		$this->code = '';
 		$this->label = '';
 		$this->active = '';
@@ -488,7 +483,7 @@ class CtyperesourceLine
 	/**
 	 * @var mixed Sample line property 1
 	 */
-	
+
 	public $code;
 	public $label;
 	public $active;
@@ -496,5 +491,5 @@ class CtyperesourceLine
 	/**
 	 * @var mixed Sample line property 2
 	 */
-	
+
 }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index df298831c22..01ae466f132 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -665,12 +665,9 @@ class Don extends CommonObject
                 $this->modelpdf       = $obj->model_pdf;
                 $this->commentaire    = $obj->note;	// deprecated
 
-				// Retrieve all extrafield for thirdparty
+                // Retreive all extrafield
                 // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $this->fetch_optionals();
             }
             return 1;
         }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index ae16ad85eaf..698960974d5 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -337,12 +337,8 @@ class EcmFiles //extends CommonObject
 
 			// Retrieve all extrafields for invoice
 			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
+			// $this->fetch_optionals();
+
 			// $this->fetch_lines();
 
 			$this->db->free($resql);
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 85408c7e14a..b8eef6b5102 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -547,12 +547,9 @@ class Expedition extends CommonObject
 				 */
 				$result=$this->fetch_thirdparty();
 
-				// Retrieve all extrafields for expedition
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				/*
 				 * Lines
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 49db7cddc00..2cbbd1be022 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -383,14 +383,13 @@ class Fichinter extends CommonObject
 
 				if ($this->statut == 0) $this->brouillon = 1;
 
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
 				/*
 				 * Lines
-				*/
+				 */
 				$result=$this->fetch_lines();
 				if ($result < 0)
 				{
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 957794efd46..1bbde68172e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -310,12 +310,9 @@ class CommandeFournisseur extends CommonOrder
 
             $this->db->free($resql);
 
-            // Retrieve all extrafields
+            // Retreive all extrafield
             // fetch optionals attributes and labels
-            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-            $extrafields=new ExtraFields($this->db);
-            $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-            $this->fetch_optionals($this->id,$extralabels);
+            $this->fetch_optionals();
 
             if ($this->statut == 0) $this->brouillon = 1;
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 292466ea0d8..1f84e71df96 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -643,10 +643,7 @@ class FactureFournisseur extends CommonInvoice
 
                 // Retreive all extrafield
                 // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $this->fetch_optionals();
 
                 if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 837b0af77f5..d0d24d39144 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -301,13 +301,9 @@ class Livraison extends CommonObject
 
 				if ($this->statut == 0) $this->brouillon = 1;
 
-
-				// Retrieve all extrafields for delivery
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				/*
 				 * Lignes
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 73d867e7141..123330004ed 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1951,13 +1951,9 @@ class Product extends CommonObject
 
 				$this->db->free($resql);
 
-
-				// Retreive all extrafield for current object
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				// multilangs
 				if (! empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 69be51f11e8..ab2b60f564a 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -576,12 +576,9 @@ class MouvementStock extends CommonObject
 	            $this->sellby = $this->db->jdate($obj->sellby);
 	        }
 
-	        // Retrieve all extrafields for invoice
+	        // Retreive all extrafield
 	        // fetch optionals attributes and labels
-	        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-	        $extrafields=new ExtraFields($this->db);
-	        $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-	        $this->fetch_optionals($this->id,$extralabels);
+	        $this->fetch_optionals();
 
 	        // $this->fetch_lines();
 
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index d7915512b2c..31c28eaa5b3 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -233,12 +233,9 @@ class Productlot extends CommonObject
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->import_key = $obj->import_key;
 
-				// Retrieve all extrafields for invoice
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 			}
 			$this->db->free($resql);
 
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 048be66461f..cbca4e5854d 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -51,7 +51,7 @@ class ProductStockEntrepot extends CommonObject
 
 	/**
 	 */
-	
+
 	public $tms = '';
 	public $fk_product;
 	public $fk_entrepot;
@@ -61,7 +61,7 @@ class ProductStockEntrepot extends CommonObject
 
 	/**
 	 */
-	
+
 
 	/**
 	 * Constructor
@@ -88,7 +88,7 @@ class ProductStockEntrepot extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		
+
 		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
 		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
 		if (isset($this->seuil_stock_alerte)) $this->seuil_stock_alerte = trim($this->seuil_stock_alerte);
@@ -100,23 +100,23 @@ class ProductStockEntrepot extends CommonObject
 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		
+
 		$sql.= 'fk_product,';
 		$sql.= 'fk_entrepot,';
 		$sql.= 'seuil_stock_alerte,';
 		$sql.= 'desiredstock,';
 		$sql.= 'import_key';
 
-		
+
 		$sql .= ') VALUES (';
-		
+
 		$sql .= ' '.(! isset($this->fk_product)?'NULL':$this->fk_product).',';
 		$sql .= ' '.(! isset($this->fk_entrepot)?'NULL':$this->fk_entrepot).',';
 		$sql .= ' '.(! isset($this->seuil_stock_alerte)?'0':$this->seuil_stock_alerte).',';
 		$sql .= ' '.(! isset($this->desiredstock)?'0':$this->desiredstock).',';
 		$sql .= ' '.(! isset($this->import_key)?'NULL':"'".$this->db->escape($this->import_key)."'");
 
-		
+
 		$sql .= ')';
 
 		$this->db->begin();
@@ -166,12 +166,12 @@ class ProductStockEntrepot extends CommonObject
 	public function fetch($id, $fk_product, $fk_entrepot)
 	{
 		if(empty($id) && (empty($fk_product) || empty($fk_entrepot))) return -1;
-		
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
-		
+
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_entrepot,";
@@ -179,11 +179,11 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= " t.desiredstock,";
 		$sql .= " t.import_key";
 
-		
+
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if(!empty($id)) $sql .= ' WHERE t.rowid = ' . $id;
 		else $sql.= ' WHERE t.fk_product = '.$fk_product.' AND t.fk_entrepot = '.$fk_entrepot;
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
@@ -191,7 +191,7 @@ class ProductStockEntrepot extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
-				
+
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_product = $obj->fk_product;
 				$this->fk_entrepot = $obj->fk_entrepot;
@@ -199,18 +199,15 @@ class ProductStockEntrepot extends CommonObject
 				$this->desiredstock = $obj->desiredstock;
 				$this->import_key = $obj->import_key;
 
-				
+
 			}
-			
-			// Retrieve all extrafields for invoice
+
+			// Retreive all extrafield
 			// fetch optionals attributes and labels
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
+			$this->fetch_optionals();
 
 			// $this->fetch_lines();
-			
+
 			$this->db->free($resql);
 
 			if ($numrows) {
@@ -246,7 +243,7 @@ class ProductStockEntrepot extends CommonObject
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
-		
+
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_entrepot,";
@@ -254,11 +251,11 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= " t.desiredstock,";
 		$sql .= " t.import_key";
 
-		
+
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-		
+
 		$sql .= ' WHERE 1=1';
-		
+
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -267,19 +264,19 @@ class ProductStockEntrepot extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) $sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		
+
 		if(!empty($fk_product)) $sql .= ' AND fk_product = '.$fk_product;
 		elseif(!empty($fk_entrepot)) $sql .= ' AND fk_entrepot = '.$fk_entrepot;
 		// "elseif" used instead of "if" because getting list with specified fk_product and specified fk_entrepot would be the same as doing a fetch
-		
+
 		if (!empty($sortfield)) $sql .= $this->db->order($sortfield,$sortorder);
 		if (!empty($limit)) $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		
+
 		$lines = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			
+
 			while ($obj = $this->db->fetch_object($resql)) {
 				$lines[$obj->rowid] = array(
 										'id'=>$obj->rowid
@@ -315,20 +312,20 @@ class ProductStockEntrepot extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		// Clean parameters
-		
+
 		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
 		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
 		if (isset($this->seuil_stock_alerte)) $this->seuil_stock_alerte = trim($this->seuil_stock_alerte);
 		if (isset($this->desiredstock)) $this->desiredstock = trim($this->desiredstock);
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
-		
+
 
 		// Check parameters
 		// Put here code to add a control on parameters values
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		
+
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_product = '.(isset($this->fk_product)?$this->fk_product:"null").',';
 		$sql .= ' fk_entrepot = '.(isset($this->fk_entrepot)?$this->fk_entrepot:"null").',';
@@ -336,7 +333,7 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= ' desiredstock = '.(isset($this->desiredstock)?$this->desiredstock:"null").',';
 		$sql .= ' import_key = '.(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
 
-        
+
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
@@ -573,7 +570,7 @@ class ProductStockEntrepot extends CommonObject
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-		
+
 		$this->tms = '';
 		$this->fk_product = '';
 		$this->fk_entrepot = '';
@@ -581,7 +578,7 @@ class ProductStockEntrepot extends CommonObject
 		$this->desiredstock = '';
 		$this->import_key = '';
 
-		
+
 	}
 
 }
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index e24a444702c..8dbce2790fa 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -444,7 +444,8 @@ class Project extends CommonObject
 
                 $this->db->free($resql);
 
-                // Retreive all extrafield for thirdparty
+                // Retreive all extrafield
+                // fetch optionals attributes and labels
                 $this->fetch_optionals();
 
                 if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index e694b3c7bfd..eeacf27aaec 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -266,8 +266,9 @@ class Task extends CommonObject
 					$this->task_parent_position = $obj->task_parent_position;
 				}
 
-				// Retreive all extrafield data
-			   	$this->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 			}
 
 			$this->db->free($resql);
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index c880f9538c7..c7126c6d3bb 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -213,13 +213,9 @@ class Dolresource extends CommonObject
     			$this->note_private				=	$obj->note_private;
     			$this->type_label				=	$obj->type_label;
 
-    			// Retreive all extrafield for thirdparty
+    			// Retreive all extrafield
     			// fetch optionals attributes and labels
-    			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-    			$extrafields=new ExtraFields($this->db);
-    			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-    			$this->fetch_optionals($this->id,$extralabels);
-
+    			$this->fetch_optionals();
     		}
     		$this->db->free($resql);
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 652ffd8742e..3ca69fdb6fd 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -334,7 +334,7 @@ class Societe extends CommonObject
 	 */
 	var $price_level;
 	var $outstanding_limit;
-	
+
 	/**
 	 * Min order amounts
 	 */
@@ -1315,8 +1315,9 @@ class Societe extends CommonObject
 
 				$result = 1;
 
-				// Retreive all extrafield for thirdparty
-			   	$this->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 			}
 			else
 			{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index d71f9a02a1f..c6ae3642bc9 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1215,12 +1215,9 @@ class SupplierProposal extends CommonObject
                     $this->brouillon = 1;
                 }
 
-                // Retreive all extrafield for invoice
+                // Retreive all extrafield
                 // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $this->fetch_optionals();
 
                 $this->db->free($resql);
 
@@ -1311,12 +1308,9 @@ class SupplierProposal extends CommonObject
                     return -1;
                 }
 
-                // Retreive all extrafield for askprice
+                // Retreive all extrafield
                 // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $this->fetch_optionals();
 
                 return 1;
             }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6a2a1b774e7..3fcdf411a24 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -324,12 +324,9 @@ class User extends CommonObject
 				// 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;
 
-				// Retreive all extrafield for thirdparty
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 				$this->db->free($result);
 			}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 2e0cd0376c6..5104d813a05 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -116,12 +116,9 @@ class UserGroup extends CommonObject
 					$this->members=$this->listUsersForGroup();
 
 
-				// Retreive all extrafield for group
+				// Retreive all extrafield
 				// fetch optionals attributes and labels
-				dol_include_once('/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$this->fetch_optionals();
 
 
 				// Sav current LDAP Current DN

From d3f848b7bc7b3a957bc522eba8aecd934467033e Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 21 Feb 2018 09:30:39 +0100
Subject: [PATCH 165/386] FIX: supplier credit notes: harmonize discount
 filters part 2

---
 htdocs/compta/facture/prelevement.php | 6 ++----
 htdocs/expedition/shipment.php        | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 6065ad9cd6f..01f2ff6aa27 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -290,9 +290,8 @@ if ($object->id > 0)
 		else
 		{
 			// Remise dispo de type non avoir
-			$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NULL':"fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$object->thirdparty->id,$absolute_discount,$filter,$resteapayer,'',1);
+			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$object->thirdparty->id,$absolute_discount,$filterabsolutediscount,$resteapayer,'',1);
 		}
 	}
 	if ($absolute_creditnote > 0)
@@ -310,9 +309,8 @@ if ($object->id > 0)
 		else
 		{
 			// Remise dispo de type avoir
-			$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NOT NULL':"fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
 			if (! $absolute_discount) print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id_for_payment',$object->thirdparty->id,$absolute_creditnote,$filter,$resteapayer,'',1);
+			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id_for_payment',$object->thirdparty->id,$absolute_creditnote,$filtercreditnote,$resteapayer,'',1);
 		}
 	}
 	if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index cf0cc1d6d24..7b0cca64a30 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -354,9 +354,8 @@ if ($id > 0 || ! empty($ref))
 			else
 			{
 				// Remise dispo de type non avoir
-				$filter=!empty($cong->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)?'fk_facture_source IS NULL':"fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter, 0, '', 1);
+				$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filterabsolutediscount, 0, '', 1);
 			}
 		}
 		if ($absolute_creditnote)

From cfdbef6bc30f38b8a945bb9e5a826d05854b66d0 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 21 Feb 2018 09:31:01 +0100
Subject: [PATCH 166/386] NEW: supplier credit notes: display supplier
 discounts in supplier card

---
 htdocs/fourn/card.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 588c13ca849..60f745d95c7 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -255,6 +255,28 @@ if ($object->id > 0)
 	}
 	print "</td>";
 	print '</tr>';
+
+	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		// 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 align="right">';
+		if ($user->rights->societe->creer && !$user->societe_id > 0)
+		{
+			print '<a 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('', '', 0, 1);
+		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>';
+	}
 	
 	print '<tr class="nowrap">';
 	print '<td>';

From 72c1357c9b822ab91b6ed5ad1a32992c8a21b0cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 11:02:45 +0100
Subject: [PATCH 167/386] NEW Section of files generated by mass action not
 visible if empty

---
 htdocs/admin/mails_senderprofile_list.php     | 28 +++++++---------
 htdocs/comm/propal/list.php                   | 25 ++++++---------
 htdocs/commande/list.php                      | 25 ++++++---------
 htdocs/compta/facture/list.php                | 24 ++++++--------
 htdocs/contrat/list.php                       | 26 ++++++---------
 htdocs/core/class/html.formfile.class.php     | 28 +++++++++-------
 htdocs/expensereport/list.php                 | 24 ++++++--------
 htdocs/fichinter/list.php                     | 25 ++++++---------
 htdocs/fourn/commande/list.php                | 32 ++++++++-----------
 htdocs/fourn/facture/list.php                 | 24 ++++++--------
 .../modulebuilder/template/myobject_list.php  | 28 +++++++---------
 htdocs/product/inventory/list.php             | 28 +++++++---------
 htdocs/product/stock/productlot_list.php      | 24 ++++++--------
 htdocs/societe/website.php                    | 28 +++++++---------
 htdocs/supplier_proposal/list.php             | 25 ++++++---------
 15 files changed, 163 insertions(+), 231 deletions(-)

diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 763e648746d..69d1d8a8cea 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -507,25 +507,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		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);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->monmodule->read;
-		$delallowed=$user->rights->monmodule->create;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_monmodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->monmodule->read;
+	$delallowed=$user->rights->monmodule->create;
+
+	print $formfile->showdocuments('massfilesarea_monmodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
 dol_fiche_end();
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index af67bd8107b..5de43a75b9d 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -892,25 +892,18 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-	     * Show list of available documents
-	     */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->propal->lire;
-		$delallowed=$user->rights->propal->creer;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->propal->lire;
+	$delallowed=$user->rights->propal->creer;
 
+	print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 13225c2c5d3..fe8461c3a41 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1101,25 +1101,18 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-	     * Show list of available documents
-	     */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->commande->lire;
-		$delallowed=$user->rights->commande->creer;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->commande->lire;
+	$delallowed=$user->rights->commande->creer;
 
+	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index fe26efd490e..5914f2f06e9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1192,22 +1192,18 @@ if ($resql)
 
 	print "</form>\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		// Show list of available documents
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->facture->lire;
-		$delallowed=$user->rights->facture->creer;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->facture->lire;
+	$delallowed=$user->rights->facture->creer;
+
+	print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index cdafbd6c2fd..babc31f7702 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -775,24 +775,18 @@ if ($resql)
 
 	print '</form>';
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-    	 * Show list of available documents
-    	 */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->contrat->lire;
-		$delallowed=$user->rights->contrat->lire;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->contrat->lire;
+	$delallowed=$user->rights->contrat->lire;
+
+	print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index eded41be053..b139483b610 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -277,17 +277,18 @@ class FormFile
 	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
 	 * 		@param		string				$morepicto			Add more HTML content into cell with picto
 	 *      @param      Object              $object             Object when method is called from an object card.
+	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
 	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
 	 */
-	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
+	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
 	{
 		// Deprecation warning
-		if (0 !== $iconPDF) {
+		if (! empty($iconPDF)) {
 			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
 		}
 
 		global $langs, $conf, $user, $hookmanager;
-		global $form, $bc;
+		global $form;
 
 		if (! is_object($form)) $form=new Form($this->db);
 
@@ -305,9 +306,17 @@ class FormFile
 		}
 
 		$hookmanager->initHooks(array('formfile'));
-		$forname='builddoc';
-		$out='';
 
+		// Get list of files
+		$file_list=null;
+		if (! empty($filedir))
+		{
+			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+		}
+		if ($hideifempty && empty($file_list)) return '';
+
+		$out='';
+		$forname='builddoc';
 		$headershown=0;
 		$showempty=0;
 		$i=0;
@@ -678,8 +687,6 @@ class FormFile
 		// Get list of files
 		if (! empty($filedir))
 		{
-			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
-
 			$link_list = array();
 			if (is_object($object))
 			{
@@ -949,7 +956,6 @@ class FormFile
 	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)
 	{
 		global $user, $conf, $langs, $hookmanager;
-		global $bc,$bcdd;
 		global $sortfield, $sortorder, $maxheightmini;
 		global $dolibarr_main_url_root;
 
@@ -1322,7 +1328,6 @@ class FormFile
 	function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
 	{
 		global $user, $conf, $langs, $form;
-		global $bc;
 		global $sortfield, $sortorder;
 		global $search_doc_ref;
 
@@ -1543,7 +1548,7 @@ class FormFile
 
 		if (count($filearray) == 0)
 		{
-			print '<tr '.$bc[false].'><td colspan="5">';
+			print '<tr class="oddeven"><td colspan="5">';
 			if (empty($textifempty)) print $langs->trans("NoFileFound");
 			else print $textifempty;
 			print '</td></tr>';
@@ -1600,7 +1605,6 @@ class FormFile
 	public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
 	{
 		global $user, $conf, $langs, $user;
-		global $bc;
 		global $sortfield, $sortorder;
 
 		$langs->load("link");
@@ -1712,7 +1716,7 @@ class FormFile
 		}
 		if ($nboflinks == 0)
 		{
-			print '<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">';
+			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
 			print $langs->trans("NoLinkFound");
 			print '</td></tr>';
 		}
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index caae068461a..097a912b6c1 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -831,22 +831,18 @@ if ($resql)
 
 	if (empty($id))
 	{
-		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-		{
-		    // Show list of available documents
-		    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		    $urlsource.=str_replace('&amp;','&',$param);
+		$hidegeneratedfilelistifempty=1;
+		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		    $filedir=$diroutputmassaction;
-		    $genallowed=$user->rights->expensereport->lire;
-		    $delallowed=$user->rights->expensereport->creer;
+		// Show list of available documents
+		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+		$urlsource.=str_replace('&amp;','&',$param);
 
-		    print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-		}
-		else
-		{
-		    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-		}
+		$filedir=$diroutputmassaction;
+		$genallowed=$user->rights->expensereport->lire;
+		$delallowed=$user->rights->expensereport->creer;
+
+		print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 	}
 }
 else
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 49cb1837d35..e046209a354 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -563,25 +563,18 @@ if ($resql)
 
 	print "</form>\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-	     * Show list of available documents
-	     */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->ficheinter->lire;
-		$delallowed=$user->rights->ficheinter->creer;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_interventions','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->ficheinter->lire;
+	$delallowed=$user->rights->ficheinter->creer;
 
+	print $formfile->showdocuments('massfilesarea_interventions','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 0b45f2d63a0..f3deb4b12a3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1176,26 +1176,20 @@ if ($resql)
 	print '</div>';
 	print "</form>\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-	     * Show list of available documents
-	     */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
-
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->fournisseur->commande->lire;
-		$delallowed=$user->rights->fournisseur->commande->creer;
-
-		print $formfile->showdocuments('massfilesarea_supplier_order','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
-
 	$db->free($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);
+
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->fournisseur->commande->lire;
+	$delallowed=$user->rights->fournisseur->commande->creer;
+
+	print $formfile->showdocuments('massfilesarea_supplier_order','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 31d6ba2f183..1e056292517 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1098,22 +1098,18 @@ if ($resql)
 	print "</form>\n";
 
 	/*
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-    {
-        // Show list of available documents
-        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-        $urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-        $filedir=$diroutputmassaction;
-        $genallowed=$user->rights->facture->lire;
-        $delallowed=$user->rights->facture->creer;
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
 
-        print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-    }
-    else
-    {
-        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-    }
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->facture->lire;
+    $delallowed=$user->rights->facture->creer;
+
+    print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
     */
 }
 else
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 23a748a12dc..72715ec27f1 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -542,25 +542,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
-		$formfile = new FormFile($db);
+	$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);
+	require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+	$formfile = new FormFile($db);
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->mymodule->read;
-		$delallowed=$user->rights->mymodule->create;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->mymodule->read;
+	$delallowed=$user->rights->mymodule->create;
+
+	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/product/inventory/list.php b/htdocs/product/inventory/list.php
index cb67168b214..f9fef88edce 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -494,25 +494,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
-		$formfile = new FormFile($db);
+	$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);
+	require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+	$formfile = new FormFile($db);
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->mymodule->read;
-		$delallowed=$user->rights->mymodule->create;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->mymodule->read;
+	$delallowed=$user->rights->mymodule->create;
+
+	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/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 5934e8dff55..76d70c1ad10 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -537,22 +537,18 @@ if ($resql)
 	print '</form>'."\n";
 
 	/*
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-	    // Show list of available documents
-	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-	    $urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-	    $filedir=$diroutputmassaction;
-	    $genallowed=$user->rights->facture->lire;
-	    $delallowed=$user->rights->facture->creer;
+    // Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->facture->lire;
+	$delallowed=$user->rights->facture->creer;
+
+	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 	*/
 }
 else
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index ef990a7e4f0..9e57176250a 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -525,25 +525,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
-		$formfile = new FormFile($db);
+	$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);
+	require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+	$formfile = new FormFile($db);
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->mymodule->read;
-		$delallowed=$user->rights->mymodule->create;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$filedir=$diroutputmassaction;
+	$genallowed=$user->rights->mymodule->read;
+	$delallowed=$user->rights->mymodule->create;
+
+	print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index abf9f9cfd2a..1a7d248f83f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -858,26 +858,19 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		/*
-	     * Show list of available documents
-	     */
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+	$hidegeneratedfilelistifempty=1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-		$filedir=$diroutputmassaction;
+	// Show list of available documents
+	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource.=str_replace('&amp;','&',$param);
 
-		$genallowed=$user->rights->supplier_proposal->lire;
-		$delallowed=$user->rights->supplier_proposal->creer;
+	$filedir=$diroutputmassaction;
 
-		print $formfile->showdocuments('massfilesarea_supplier_proposal','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+	$genallowed=$user->rights->supplier_proposal->lire;
+	$delallowed=$user->rights->supplier_proposal->creer;
 
+	print $formfile->showdocuments('massfilesarea_supplier_proposal','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 else
 {

From aac59f3e2114436146e02452818114e3a98f4e33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 11:09:17 +0100
Subject: [PATCH 168/386] Fix escaping

---
 .../class/accountancycategory.class.php            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index dae58bf1520..92d0f9e4499 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -92,7 +92,7 @@ class AccountancyCategory 	// extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_accounting_category(";
-		$sql.= "rowid,";
+		if ($this->rowid > 0) $sql.= "rowid,";
 		$sql.= "code,";
 		$sql.= "label,";
 		$sql.= "range_account,";
@@ -103,16 +103,16 @@ class AccountancyCategory 	// extends CommonObject
 		$sql.= "fk_country,";
 		$sql.= "active";
 		$sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").",";
+		if ($this->rowid > 0) $sql.= " ".$this->rowid.",";
 		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
 		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
 		$sql.= " ".(! isset($this->range_account)?'NULL':"'".$this->db->escape($this->range_account)."'").",";
-		$sql.= " ".(! isset($this->sens)?'NULL':"'".$this->sens."'").",";
-		$sql.= " ".(! isset($this->category_type)?'NULL':"'".$this->category_type."'").",";
+		$sql.= " ".(! isset($this->sens)?'NULL':"'".$this->db->escape($this->sens)."'").",";
+		$sql.= " ".(! isset($this->category_type)?'NULL':"'".$this->db->escape($this->category_type)."'").",";
 		$sql.= " ".(! isset($this->formula)?'NULL':"'".$this->db->escape($this->formula)."'").",";
-		$sql.= " ".(! isset($this->position)?'NULL':"'".$this->position."'").",";
-		$sql.= " ".(! isset($this->fk_country)?'NULL':"'".$this->fk_country."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'")."";
+		$sql.= " ".(! isset($this->position)?'NULL':$this->db->escape($this->position)).",";
+		$sql.= " ".(! isset($this->fk_country)?'NULL':$this->db->escape($this->fk_country)).",";
+		$sql.= " ".(! isset($this->active)?'NULL':$this->db->escape($this->active));
 		$sql.= ")";
 
 		$this->db->begin();

From 0ff148da1f0331fabe5d79b5e015ffbf67916491 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 11:22:27 +0100
Subject: [PATCH 169/386] Fix import of chart account

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

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 059118e2663..9bad202251e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -251,10 +251,10 @@ 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.pcg_subtype'=>'Pcgsubtype*','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'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
         $this->import_convertvalue_array[$r]=array(
-	        'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountingCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+	        'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
 	        'aa.account_parent'=>array('rule'=>'zeroifnull'),
         );
-        $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"SALES","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+        $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
 
 	}
 }

From 423918b9ffd62b99cbe3b6de33d5e72eeba56186 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 11:41:52 +0100
Subject: [PATCH 170/386] Include notrigger

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9d40001ad50..e7bae75c3ed 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -261,9 +261,10 @@ 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
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function activateAll($user, $date_start='')
+	function activateAll($user, $date_start='', $notrigger=0)
 	{
 		if (empty($date_start)) $date_start = dol_now();
 
@@ -294,7 +295,7 @@ class Contrat extends CommonObject
 
 		if (! $error && $this->statut == 0)
 		{
-			$result=$this->validate($user);
+			$result=$this->validate($user, '', $notrigger);
 			if ($result < 0) $error++;
 		}
 

From b4446764f864c538b21233bd36e81c7e1a5c811d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 14:48:25 +0100
Subject: [PATCH 171/386] Clean code of deprecated usage

---
 htdocs/adherents/card.php                     |  4 +-
 htdocs/adherents/type.php                     |  4 +-
 htdocs/categories/viewcat.php                 | 11 +++--
 htdocs/comm/action/card.php                   |  2 +-
 htdocs/comm/action/document.php               |  2 +-
 htdocs/comm/propal/card.php                   |  2 +-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/commande/class/commande.class.php      |  4 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/contact/agenda.php                     |  3 +-
 htdocs/contact/card.php                       |  3 +-
 htdocs/contrat/card.php                       |  4 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 .../core/class/commondocgenerator.class.php   | 10 ++--
 htdocs/core/class/commonobject.class.php      |  5 +-
 htdocs/core/class/html.formmail.class.php     |  2 +-
 htdocs/core/lib/functions.lib.php             |  2 +-
 .../doc/doc_generic_project_odt.modules.php   | 14 +++---
 .../task/doc/doc_generic_task_odt.modules.php |  4 +-
 htdocs/don/card.php                           |  4 +-
 htdocs/expedition/card.php                    | 10 ++--
 htdocs/expedition/shipment.php                |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 htdocs/fichinter/card.php                     |  4 +-
 htdocs/fourn/commande/card.php                |  2 +-
 htdocs/hrm/establishment/card.php             | 48 +++++++++----------
 htdocs/livraison/card.php                     |  6 +--
 .../modulebuilder/template/myobject_card.php  |  2 +-
 .../class/price_parser.class.php              |  2 +-
 htdocs/product/inventory/card.php             |  2 +-
 htdocs/product/stock/productlot_card.php      |  2 +-
 htdocs/projet/card.php                        |  2 +-
 htdocs/projet/tasks.php                       |  2 +-
 htdocs/projet/tasks/comment.php               |  2 +-
 htdocs/projet/tasks/task.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  4 +-
 htdocs/public/members/public_card.php         |  2 +-
 htdocs/resource/class/dolresource.class.php   |  2 +-
 htdocs/societe/card.php                       |  4 +-
 htdocs/societe/contact.php                    |  2 +-
 htdocs/supplier_proposal/card.php             |  2 +-
 .../class/supplier_proposal.class.php         |  2 +-
 htdocs/user/card.php                          |  2 +-
 htdocs/webservices/server_actioncomm.php      |  2 +-
 htdocs/webservices/server_contact.php         |  2 +-
 .../webservices/server_productorservice.php   |  4 +-
 htdocs/webservices/server_project.php         |  2 +-
 htdocs/webservices/server_thirdparty.php      |  2 +-
 htdocs/website/websiteaccount_card.php        |  2 +-
 51 files changed, 108 insertions(+), 106 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 73f207abe91..65f9c65e641 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1003,7 +1003,7 @@ else
 		if ($res < 0) {
 			dol_print_error($db,$object->error); exit;
 		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
+		$res=$object->fetch_optionals();
 		if ($res < 0) {
 			dol_print_error($db); exit;
 		}
@@ -1272,7 +1272,7 @@ else
 		if ($res < 0) {
 			dol_print_error($db,$object->error); exit;
 		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
+		$res=$object->fetch_optionals();
 		if ($res < 0) {
 			dol_print_error($db); exit;
 		}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index cc9fd872062..142fdb300e2 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -361,7 +361,7 @@ if ($rowid > 0)
 	{
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
-		$object->fetch_optionals($object->id,$extralabels);
+		$object->fetch_optionals();
 
 		/*
 		 * Confirmation suppression
@@ -692,7 +692,7 @@ if ($rowid > 0)
 	{
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
-		$object->fetch_optionals($object->id,$extralabels);
+		$object->fetch_optionals();
 
 		$head = member_type_prepare_head($object);
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 1f7b41df085..f6a0417bbda 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -53,11 +53,12 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
 $result=$object->fetch($id, $label);
-$object->fetch_optionals($id,$extralabels);
-if ($result <= 0)
-{
-	dol_print_error($db,$object->error);
-	exit;
+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;
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b89263bae01..2f59df43803 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -934,7 +934,7 @@ if ($id > 0)
 	$result2=$object->fetch_projet();
 	$result3=$object->fetch_contact();
 	$result4=$object->fetch_userassigned();
-	$result5=$object->fetch_optionals($id,$extralabels);
+	$result5=$object->fetch_optionals();
 
 	if ($listUserAssignedUpdated || $donotclearsession)
 	{
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 46efeb95a54..1bbe5ddc6fc 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -100,7 +100,7 @@ if ($object->id > 0)
 	$result2=$object->fetch_thirdparty();
 	$result3=$object->fetch_contact();
 	$result4=$object->fetch_userassigned();
-	$result5=$object->fetch_optionals($id,$extralabels);
+	$result5=$object->fetch_optionals();
 
 	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
 	{
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9c72170b880..380edc5a472 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -505,7 +505,7 @@ if (empty($reshook))
 
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals($lines[$i]->rowid);
+											$lines[$i]->fetch_optionals();
 											$array_options = $lines[$i]->array_options;
 										}
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1380b02d339..2b714bbeff8 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1210,7 +1210,7 @@ class Propal extends CommonObject
 
 		// get extrafields so they will be clone
 		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+			$line->fetch_optionals();
 
 		// Load dest object
 		$clonedObj = clone $this;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 54c7db7d6ca..21975439872 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1804,7 +1804,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
-		$res = $object->fetch_optionals($object->id, $extralabels);
+		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f89bcf534a2..b7ba839b144 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1024,7 +1024,7 @@ class Commande extends CommonOrder
 
 		// get lines so they will be clone
 		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+			$line->fetch_optionals();
 
         // Load source object
         $objFrom = clone $this;
@@ -1145,7 +1145,7 @@ class Commande extends CommonOrder
 			$line->marque_tx		= $marginInfos[2];
 
             // get extrafields from original line
-			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
+			$object->lines[$i]->fetch_optionals();
 			foreach($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 84b61817a28..7a08cc6c97e 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -501,7 +501,7 @@ class FactureRec extends CommonInvoice
 				$line->price            = $objp->price;
 				$line->remise           = $objp->remise;
 
-				$extralabelsline = $line->fetch_optionals($line->id,$extrafieldsline);
+				$extralabelsline = $line->fetch_optionals($line->id);
 
 				// Multicurrency
 				$line->fk_multicurrency 		= $objp->fk_multicurrency;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index aba627dd8a2..0c48a4336d4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1031,7 +1031,7 @@ class Facture extends CommonInvoice
 			$line->pa_ht			= $marginInfos[0];
 
             // get extrafields from original line
-			$object->lines[$i]->fetch_optionals($object->lines[$i]->rowid);
+			$object->lines[$i]->fetch_optionals();
 			foreach($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
 
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index c885f0869de..c513db1b49f 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -190,7 +190,8 @@ else
         $object = new Contact($db);
         $res=$object->fetch($id, $user);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
-        $res=$object->fetch_optionals($object->id,$extralabels);
+        $res=$object->fetch_optionals();
+        if ($res < 0) { dol_print_error($db,$object->error); exit; }
 
         // Show tabs
         $head = contact_prepare_head($object);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 9c35714dcd5..7d024e6f096 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -468,7 +468,8 @@ else
         $object = new Contact($db);
         $res=$object->fetch($id, $user);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
-        $res=$object->fetch_optionals($object->id,$extralabels);
+        $res=$object->fetch_optionals();
+        if ($res < 0) { dol_print_error($db,$object->error); exit; }
 
         // Show tabs
         $head = contact_prepare_head($object);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 0bbb509b7fa..d74c677f018 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1709,7 +1709,7 @@ else
 					if (is_array($extralabelslines) && count($extralabelslines)>0) {
 						print '<tr '.$bcnd[$var].'>';
 						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid,$extralabelslines);
+						$line->fetch_optionals($objp->rowid);
 						print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcnd[$var], 'colspan'=>$colspan));
 						print '</tr>';
 					}
@@ -1783,7 +1783,7 @@ else
 					if (is_array($extralabelslines) && count($extralabelslines)>0) {
 						print '<tr '.$bcnd[$var].'>';
 						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid,$extralabelslines);
+						$line->fetch_optionals($objp->rowid);
 						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$colspan));
 						print '</tr>';
 					}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e7bae75c3ed..0b84b05b6fd 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -795,7 +795,7 @@ class Contrat extends CommonObject
 
 				// Retreive all extrafield for contract
 				// fetch optionals attributes and labels
-				$line->fetch_optionals($line->id,$extralabelsline);
+				$line->fetch_optionals();
 
 				$this->lines[$pos]			= $line;
 				$this->lines_id_index_mapper[$line->id] = $pos;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index aeca3d5a102..c9c250ee1fa 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -203,7 +203,7 @@ abstract class CommonDocGenerator
         	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         	$extrafields = new ExtraFields($this->db);
         	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
-        	$object->fetch_optionals($object->id,$extralabels);
+        	$object->fetch_optionals();
 
         	foreach($extrafields->attribute_label as $key=>$label)
         	{
@@ -274,7 +274,7 @@ abstract class CommonDocGenerator
 		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
-		$object->fetch_optionals($object->id, $extralabels);
+		$object->fetch_optionals();
 
 		foreach($extrafields->attribute_label as $key => $label)
 		{
@@ -457,7 +457,7 @@ abstract class CommonDocGenerator
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals($object->id,$extralabels);
+			$object->fetch_optionals();
 
 			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 		}
@@ -524,7 +524,7 @@ abstract class CommonDocGenerator
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-		$line->fetch_optionals($line->rowid,$extralabels);
+		$line->fetch_optionals();
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
 
@@ -592,7 +592,7 @@ abstract class CommonDocGenerator
     		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
     		$extrafields = new ExtraFields($this->db);
     		$extralabels = $extrafields->fetch_name_optionals_label('shipment',true);
-    		$object->fetch_optionals($object->id,$extralabels);
+    		$object->fetch_optionals();
 
     		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
     	}*/
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 07993bb1d97..f69e842ec81 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3670,8 +3670,7 @@ abstract class CommonObject
 		foreach ($this->lines as $line)
 		{
 			//Line extrafield
-			$line->fetch_optionals($line->id,$extralabelslines);
-
+			$line->fetch_optionals();
 
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
@@ -4498,7 +4497,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			dol_syslog("Warning: fetch_optionals was called with param $optionsArray defined when you should pass null now", LOG_WARNING);
+			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
 
 		$table_element = $this->table_element;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 94ab828ee39..6e25c1ca730 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1185,7 +1185,7 @@ class FormMail extends Form
 					$extralabels = $extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
-					$product->fetch_optionals($product->id, $extralabels);
+					$product->fetch_optionals();
 					foreach ($extrafields->attribute_label as $key => $label) {
 						$substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
 					}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0cc2fb0446f..ce95f2912c8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5806,7 +5806,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 			{
 				$extrafieldstmp = new ExtraFields($db);
 				$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
-				$object->fetch_optionals($object->id, $extralabels);
+				$object->fetch_optionals();
 				foreach ($extrafieldstmp->attribute_label as $key => $label) {
 					$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
 				}
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 be4f5898f85..35e8ace270e 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
@@ -136,10 +136,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-		$object->fetch_optionals($object->id,$extralabels);
+		$object->fetch_optionals();
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		
+
 		return $resarray;
 	}
 
@@ -198,18 +198,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		if ($contact['source']=='external') {
 			$ret[$pc.'isInternal'] = ''; // not internal
-			
+
 			$ct = new Contact($this->db);
 			$ct->fetch($contact['id']);
 			$ret[$pc.'phone_pro'] = $ct->phone_pro;
 			$ret[$pc.'phone_perso'] = $ct->phone_perso;
 			$ret[$pc.'phone_mobile'] = $ct->phone_mobile;
-			
+
 			// fetch external user extrafields
 			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 			$extrafields=new ExtraFields($this->db);
 			$extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
-			$extrafields_num = $ct->fetch_optionals($ct->id, $extralabels);
+			$extrafields_num = $ct->fetch_optionals();
 			//dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
 			foreach($ct->array_options as $efkey => $efval) {
 				dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
@@ -217,7 +217,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 			}
 		} elseif ($contact['source']=='internal') {
 			$ret[$pc.'isInternal'] = '1'; // this is an internal user
-		
+
 			$ct = new User($this->db);
 			$ct->fetch($contact['id']);
 			$ret[$pc.'phone_pro'] = $ct->office_phone;
@@ -1067,7 +1067,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 17e08dd4fd3..c846d7f6a23 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
@@ -139,7 +139,7 @@ class doc_generic_task_odt extends ModelePDFTask
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals($object->id,$extralabels);
+			$object->fetch_optionals();
 
 			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 		}
@@ -830,7 +830,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 01164c47508..3d0e9e9623a 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -411,7 +411,7 @@ if (! empty($id) && $action == 'edit')
 	if ($result < 0) {
 		dol_print_error($db,$object->error); exit;
 	}
-	$result=$object->fetch_optionals($object->id,$extralabels);
+	$result=$object->fetch_optionals();
 	if ($result < 0) {
 		dol_print_error($db); exit;
 	}
@@ -539,7 +539,7 @@ if (! empty($id) && $action != 'edit')
 	if ($result < 0) {
 		dol_print_error($db,$object->error); exit;
 	}
-	$result=$object->fetch_optionals($object->id,$extralabels);
+	$result=$object->fetch_optionals();
 	if ($result < 0) {
 		dol_print_error($db); exit;
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8fc21e0653e..82d6c746640 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1068,7 +1068,7 @@ if ($action == 'create')
 				// copy from order
 				$orderExtrafields = new Extrafields($db);
 				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
-				if ($object->fetch_optionals($object->id, $orderExtrafieldLabels) > 0) {
+				if ($object->fetch_optionals() > 0) {
 					$expe->array_options = array_merge($expe->array_options, $object->array_options);
 				}
 				print $object->showOptionals($extrafields, 'edit');
@@ -1605,9 +1605,9 @@ if ($action == 'create')
 					$orderLineExtrafields = new Extrafields($db);
 					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
 					$srcLine = new OrderLine($db);
-					$srcLine->fetch_optionals($line->id,$orderLineExtrafieldLabels); // fetch extrafields also available in orderline
+					$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
 					$line = new ExpeditionLigne($db);
-					$line->fetch_optionals($object->id,$extralabelslines);
+					$line->fetch_optionals($line->id);
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
@@ -1661,7 +1661,7 @@ else if ($id || $ref)
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
 
-		$res = $object->fetch_optionals($object->id, $extralabels);
+		$res = $object->fetch_optionals();
 
 		$head=shipping_prepare_head($object);
 		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
@@ -2451,7 +2451,7 @@ else if ($id || $ref)
 			if (is_array($extralabelslines) && count($extralabelslines)>0) {
 				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
 				$line = new ExpeditionLigne($db);
-				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
+				$line->fetch_optionals($lines[$i]->id);
 				print '<tr class="oddeven">';
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index d172d1034ca..0141fc1dea5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -247,7 +247,7 @@ if ($id > 0 || ! empty($ref))
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
-		$res = $object->fetch_optionals($object->id, $extralabels);
+		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 59c8b719d4e..a71ba9762b6 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1434,7 +1434,7 @@ else
 	{
 		$result = $object->fetch($id, $ref);
 
-		$res = $object->fetch_optionals($object->id, $extralabels);
+		$res = $object->fetch_optionals();
 
 		if ($result > 0)
 		{
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index e7839f66da2..3eddb02c28b 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1476,7 +1476,7 @@ else if ($id > 0 || ! empty($ref))
 					$extrafieldsline = new ExtraFields($db);
 					$extralabelslines=$extrafieldsline->fetch_name_optionals_label($line->table_element);
 
-					$line->fetch_optionals($line->rowid, $extralabelslines);
+					$line->fetch_optionals();
 
 					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>5));
 
@@ -1521,7 +1521,7 @@ else if ($id > 0 || ! empty($ref))
 
 					$extrafieldsline = new ExtraFields($db);
 					$extralabelslines=$extrafieldsline->fetch_name_optionals_label($line->table_element);
-					$line->fetch_optionals($line->rowid, $extralabelslines);
+					$line->fetch_optionals();
 
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>5));
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index da3f79d94d0..15148cbcc2a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1642,7 +1642,7 @@ elseif (! empty($object->id))
 	$author	= new User($db);
 	$author->fetch($object->user_author_id);
 
-	$res=$object->fetch_optionals($object->id,$extralabels);
+	$res=$object->fetch_optionals();
 
 
 	$head = ordersupplier_prepare_head($object);
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 3a08ae197a2..6180393e1df 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -93,7 +93,7 @@ else if ($action == 'add')
 			$object->fk_user_author	= $user->id;
 			$object->datec			= dol_now();
 
-			
+
 
 			$id = $object->create($user);
 
@@ -123,7 +123,7 @@ else if ($action == 'add')
 else if ($action == 'update')
 {
 	$error = 0;
-	
+
 	if (! $cancel) {
 
 		$name = GETPOST('name', 'alpha');
@@ -132,7 +132,7 @@ else if ($action == 'update')
 			$error ++;
 		}
 
-		if (empty($error)) 
+		if (empty($error))
 		{
 			$object->name 			= GETPOST('name', 'alpha');
 			$object->address 		= GETPOST('address', 'alpha');
@@ -141,7 +141,7 @@ else if ($action == 'update')
 			$object->country_id     = GETPOST('country_id', 'int');
 			$object->fk_user_mod	= $user->id;
 			$object->status         = GETPOST('status','int');
-			
+
 			$result = $object->update($user);
 
             if ($result > 0)
@@ -201,18 +201,18 @@ if ($action == 'create')
 	print '<td>';
 	print $formcompany->select_ziptown(GETPOST('zipcode', 'alpha'), 'zipcode', array (
 			'town',
-			'selectcountry_id' 
+			'selectcountry_id'
 	), 6);
 	print '</td>';
 	print '</tr>';
-	
+
 	// Town
 	print '<tr>';
 	print '<td>'.fieldLabel('Town','town',0).'</td>';
 	print '<td>';
 	print $formcompany->select_ziptown(GETPOST('town', 'alpha'), 'town', array (
 			'zipcode',
-			'selectcountry_id' 
+			'selectcountry_id'
 	));
 	print '</td>';
 	print '</tr>';
@@ -234,7 +234,7 @@ if ($action == 'create')
     print '</td></tr>';
 
     print '</table>';
-	
+
 	dol_fiche_end();
 
     print '<div class="center">';
@@ -286,12 +286,12 @@ if (($id || $ref) && $action == 'edit')
 			print '<tr><td>'.fieldLabel('Zip','zipcode',0).'</td><td>';
 			print $formcompany->select_ziptown($object->zip, 'zipcode', array (
 					'town',
-					'selectcountry_id' 
+					'selectcountry_id'
 			), 6) . '</tr>';
 			print '<tr><td>'.fieldLabel('Town','town',0).'</td><td>';
 			print $formcompany->select_ziptown($object->town, 'town', array (
 					'zipcode',
-					'selectcountry_id' 
+					'selectcountry_id'
 			)) . '</td></tr>';
 
 			// Country
@@ -300,7 +300,7 @@ if (($id || $ref) && $action == 'edit')
 			print $form->select_country($object->fk_country,'country_id');
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 			print '</td>';
-			print '</tr>';			
+			print '</tr>';
 
 			// Status
 			print '<tr><td>'.fieldLabel('Status','status',1).'</td><td>';
@@ -325,11 +325,11 @@ if (($id || $ref) && $action == 'edit')
 
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals($object->id, $extralabels);
-    
+    $res = $object->fetch_optionals();
+
     $head = establishment_prepare_head($object);
     dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
-    
+
     // Confirmation to delete
     if ($action == 'delete')
     {
@@ -337,22 +337,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     }
 
-	
+
 	// Object card
 	// ------------------------------------------------------------
-	
+
 	$linkback = '<a href="' . DOL_URL_ROOT . '/hrm/admin/admin_establishment.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
     $morehtmlref.='</div>';
-	
+
     dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', $morehtmlref);
-    
-    
+
+
     print '<div class="fichecenter">';
     //print '<div class="fichehalfleft">';
     print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent">'."\n"; 
+    print '<table class="border centpercent">'."\n";
 
 	// Name
 	print '<tr>';
@@ -393,9 +393,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     print '</table>';
     print '</div>';
-    
+
     print '<div class="clearboth"></div><br>';
-    
+
     dol_fiche_end();
 
     /*
@@ -407,6 +407,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
     print '</div>';
 }
- 
+
 llxFooter();
 $db->close();
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 41091b36e08..b2218508ef6 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -571,7 +571,7 @@ else
 				// copy from expedition
 				$expeditionExtrafields = new Extrafields($db);
 				$expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element);
-				if ($expedition->fetch_optionals($object->origin_id, $expeditionExtrafieldLabels) > 0) {
+				if ($expedition->fetch_optionals($object->origin_id) > 0) {
 					$object->array_options = array_merge($object->array_options, $expedition->array_options);
 				}
 			}
@@ -674,12 +674,12 @@ else
 					$colspan=2;
 					$mode = ($object->statut == 0) ? 'edit' : 'view';
 					$line = new LivraisonLigne($db);
-					$line->fetch_optionals($object->lines[$i]->id,$extralabelslines);
+					$line->fetch_optionals($object->lines[$i]->id);
 					if ($action = 'create_delivery') {
 						$srcLine = new ExpeditionLigne($db);
 						$expeditionLineExtrafields = new Extrafields($db);
 						$expeditionLineExtrafieldLabels = $expeditionLineExtrafields->fetch_name_optionals_label($srcLine->table_element);
-						$srcLine->fetch_optionals($expedition->lines[$i]->id,$expeditionLineExtrafieldLabels);
+						$srcLine->fetch_optionals($expedition->lines[$i]->id);
 						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 					}
 					print '<tr class="oddeven">';
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index bc1e9fc7d51..a82ec237006 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -228,7 +228,7 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals($object->id, $extralabels);
+    $res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index c281816e99b..fc986a9e051 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -156,7 +156,7 @@ class PriceParser
 		//Retrieve all extrafield for product and add it to values
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label('product', true);
-		$product->fetch_optionals($product->id, $extralabels);
+		$product->fetch_optionals();
 		foreach ($extrafields->attribute_label as $key=>$label)
 		{
 			$values["extrafield_".$key] = $product->array_options['options_'.$key];
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index e393721c47d..84db46c879f 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -194,7 +194,7 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals($object->id, $extralabels);
+    $res = $object->fetch_optionals();
 
     $head = inventoryPrepareHead($object);
 	dol_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'inventory');
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 1d9a7420740..8e639c90108 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -305,7 +305,7 @@ if ($action == 'create')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-	$res = $object->fetch_optionals($object->id, $extralabels);
+	$res = $object->fetch_optionals();
 
     //print load_fiche_titre($langs->trans("Batch"));
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index ddfa1733f8c..71be9b5d4a3 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -660,7 +660,7 @@ elseif ($object->id > 0)
      * Show or edit
      */
 
-	$res=$object->fetch_optionals($object->id,$extralabels);
+	$res=$object->fetch_optionals();
 
 	// To verify role of users
 	$userAccess = $object->restrictedProjectArea($user,'read');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 47de9ce2b19..11367951976 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref))
 {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
-	$res=$object->fetch_optionals($object->id,$extralabels_projet);
+	$res=$object->fetch_optionals();
 
 
 	// To verify role of users
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 49072299ac4..fb553a1b837 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
 {
 	if ($object->fetch($id,$ref) > 0)
 	{
-		$res=$object->fetch_optionals($object->id,$extralabels);
+		$res=$object->fetch_optionals();
 
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 479366ab586..3d1ccfb8fe1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref))
 {
 	if ($object->fetch($id,$ref) > 0)
 	{
-		$res=$object->fetch_optionals($object->id,$extralabels);
+		$res=$object->fetch_optionals();
 
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ce2e1c32889..49e917e4b61 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -288,13 +288,13 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     {
         $result=$projectstatic->fetch($projectidforalltimes);
         if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-        $res=$projectstatic->fetch_optionals($object->id,$extralabels_projet);
+        $res=$projectstatic->fetch_optionals();
     }
     elseif ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-		$res=$projectstatic->fetch_optionals($object->id,$extralabels_projet);
+		$res=$projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
     }
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 8f28cd12827..f21a4d1a338 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -77,7 +77,7 @@ if ($id > 0)
 {
 	$res=$object->fetch($id);
 	if ($res < 0) { dol_print_error($db,$object->error); exit; }
-	$res=$object->fetch_optionals($object->id,$extralabels);
+	$res=$object->fetch_optionals();
 
 	print load_fiche_titre($langs->trans("MemberCard"), '', '');
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index c7126c6d3bb..7db33a9bfae 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -566,7 +566,7 @@ class Dolresource extends CommonObject
     				// Retreive all extrafield for thirdparty
     				// fetch optionals attributes and labels
 
-    				$line->fetch_optionals($line->id,$extralabels);
+    				$line->fetch_optionals();
 
     				$this->lines[] = $line;
     			}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b48c80a7a24..362834b316d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1418,7 +1418,7 @@ else
 
         if ($socid)
         {
-        	$res=$object->fetch_optionals($object->id,$extralabels);
+        	$res=$object->fetch_optionals();
             //if ($res < 0) { dol_print_error($db); exit; }
 
 	        $head = societe_prepare_head($object);
@@ -2011,7 +2011,7 @@ else
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
+        if (!empty($object->id)) $res=$object->fetch_optionals();
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index d57f61045c0..32575beb8c7 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -150,7 +150,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 else
 {
 
-    if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
+    if (!empty($object->id)) $res=$object->fetch_optionals();
     //if ($res < 0) { dol_print_error($db); exit; }
 
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 440551bd925..c4f5c5c6ba9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -358,7 +358,7 @@ if (empty($reshook))
 
 									// Extrafields
 									if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-										$lines[$i]->fetch_optionals($lines[$i]->rowid);
+										$lines[$i]->fetch_optionals();
 										$array_options = $lines[$i]->array_options;
 									}
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index c6ae3642bc9..91eff1b5a8a 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1042,7 +1042,7 @@ class SupplierProposal extends CommonObject
 
 		// get extrafields so they will be clone
 		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+			$line->fetch_optionals();
 
 		// Load source object
 		$objFrom = clone $this;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ba327e7c9f1..aa169253fb3 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1176,7 +1176,7 @@ else
 	{
 		$object->fetch($id, '', '', 1);
 		if ($res < 0) { dol_print_error($db,$object->error); exit; }
-		$res=$object->fetch_optionals($object->id,$extralabels);
+		$res=$object->fetch_optionals();
 
 		// Check if user has rights
 		$object->getrights();
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 4f0081551ca..a00e014d88a 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -306,7 +306,7 @@ function getActionComm($authentication,$id)
 			        	$extrafields=new ExtraFields($db);
 			        	$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
 			        	//Get extrafield values
-			        	$actioncomm->fetch_optionals($actioncomm->id,$extralabels);
+			        	$actioncomm->fetch_optionals();
 
 			        	foreach($extrafields->attribute_label as $key=>$label)
 			        	{
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index fe4fcc3378f..6791864ba8b 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -311,7 +311,7 @@ function getContact($authentication,$id,$ref_ext)
             	$extrafields=new ExtraFields($db);
             	$extralabels=$extrafields->fetch_name_optionals_label('socpeople',true);
             	//Get extrafield values
-            	$contact->fetch_optionals($contact->id,$extralabels);
+            	$contact->fetch_optionals();
 
             	foreach($extrafields->attribute_label as $key=>$label)
             	{
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 00dcd2fe4fc..c4c4d40191e 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -425,7 +425,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
             	$extrafields=new ExtraFields($db);
             	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
             	//Get extrafield values
-            	$product->fetch_optionals($product->id,$extralabels);
+            	$product->fetch_optionals();
 
             	foreach($extrafields->attribute_label as $key=>$label)
             	{
@@ -1096,7 +1096,7 @@ function getProductsForCategory($authentication,$id,$lang='')
 							$extrafields=new ExtraFields($db);
 							$extralabels=$extrafields->fetch_name_optionals_label('product',true);
 							//Get extrafield values
-							$obj->fetch_optionals($obj->id,$extralabels);
+							$obj->fetch_optionals();
 
 							foreach($extrafields->attribute_label as $key=>$label)
 							{
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 9e10b0212ec..bc26de37601 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -377,7 +377,7 @@ function getProject($authentication,$id='',$ref='')
                 $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
 
                 //Get extrafield values
-                $project->fetch_optionals($project->id,$extralabels);
+                $project->fetch_optionals();
                 foreach($extrafields->attribute_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_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 8e358e21924..c2236368d18 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -357,7 +357,7 @@ function getThirdParty($authentication,$id='',$ref='',$ref_ext='')
 				$extrafields=new ExtraFields($db);
 				$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
 				//Get extrafield values
-				$thirdparty->fetch_optionals($thirdparty->id,$extralabels);
+				$thirdparty->fetch_optionals();
 
 				foreach($extrafields->attribute_label as $key=>$label)
 				{
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 9918b0b3022..8daab76e38c 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -221,7 +221,7 @@ 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($object->id, $extralabels);
+    $res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');

From 34d84c6d5dde9c664fed7c8726f9df75ed8be61a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 21 Feb 2018 17:15:16 +0100
Subject: [PATCH 172/386] FIX: supplier credit notes: display link to discount
 in supplier credit note card

---
 htdocs/fourn/facture/card.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0344890458b..c1c04489f1d 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2409,6 +2409,13 @@ else
             $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(), $discount->getNomUrl(1, 'discount')).'<br>';
+            }
+        }
         print '</td></tr>';
 
         if ($conf->global->MAIN_FEATURES_LEVEL > 0) {

From 876ea3198f735e511a8d1aa47680a908c256065e Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 21 Feb 2018 17:51:44 +0100
Subject: [PATCH 173/386] FIX: handle type in supplier invoice list

---
 htdocs/fourn/facture/list.php | 49 ++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 31d6ba2f183..75dee1422d2 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -76,6 +76,7 @@ $search_amount_all_tax = GETPOST("search_amount_all_tax","alpha");
 $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
 $search_refsupplier=GETPOST('search_refsupplier','alpha');
+$search_type=GETPOST('search_type','int');
 $search_project=GETPOST('search_project','alpha');
 $search_societe=GETPOST('search_societe','alpha');
 $search_montant_ht=GETPOST('search_montant_ht','alpha');
@@ -148,6 +149,7 @@ $checkedtypetiers=0;
 $arrayfields=array(
 	'f.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'f.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
+	'f.type'=>array('label'=>$langs->trans("Type"), 'checked'=>0),
 	'f.label'=>array('label'=>$langs->trans("Label"), 'checked'=>0),
 	'f.datef'=>array('label'=>$langs->trans("DateInvoice"), 'checked'=>1),
 	'f.date_lim_reglement'=>array('label'=>$langs->trans("DateDue"), 'checked'=>1),
@@ -203,6 +205,7 @@ if (empty($reshook))
 		$search_product_category='';
 		$search_ref="";
 		$search_refsupplier="";
+		$search_type="";
 		$search_label="";
 		$search_project='';
 		$search_societe="";
@@ -261,7 +264,7 @@ llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:Factur
 
 $sql = "SELECT";
 if ($search_all || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= " f.rowid as facid, f.ref, f.ref_supplier, 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,";
 $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.= " s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
@@ -307,6 +310,15 @@ if ($search_ref)
 }
 if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
 if ($search_refsupplier) $sql .= natural_search('f.ref_supplier', $search_refsupplier);
+if ($search_type != '' && $search_type >= 0)
+{
+	if ($search_type == '0') $sql.=" AND f.type = 0";  // standard
+	if ($search_type == '1') $sql.=" AND f.type = 1";  // replacement
+	if ($search_type == '2') $sql.=" AND f.type = 2";  // credit note
+	if ($search_type == '3') $sql.=" AND f.type = 3";  // deposit
+	//if ($search_type == '4') $sql.=" AND f.type = 4";  // proforma
+	//if ($search_type == '5') $sql.=" AND f.type = 5";  // situation
+}
 if ($search_project) $sql .= natural_search('p.ref', $search_project);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
@@ -377,7 +389,7 @@ $sql.=$hookmanager->resPrint;
 
 if (! $search_all)
 {
-	$sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, 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,";
 	$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.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
@@ -434,6 +446,7 @@ if ($resql)
 	if ($year_lim)  			$param.='&year_lim=' .urlencode($year_lim);
 	if ($search_ref)          	$param.='&search_ref='.urlencode($search_ref);
 	if ($search_refsupplier) 	$param.='&search_refsupplier='.urlencode($search_refsupplier);
+	if ($search_type != '')		$param.='&search_type='.urlencode($search_type);
 	if ($search_label)      	$param.='&search_label='.urlencode($search_label);
 	if ($search_company)      	$param.='&search_company='.urlencode($search_company);
 	if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
@@ -590,6 +603,26 @@ if ($resql)
 		print '<input class="flat" size="6" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
 		print '</td>';
 	}
+	// Type
+	if (! empty($arrayfields['f.type']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone">';
+		$listtype=array(
+				FactureFournisseur::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
+				FactureFournisseur::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
+				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");
+		}
+*/
+		//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
+		print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100');
+		print '</td>';
+	}
 	// Label
 	if (! empty($arrayfields['f.label']['checked']))
 	{
@@ -741,6 +774,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref,f.rowid','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'],$_SERVER["PHP_SELF"],'f.ref_supplier','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.type']['checked']))               print_liste_field_titre($arrayfields['f.type']['label'],$_SERVER["PHP_SELF"],'f.type','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'],$_SERVER['PHP_SELF'],"f.libelle,f.rowid",'',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER['PHP_SELF'],'f.datef,f.rowid','',$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
@@ -767,7 +801,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -843,6 +877,15 @@ if ($resql)
 				print '</td>';
 				if (! $i) $totalarray['nbfield']++;
 			}
+			
+			// Type
+			if (! empty($arrayfields['f.type']['checked']))
+			{
+				print '<td class="nowrap">';
+				print $facturestatic->getLibType();
+				print "</td>";
+				if (! $i) $totalarray['nbfield']++;
+			}
 
 			// Label
 			if (! empty($arrayfields['f.label']['checked']))

From 0c59d536ba7faa36486eb8fc13f86195e247222a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 21:59:11 +0100
Subject: [PATCH 174/386] More accurante message

---
 htdocs/cron/class/cronjob.class.php | 3 ++-
 htdocs/langs/en_US/cron.lang        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index a63982c5b12..74be91ec1ab 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -925,7 +925,8 @@ class Cronjob extends CommonObject
 				$ret=dol_include_once($this->classesname);
 				if ($ret===false || (! class_exists($this->objectname)))
 				{
-					$this->error=$langs->trans('CronCannotLoadClass',$this->classesname,$this->objectname);
+					if ($ret===false) $this->error=$langs->trans('CronCannotLoadClass',$this->classesname,$this->objectname);
+					else $this->error=$langs->trans('CronCannotLoadObject',$this->classesname,$this->objectname);
 					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 					$this->lastoutput = $this->error;
 					$this->lastresult = -1;
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 7f3385bef12..8947fcc47ac 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -74,7 +74,8 @@ CronFrom=From
 CronType=Job type
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+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

From f03fcef2d59337b5520eea358bea953c1a0cae74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 22:41:02 +0100
Subject: [PATCH 175/386] Fix: missing the reposition

---
 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 d74c677f018..e27bbfb7655 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1895,7 +1895,7 @@ else
 						}
 						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
 						{
-							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
+							print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
 							print img_picto($tmpactiontext, $tmpactionpicto);
 							print '</a>';
 						}

From 0d0451e5c79d4710fa49f7dc5ae6ff7a9a0197ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2018 22:43:03 +0100
Subject: [PATCH 176/386] Code comment

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

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 92a70ab3f62..688f963f455 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -109,7 +109,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	    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))	// file depend on session name that is same for all user, not per user value of the session id
+	    if (! empty($conf->global->SYSLOG_FILE_ONEPERSESSION))	// file depend on session name (Note that session name is same for all users and is not a per user value)
 	    {
 	        $suffixinfilename = '_'.session_name();
 	    }

From 41c663f03f8a09bef1b3b76e5ad93b0acec1143f Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Thu, 22 Feb 2018 12:22:31 +0000
Subject: [PATCH 177/386] Fixed issue with elementarray null if num_rows = 0

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 8dbce2790fa..c8096559c9c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -584,10 +584,10 @@ class Project extends CommonObject
                     $i++;
                 }
                 $this->db->free($result);
-
-                /* Return array */
-                return $elements;
             }
+
+            /* Return array even if empty*/
+            return $elements;
         }
         else
         {

From a27ed541284b4849c002e4085b37a0750665f9dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2018 16:40:48 +0100
Subject: [PATCH 178/386] Fix sort order of email templates

---
 htdocs/core/class/html.formmail.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6e25c1ca730..04f4aa020a3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -999,7 +999,8 @@ class FormMail extends Form
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		if ($id > 0)   $sql.= " AND rowid=".$id;
 		if ($id == -1) $sql.= " AND position=0";
-		$sql.= $db->order("position,lang,label","ASC");
+		if (is_object($outputlangs)) $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 ($id == -1) $sql.= $db->plimit(1);
 		//print $sql;
 

From 76543023a1d000fb92810b571362f8827b085052 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2018 17:05:24 +0100
Subject: [PATCH 179/386] Fix missing substitution key

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce95f2912c8..b83257419b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5703,6 +5703,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 
 			$substitutionarray['__THIRDPARTY_ID__'] = '__THIRDPARTY_ID__';
 			$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
+			$substitutionarray['__THIRDPARTY_EMAIL__'] = '__THIRDPARTY_EMAIL__';
 
 			if (is_object($object) && $object->element == 'shipping')
 			{
@@ -5766,11 +5767,13 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object)?$object->id:'');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:'');
+				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object)?$object->email:'');
 			}
 			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
+				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty)?$object->thirdparty->email:'');
 			}
 
 			if (is_object($object->projet) && $object->projet->id > 0)

From 420fe3a07abe63e553558c391ec2f70be76c63f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2018 17:05:45 +0100
Subject: [PATCH 180/386] Clean code

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 04f4aa020a3..922980f62dd 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -982,7 +982,7 @@ class FormMail extends Form
 	 * 		@param	string		$type_template	Get message for type=$type_template, type='all' also included.
 	 *      @param	string		$user			Use 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 all
+	 *      @param	int			$id				Id of template to find, or -1 for first found with lower position, or 0 for first found whatever is position
 	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
 	 *      @return array						array('topic'=>,'content'=>,..)
 	 */
@@ -1001,7 +1001,7 @@ class FormMail extends Form
 		if ($id == -1) $sql.= " AND position=0";
 		if (is_object($outputlangs)) $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 ($id == -1) $sql.= $db->plimit(1);
+		$sql.= $db->plimit(1);
 		//print $sql;
 
 		$resql = $db->query($sql);

From 6793d826b704ad8e0468cbcf6ee5ef17d7f2c70f Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Fri, 23 Feb 2018 10:14:54 +0100
Subject: [PATCH 181/386] Dispatch if more than ordered

If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set
---
 .../class/fournisseur.commande.class.php      | 53 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 1bbde68172e..01114cf22c5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2960,7 +2960,58 @@ class CommandeFournisseur extends CommonOrder
     					    }
     					    return 4;
     					}
-    				}
+    				}elseif(! empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED) )
+				{//set livraison to 'tot' if more products received than wished. (and if $closeopenorder is set to 1 of course...)
+					
+					$close=0;
+					
+					if( count($diff_array) > 0 )
+					{//there are some difference between  the two arrays
+	
+						//scan the array of results
+						foreach($diff_array as $key => $value)
+						{//if the quantity delivered is greater or equal to wish quantity
+							if($qtydelivered[$key] >= $qtywished[$key] )
+							{
+								$close++;
+							}
+		
+						}
+					}
+
+					
+					if($close == count($diff_array))
+					{//all the products are received equal or more than the wished quantity
+						if ($closeopenorder)
+    						{
+    							$ret = $this->Livraison($user, $date_liv, 'tot', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+        						if ($ret<0) {
+        							return -1;
+        						}
+    					    		return 5;
+    						}
+    						else
+    						{
+    					   	 	//Diff => received partially
+    					  		$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret<0) {
+								return -1;
+							}
+							return 4;
+						}
+					
+					
+					}
+					else
+					{//all the products are not received
+						$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+						if ($ret<0) {
+							return -1;
+						}
+						return 4;
+					}
+					
+				}
     				else
     				{
     					//Diff => received partially

From d8f8e76bee485504c88c9775016f17dae6d00aa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 10:39:39 +0100
Subject: [PATCH 182/386] Provide context to trigger

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 5b824d8c959..05005b8b5bb 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -715,11 +715,12 @@ class Categorie extends CommonObject
 				}
 			}
 
-			// Save object we want to link category to into category instance to provide information to trigger
-			$this->linkto=$obj;
 
+			
             // Call trigger
-            $result=$this->call_trigger('CATEGORY_LINK',$user);
+			$this->linkto=$obj;						// Deprecated. Save object we want to link category to into category instance to provide information to trigger
+			$this->context=array('linkto'=>$obj);	// Save object we want to link category to into category instance to provide information to trigger
+			$result=$this->call_trigger('CATEGORY_LINK',$user);
             if ($result < 0) { $error++; }
             // End call triggers
 

From 54dba24ab56ac9b97b7924ad83245e5c1dbb9092 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Fri, 23 Feb 2018 11:06:07 +0100
Subject: [PATCH 183/386] Add multicurrency support for product buy price for
 supplier propales, orders and invoices

---
 .../class/fournisseur.commande.class.php      |   6 +-
 .../fourn/class/fournisseur.facture.class.php |   6 +-
 .../fourn/class/fournisseur.product.class.php | 113 ++++++++++---
 htdocs/fourn/commande/card.php                |   3 +-
 htdocs/fourn/facture/card.php                 |   4 +-
 .../install/mysql/migration/7.0.0-8.0.0.sql   |   3 +
 htdocs/langs/en_US/main.lang                  |   3 +
 htdocs/langs/en_US/products.lang              |   1 +
 htdocs/langs/fr_FR/main.lang                  |   3 +
 htdocs/langs/fr_FR/products.lang              |   1 +
 htdocs/product/class/product.class.php        |  12 ++
 htdocs/product/fournisseurs.php               | 150 +++++++++++++++++-
 htdocs/supplier_proposal/card.php             |   7 +-
 .../class/supplier_proposal.class.php         |  15 +-
 14 files changed, 290 insertions(+), 37 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 1bbde68172e..1ae96927ee6 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1533,13 +1533,17 @@ class CommandeFournisseur extends CommonOrder
                 $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
             }
 
+            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+                $pu = 0;
+            }
+
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $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 = $pu_ht = $tabprice[3];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 1f84e71df96..ccbd93b46e4 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1387,7 +1387,7 @@ class FactureFournisseur extends CommonInvoice
     {
         dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-        global $mysoc;
+        global $mysoc, $conf;
 
         // Clean parameters
         if (empty($remise_percent)) $remise_percent=0;
@@ -1416,6 +1416,10 @@ class FactureFournisseur extends CommonInvoice
         $txlocaltax1=price2num($txlocaltax1);
         $txlocaltax2=price2num($txlocaltax2);
 
+        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+            $pu = 0;
+        }
+
         $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
         $total_ht  = $tabprice[0];
         $total_tva = $tabprice[1];
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 74da470c04c..0823ceb9fd7 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -73,6 +73,13 @@ class ProductFournisseur extends Product
     var $supplier_reputation;     // reputation of supplier
     var $reputations=array();     // list of available supplier reputations
 
+    // Multicurreny
+    var $fourn_multicurrency_id;
+    var $fourn_multicurrency_code;
+    var $fourn_multicurrency_tx;
+    var $fourn_multicurrency_price;
+    var $fourn_multicurrency_unitprice;
+
     /**
 	 *	Constructor
 	 *
@@ -173,25 +180,29 @@ class ProductFournisseur extends Product
     /**
      *    Modify the purchase price for a supplier
      *
-     *    @param  	int			$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  	int			$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
      *    @return	int								<0 if KO, >=0 if OK
      */
-    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='')
+    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='')
     {
         global $conf, $langs;
         //global $mysoc;
@@ -209,6 +220,25 @@ class ProductFournisseur extends Product
 			$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($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=price2num($buyprice,'MU');
 		$charges=price2num($charges,'MU');
         $qty=price2num($qty);
@@ -252,6 +282,11 @@ class ProductFournisseur extends Product
 			$sql.= " unitprice = ".$unitBuyPrice.",";
 			$sql.= " unitcharges = ".$unitCharges.",";   // deprecated
 			$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.= " entity = ".$conf->entity.",";
 			$sql.= " tva_tx = ".price2num($tva_tx).",";
 			// TODO Add localtax1 and localtax2
@@ -306,8 +341,15 @@ class ProductFournisseur extends Product
             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, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation)";
-                $sql .= " values('" . $this->db->idate($now) . "',";
+                $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) . "',";
@@ -341,8 +383,15 @@ class ProductFournisseur extends Product
                 if (! $error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
                     // 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('" . $this->db->idate($now) . "',";
+                    $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->product_fourn_id . ",";
                     $sql .= " " . $user->id . ",";
                     $sql .= " " . price2num($buyprice) . ",";
@@ -395,6 +444,7 @@ class ProductFournisseur extends Product
         $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.fk_availability,";
         $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " pfp.supplier_reputation";
+        $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
 
@@ -429,6 +479,12 @@ class ProductFournisseur extends Product
                 $this->supplier_reputation      = $obj->supplier_reputation;
                 $this->default_vat_code         = $obj->default_vat_code;
 
+                $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 (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
                 {
                     $priceparser = new PriceParser($this->db);
@@ -479,6 +535,7 @@ class ProductFournisseur extends Product
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
         $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_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.unitcharges, 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";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
         $sql.= " WHERE pfp.entity IN (".getEntity('productprice').")";
@@ -521,6 +578,12 @@ class ProductFournisseur extends Product
                 $prodfourn->fk_supplier_price_expression    = $record["fk_supplier_price_expression"];
 				$prodfourn->supplier_reputation    = $record["supplier_reputation"];
 
+                $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->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
                     $priceparser = new PriceParser($this->db);
                     $price_result = $priceparser->parseProductSupplier($prodfourn);
@@ -586,10 +649,17 @@ class ProductFournisseur extends Product
 		$this->delivery_time_days  = '';
         $this->id                     = '';
 
+        $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, pfp.unitcharges, ";
         $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.fk_product = ".$prodid;
@@ -664,6 +734,11 @@ class ProductFournisseur extends Product
 						$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;
                     }
                 }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 15148cbcc2a..1992a888a47 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -419,7 +419,8 @@ if (empty($reshook))
 					$date_start,
 					$date_end,
 					$array_options,
-					$productsupplier->fk_unit
+					$productsupplier->fk_unit,
+                    $productsupplier->fourn_multicurrency_unitprice
 				);
 			}
 			if ($idprod == -99 || $idprod == 0)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cfba614492e..99a4a7edbc1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1018,7 +1018,9 @@ if (empty($reshook))
 					0,
 					$array_options,
 					$productsupplier->fk_unit,
-					$productsupplier->fourn_ref
+					0,
+                    $productsupplier->fourn_multicurrency_unitprice,
+                    $productsupplier->fourn_ref
 				);
 			}
 			if ($idprod == -99 || $idprod == 0)
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 a0ec8f58e37..558c3c6292e 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
@@ -53,6 +53,9 @@ insert into llx_c_type_container (code,label,module,active) values ('banner',
 insert into llx_c_type_container (code,label,module,active) values ('blogpost', 'BlogPost', 'system', 1);
 insert into llx_c_type_container (code,label,module,active) values ('other',    'Other',    'system', 1);
 
+-- For supplier product buy price in multicurency
+ALTER TABLE `llx_product_fournisseur_price` CHANGE `multicurrency_price_ttc` `multicurrency_unitprice` DOUBLE(24,8) NULL DEFAULT NULL;
+ALTER TABLE `llx_product_fournisseur_price_log` CHANGE `multicurrency_price_ttc` `multicurrency_unitprice` DOUBLE(24,8) NULL DEFAULT NULL;
 
 
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cde8a485e59..a6a330ad68a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -325,8 +325,10 @@ Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
 Price=Price
+PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
+UnitPriceHTCurrency=Unit price (net) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -353,6 +355,7 @@ AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (net of tax)
+PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 1ff1fb0e427..e5393466c3d 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -123,6 +123,7 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
 ProductSpecial=Special
 QtyMin=Minimum Qty
 PriceQtyMin=Price for this min. qty (w/o discount)
+PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index cd087a9a4b8..edb756ce1d8 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -325,8 +325,10 @@ Default=Défaut
 DefaultValue=Valeur par défaut
 DefaultValues=Valeurs par défaut
 Price=Prix
+PriceCurrency=Prix (devise)
 UnitPrice=Prix unitaire
 UnitPriceHT=Prix unitaire HT
+UnitPriceHTCurrency=Prix unitaire HT (devise)
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
@@ -353,6 +355,7 @@ AmountLT2ES=Montant IRPF
 AmountTotal=Montant total
 AmountAverage=Montant moyen
 PriceQtyMinHT=Prix quantité min. HT
+PriceQtyMinHTCurrency=Prix quantité min. HT (devise)
 Percentage=Pourcentage
 Total=Total
 SubTotal=Sous-total
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 3a94e1cc0c6..8f9d6b81c9c 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -122,6 +122,7 @@ ConfirmDeleteProductLine=Êtes-vous sûr de vouloir effacer cette ligne produit
 ProductSpecial=Special
 QtyMin=Quantité minimum
 PriceQtyMin=Prix quantité min. (sans remise)
+PriceQtyMinCurrency=Prix quantité min. (sans remise) (devise)
 VATRateForSupplierProduct=Taux TVA (pour ce produit/fournisseur)
 DiscountQtyMin=Remise par défaut quantité min.
 NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 123330004ed..2194c1f90ef 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1525,6 +1525,7 @@ class Product extends CommonObject
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
 		$sql.= " pfp.fk_product, pfp.ref_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.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
 		if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
@@ -1561,6 +1562,11 @@ class Product extends CommonObject
 				$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 				$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 				$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
+                $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;
 				$result=$obj->fk_product;
 				return $result;
 			}
@@ -1570,6 +1576,7 @@ class Product extends CommonObject
 				$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.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.= " 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 = '".$fourn_ref."'";
@@ -1610,6 +1617,11 @@ class Product extends CommonObject
 						$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 						$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 						$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
+                        $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;
 						$result=$obj->fk_product;
 						return $result;
 					}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5219291e8af..e8fa94c2ae0 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -31,6 +31,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php';
@@ -201,6 +202,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 ($_POST["multicurrency_tx"] <= 0 || $_POST["multicurrency_tx"] == '') {
+                $error++;
+                $langs->load("errors");
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
+            }
+            if ($_POST["multicurrency_price"] < 0 || $_POST["multicurrency_price"] == '') {
+                $error++;
+                $langs->load("errors");
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
+            }
+        }
 
 		if (! $error)
 		{
@@ -232,7 +250,11 @@ if (empty($reshook))
 				if (isset($_POST['ref_fourn_price_id']))
 					$object->fetch_product_fournisseur_price($_POST['ref_fourn_price_id']);
 
-				$ret=$object->update_buyprice($quantity, $_POST["price"], $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation);
+                if ($conf->multicurrency->enabled) {
+                    $ret = $object->update_buyprice($quantity, $_POST["price"], $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $_POST["multicurrency_price"], $_POST["multicurrency_price_base_type"], $_POST["multicurrency_tx"], $_POST["multicurrency_code"]);
+                } else {
+                    $ret = $object->update_buyprice($quantity, $_POST["price"], $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation);
+                }
 				if ($ret < 0)
 				{
 
@@ -526,12 +548,98 @@ if ($id > 0 || $ref)
 					</script>';
 				}
 
-				// 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>';
+                if ($conf->multicurrency->enabled) {
+                    // Currency
+                    print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
+                    print '<td>';
+                    print $form->selectMultiCurrency(GETPOST('multicurrency_code')?GETPOST('multicurrency_code'):(isset($object->fourn_multicurrency_code)?$object->fourn_multicurrency_code:''), "multicurrency_code", 1);
+                    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="'.(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>';
+                    print '<td><input class="flat" name="multicurrency_price" size="8" value="'.(GETPOST('multicurrency_price')?GETPOST('multicurrency_price'):(isset($object->fourn_multicurrency_price)?$object->fourn_multicurrency_price:'')).'">';
+                    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>';
+
+                    $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
+    <script type="text/javascript">
+        function update_price_from_multicurrency() {
+            var multicurrency_price = $('input[name="multicurrency_price"]').val();
+            var multicurrency_tx = $('input[name="multicurrency_tx"]').val();
+            $('input[name="price"]').val(multicurrency_price / multicurrency_tx);
+            $('input[name="disabled_price"]').val(multicurrency_price / multicurrency_tx);
+        }
+        jQuery(document).ready(function () {
+            $('input[name="disabled_price"]').prop('disabled', true);
+            $('select[name="disabled_price_base_type"]').prop('disabled', true);
+            update_price_from_multicurrency();
+            
+            $('input[name="multicurrency_price"]').keyup(function () {
+                update_price_from_multicurrency();
+            }).change(function () {
+                update_price_from_multicurrency();
+            }).on('paste', function () {
+                update_price_from_multicurrency();
+            });
+            
+            $('input[name="multicurrency_tx"]').keyup(function () {
+                update_price_from_multicurrency();
+            }).change(function () {
+                update_price_from_multicurrency();
+            }).on('paste', function () {
+                update_price_from_multicurrency();
+            });
+            
+            $('select[name="multicurrency_price_base_type"]').change(function () {
+                $('input[name="price_base_type"]').val($(this).val());
+                $('select[name="disabled_price_base_type"]').val($(this).val());
+            });
+            
+            var currencies_array = $currencies;
+            $('select[name="multicurrency_code"]').change(function () {
+                $('input[name="multicurrency_tx"]').val(currencies_array[$(this).val()]);
+            });
+        });
+    </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>';
+                }
+
 
 				// Discount qty min
 				print '<tr><td>'.$langs->trans("DiscountQtyMin").'</td>';
@@ -634,7 +742,14 @@ if ($id > 0 || $ref)
 				print_liste_field_titre("QtyMin",$_SERVER["PHP_SELF"],"pfp.quantity","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("VATRate",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("PriceQtyMinHT",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
-				print_liste_field_titre("UnitPriceHT",$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
+                if ($conf->multicurrency->enabled) {
+                    print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, 'align="right"', $sortfield, $sortorder);
+                }
+                print_liste_field_titre("UnitPriceHT",$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
+                if ($conf->multicurrency->enabled) {
+                    print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, 'align="right"', $sortfield, $sortorder);
+                    print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
+                }
 				print_liste_field_titre("DiscountQtyMin",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("NbDaysToDelivery",$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("ReputationForThisProduct",$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder);
@@ -685,12 +800,31 @@ if ($id > 0 || $ref)
 						print $productfourn->fourn_price?price($productfourn->fourn_price):"";
 						print '</td>';
 
+                        if ($conf->multicurrency->enabled) {
+                            // Price for the quantity in currency
+                            print '<td align="right">';
+                            print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
+                            print '</td>';
+                        }
+
 						// Unit price
 						print '<td align="right">';
 						print price($productfourn->fourn_unitprice);
 						//print $objp->unitprice? price($objp->unitprice) : ($objp->quantity?price($objp->price/$objp->quantity):"&nbsp;");
 						print '</td>';
 
+                        if ($conf->multicurrency->enabled) {
+                            // Unit price in currency
+                            print '<td align="right">';
+                            print price($productfourn->fourn_multicurrency_unitprice);
+                            print '</td>';
+
+                            // Currency
+                            print '<td align="right">';
+                            print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
+                            print '</td>';
+                        }
+
 						// Discount
 						print '<td align="right">';
 						print price2num($productfourn->fourn_remise_percent).'%';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c4f5c5c6ba9..ed5187cf89f 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -643,8 +643,11 @@ if (empty($reshook))
 						$label,
 						$array_options,
 						$ref_supplier,
-						$fk_unit
-						);
+						$fk_unit,
+						'',
+						0,
+						$productsupplier->fourn_multicurrency_unitprice
+                    );
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
 				}
 				if ($idprod == -99 || $idprod == 0)
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 91eff1b5a8a..0bcb328039c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -367,13 +367,14 @@ class SupplierProposal extends CommonObject
 	 * 		@param		int			$fk_unit			Id of the unit to use.
 	 * 		@param		string		$origin				'order', 'supplier_proposal', ...
 	 * 		@param		int			$origin_id			Id of origin line
+     * 		@param		double		$pu_ht_devise		Amount in currency
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *
      *    	@see       	add_product
      */
-    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0)
+    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='', $origin='', $origin_id=0, $pu_ht_devise=0)
     {
-    	global $mysoc;
+    	global $mysoc, $conf;
 
         dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -417,17 +418,23 @@ class SupplierProposal extends CommonObject
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $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, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
+            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+                $pu = 0;
+            }
+
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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 = $pu_ht = $tabprice[3];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
+            $pu_ht_devise = $tabprice[19];
 
             // Rang to use
             $rangtouse = $rang;
@@ -492,7 +499,7 @@ class SupplierProposal extends CommonObject
 			// Multicurrency
 			$this->line->fk_multicurrency			= $this->fk_multicurrency;
 			$this->line->multicurrency_code			= $this->multicurrency_code;
-			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
+            $this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;

From 829de06bf61021c9237689297975e0e391c1e1a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 11:23:04 +0100
Subject: [PATCH 184/386] Fix error management

---
 htdocs/societe/card.php                | 39 +++++++++++++++++++++-----
 htdocs/societe/class/societe.class.php | 16 +++++++++--
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 362834b316d..c0775145828 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -511,6 +511,8 @@ if (empty($reshook))
         {
             if ($action == 'add')
             {
+            	$error = 0;
+
                 $db->begin();
 
                 if (empty($object->client))      $object->code_client='';
@@ -533,11 +535,21 @@ if (empty($reshook))
 
 					// Customer categories association
 					$custcats = GETPOST('custcats', 'array');
-					$object->setCategories($custcats, 'customer');
+					$result = $object->setCategories($custcats, 'customer');
+					if ($result < 0)
+					{
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 
 					// Supplier categories association
 					$suppcats = GETPOST('suppcats', 'array');
-					$object->setCategories($suppcats, 'supplier');
+					$result = $object->setCategories($suppcats, 'supplier');
+					if ($result < 0)
+					{
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 
                     // Logo/Photo save
                     $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
@@ -566,7 +578,7 @@ if (empty($reshook))
                         }
                     }
                     else
-	              {
+					{
 						switch($_FILES['photo']['error'])
 						{
 						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -593,7 +605,7 @@ if (empty($reshook))
                    	$error++;
                 }
 
-                if ($result >= 0)
+                if ($result >= 0 && ! $error)
                 {
                     $db->commit();
 
@@ -622,6 +634,8 @@ if (empty($reshook))
 
             if ($action == 'update')
             {
+            	$error = 0;
+
                 if (GETPOST('cancel','alpha'))
                 {
                 	if (! empty($backtopage))
@@ -647,16 +661,27 @@ if (empty($reshook))
                     setEventMessages($object->error, $object->errors, 'errors');
                   	$error++;
                 }
+
 				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
-				if (!empty($user->rights->categorie->lire))
+				if (! $error && !empty($user->rights->categorie->lire))
 				{
 					// Customer categories association
 					$categories = GETPOST( 'custcats', 'array' );
-					$object->setCategories($categories, 'customer');
+					$result = $object->setCategories($categories, 'customer');
+					if ($result < 0)
+					{
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 
 					// Supplier categories association
 					$categories = GETPOST('suppcats', 'array');
-					$object->setCategories($categories, 'supplier');
+					$result = $object->setCategories($categories, 'supplier');
+					if ($result < 0)
+					{
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 				}
 
                 // Logo/Photo save
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3ca69fdb6fd..f67d1a1d9e7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3767,6 +3767,8 @@ class Societe extends CommonObject
 			$to_add = $categories;
 		}
 
+		$error = 0;
+
 		// Process
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
@@ -3774,12 +3776,20 @@ class Societe extends CommonObject
 			}
 		}
 		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, $type_text);
+			if ($c->fetch($add) > 0)
+			{
+				$result = $c->add_type($this, $type_text);
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $c->error;
+					$this->errors = $c->errors;
+					break;
+				}
 			}
 		}
 
-		return 1;
+		return $error ? -1 : 1;
 	}
 
 

From 82ae65b18d1f6d8d0a43f0f02daaf8090eca5d03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 11:23:36 +0100
Subject: [PATCH 185/386] NEW Can get template of email from its label

---
 htdocs/categories/class/categorie.class.php | 2 +-
 htdocs/core/class/html.formmail.class.php   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 05005b8b5bb..ada86667f44 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -716,7 +716,7 @@ class Categorie extends CommonObject
 			}
 
 
-			
+
             // Call trigger
 			$this->linkto=$obj;						// Deprecated. Save object we want to link category to into category instance to provide information to trigger
 			$this->context=array('linkto'=>$obj);	// Save object we want to link category to into category instance to provide information to trigger
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 922980f62dd..67497b4881b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -984,9 +984,10 @@ class FormMail extends Form
 	 *      @param	Translate	$outputlangs	Output lang object
 	 *      @param	int			$id				Id of template to find, or -1 for first found with lower position, or 0 for first found whatever is position
 	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
+	 *      @param	string		$label			Label of template
 	 *      @return array						array('topic'=>,'content'=>,..)
 	 */
-	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1)
+	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='')
 	{
 		$ret=array();
 
@@ -996,6 +997,7 @@ class FormMail extends Form
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
 		if ($active >= 0) $sql.=" AND active = ".$active;
+		if ($label) $sql.=" AND label ='".$this->db->escape($label)."'";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		if ($id > 0)   $sql.= " AND rowid=".$id;
 		if ($id == -1) $sql.= " AND position=0";

From b3d968d4a164107734dee0a32e10ed37dcb866ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 11:40:20 +0100
Subject: [PATCH 186/386] Fix look and feel v7

---
 htdocs/admin/modules.php                      |  8 ++++----
 htdocs/modulebuilder/template/admin/about.php | 10 +++-------
 htdocs/modulebuilder/template/admin/setup.php |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ee17e647863..00c8d14219e 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -741,12 +741,12 @@ if ($mode == 'common')
         					if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
         					{
         						$urltouse=dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1);
-        						print '<a href="'.$urltouse.(preg_match('/\?/',$urltouse)?'&':'?').'backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
+        						print '<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"').'</a>';
         					}
         					else
         					{
         						$urltouse=$urlpage;
-        						print '<a href="'.$urltouse.(preg_match('/\?/',$urltouse)?'&':'?').'backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
+        						print '<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"').'</a>';
         					}
         				}
         			}
@@ -754,11 +754,11 @@ if ($mode == 'common')
         		}
         		else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a 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"').'</a></td>';
         		}
         		else
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a 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"').'</a></td>';
         		}
         	}
         	else
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index b6584f8d909..c34574791c1 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -42,14 +42,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once '../lib/mymodule.lib.php';
 
 // Translations
-$langs->load("errors");
-$langs->load("admin");
-$langs->load("mymodule@mymodule");
+$langs->loadLangs(array("errors","admin","mymodule@mymodule"));
 
 // Access control
-if (! $user->admin) {
-	accessforbidden();
-}
+if (! $user->admin) accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'alpha');
@@ -73,7 +69,7 @@ $page_name = "MyModuleAbout";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
+$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 19908d33546..58a572a42ac 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -71,7 +71,7 @@ $page_name = "MyModuleSetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
+$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
 

From 8b479a05ade39a8952050ab7d86c11d50f55e8e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 12:34:25 +0100
Subject: [PATCH 187/386] Can add property in password extrafield (prepare to
 choose encrypt algo)

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

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index fdf2f722932..3693883775a 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -93,6 +93,7 @@ $langs->load("modulebuilder");
 			else if (type == 'int')      { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
@@ -165,6 +166,7 @@ $langs->load("modulebuilder");
     <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
     <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index e0b4927bf19..3a5922c216f 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -91,6 +91,7 @@ $langs->load("modulebuilder");
 			else if (type == 'int')      { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
@@ -166,7 +167,7 @@ if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_ar
 		}
 	}
 }
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') )
+elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
 {
 	$paramlist=array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -210,7 +211,7 @@ else
 </td></tr>
 <!-- Size -->
 <tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
-<!--  Value (for select list / radio) -->
+<!--  Value (for some fields like password, select list, radio, ...) -->
 <tr id="value_choice">
 <td>
 	<?php echo $langs->trans("Value"); ?>
@@ -224,6 +225,7 @@ else
     <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
     <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>

From cc618e886f75997a51700464c434b3e75508ac71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 13:19:33 +0100
Subject: [PATCH 188/386] Fix extrafield password must be >= than 64 for
 password_hash

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index ee165ac6808..db0e7f4284a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -234,7 +234,7 @@ class ExtraFields
 				$lengthdb='11';
 			} elseif($type=='password') {
 				$typedb='varchar';
-				$lengthdb='50';
+				$lengthdb='128';
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;

From 863cab362f3202de4e99fc22313ef494a939141f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 14:38:41 +0100
Subject: [PATCH 189/386] NEW Cat set the encryption algorithm for extrafields
 of type password

---
 htdocs/core/class/commonobject.class.php      | 48 ++++++++++++++-----
 htdocs/core/lib/security.lib.php              | 12 +++--
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  2 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |  2 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/societe/card.php                       |  2 +-
 6 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f69e842ec81..af940c91234 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4629,10 +4629,10 @@ abstract class CommonObject
 			foreach($new_array_options as $key => $value)
 			{
 			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix
-			   	$attributeType     = $extrafields->attribute_type[$attributeKey];
-			   	$attributeLabel    = $extrafields->attribute_label[$attributeKey];
-			   	$attributeParam    = $extrafields->attribute_param[$attributeKey];
-			   	$attributeRequired = $extrafields->attribute_required[$attributeKey];
+			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
+			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
+			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
+			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
 
 			   	if ($attributeRequired)
 			   	{
@@ -4665,7 +4665,26 @@ abstract class CommonObject
              				$this->array_options[$key] = null;
              			}
              			break;*/
-					case 'price':
+			   		case 'password':
+			   			$algo='';
+			   			if (is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
+			   			{
+			   				// If there is an encryption choice, we use it to crypt data before insert
+			   				$algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));
+			   				if ($algo != '')
+			   				{
+				   				$new_array_options[$key] = dol_hash($this->array_options[$key], $algo);
+				   				/*var_dump($algo);
+				   				var_dump($this->array_options[$key]);
+				   				var_dump($new_array_options[$key]);*/
+			   				}
+			   			}
+			   			else	// Common usage
+			   			{
+			   				$new_array_options[$key] = $this->array_options[$key];
+			   			}
+			   			break;
+			   		case 'price':
 						$new_array_options[$key] = price2num($this->array_options[$key]);
 						break;
 					case 'date':
@@ -4723,7 +4742,7 @@ abstract class CommonObject
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
 					$sql.=",".$attributeKey;
 			}
 			$sql .= ") VALUES (".$this->id;
@@ -4731,8 +4750,8 @@ abstract class CommonObject
 			foreach($new_array_options as $key => $value)
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
-				// Add field o fattribut
-				if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
+				// Add field of attribute
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
@@ -4781,7 +4800,7 @@ abstract class CommonObject
 	 *	Update an exta field value for the current object.
 	 *  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
+	 *  @param  string      $key    		Key of the extrafield (without starting 'options_')
 	 *  @param	string		$trigger		If defined, call also the trigger (for example COMPANY_MODIFY)
 	 *  @param	User		$userused		Object user
 	 *  @return int                 		-1=error, O=did nothing, 1=OK
@@ -4806,9 +4825,12 @@ abstract class CommonObject
 			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
 
 			$value=$this->array_options["options_".$key];
-			$attributeType  = $extrafields->attribute_type[$key];
-			$attributeLabel = $extrafields->attribute_label[$key];
-			$attributeParam = $extrafields->attribute_param[$key];
+
+			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
+			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
+			$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];
+			$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
+
 			switch ($attributeType)
 			{
 				case 'int':
@@ -4838,7 +4860,7 @@ abstract class CommonObject
 					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'link':
-					$param_list=array_keys($attributeParam ['options']);
+					$param_list=array_keys($attributeParam['options']);
 					// 0 : ObjectName
 					// 1 : classPath
 					$InfoFieldList = explode(":", $param_list[0]);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index dda89a7425d..a367579e1cd 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -70,11 +70,11 @@ function dol_decode($chain)
 
 /**
  * 	Returns a hash of a string.
- *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function.
- *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt.
+ *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommanded value is 'password_hash')
+ *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO then md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		string					Hash of string
  *  @getRandomPassword
  */
@@ -83,8 +83,10 @@ function dol_hash($chain, $type='0')
 	global $conf;
 
 	// No need to add salt for password_hash
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
-        return password_hash($chain, PASSWORD_DEFAULT);
+	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+	{
+		return password_hash($chain, PASSWORD_DEFAULT);
+	}
 
 	// Salt value
 	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 3693883775a..a48e8a5f31a 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -166,7 +166,7 @@ $langs->load("modulebuilder");
     <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
     <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 3a5922c216f..a919b545a36 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -225,7 +225,7 @@ else
     <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
     <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02c44ebee88..d6bf4d01fe9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -411,6 +411,7 @@ 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->fetch($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->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive 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>...
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index c0775145828..ed8e6c74c6e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -329,7 +329,7 @@ if (empty($reshook))
 
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
         if ($ret < 0) $error++;
 
         if (! $error)

From 93a817681327ddf9eaa70af71a78938e48130c76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 15:28:24 +0100
Subject: [PATCH 190/386] Fix do not encrypt if empty

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index af940c91234..60d7f4a8c5e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4667,7 +4667,7 @@ abstract class CommonObject
              			break;*/
 			   		case 'password':
 			   			$algo='';
-			   			if (is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
+			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
 			   				$algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));

From f002c84a766b11b552ff9cd5510b103a94e94251 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 15:33:00 +0100
Subject: [PATCH 191/386] Fix type of expense report output in PDF

---
 .../modules/expensereport/doc/pdf_standard.modules.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 15d48694277..c236c9ad017 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -328,7 +328,15 @@ class pdf_standard extends ModeleExpenseReport
                         $nextColumnPosX = $this->posxprojet;
                     }
 
-					$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 10), 0, 'C');
+                    $expensereporttypecode = $object->lines[$i]->type_fees_code;
+                    $expensereporttypecodetoshow = $outputlangs->transnoentities($expensereporttypecode);
+                    if ($expensereporttypecodetoshow == $expensereporttypecode)
+                    {
+                    	$expensereporttypecodetoshow = preg_replace('/^(EX_|TF_)/', '', $expensereporttypecodetoshow);
+                    }
+                    $expensereporttypecodetoshow = dol_trunc($expensereporttypecodetoshow, 9);	// 10 is too much
+
+                    $pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
 
                     // Project
 					if (! empty($conf->projet->enabled))

From 787a13750939267bb1cda1ed308dd8b41e9adb1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 15:38:39 +0100
Subject: [PATCH 192/386] Add column for accounting doc

---
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql        | 1 +
 htdocs/install/mysql/tables/llx_expensereport_det.sql | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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 a0ec8f58e37..6488a7dafde 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
@@ -54,5 +54,6 @@ insert into llx_c_type_container (code,label,module,active) values ('blogpost',
 insert into llx_c_type_container (code,label,module,active) values ('other',    'Other',    'system', 1);
 
 
+ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_expensereport;
 
 
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index 5cc7b1b86f5..fc0bd6e697f 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -20,9 +20,10 @@ CREATE TABLE llx_expensereport_det
 (
    rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
    fk_expensereport integer NOT NULL,
-   fk_c_type_fees integer NOT NULL,
+   docnumber varchar(128),										-- To store a ref of a accounting doc (piece)
+   fk_c_type_fees integer NOT NULL,								-- Type of expense
    fk_c_exp_tax_cat integer,
-   fk_projet integer,
+   fk_projet integer,											-- Id of project
    comments text NOT NULL,
    product_type integer DEFAULT -1,
    qty real NOT NULL,

From 0a79550f4320706d6d216717733da270932d8adb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 16:11:00 +0100
Subject: [PATCH 193/386] Fix oldcopy must be saved before update_extras

---
 htdocs/comm/card.php                     | 4 +++-
 htdocs/comm/propal/card.php              | 4 +++-
 htdocs/commande/card.php                 | 4 +++-
 htdocs/compta/facture/card.php           | 4 +++-
 htdocs/compta/facture/fiche-rec.php      | 4 +++-
 htdocs/contrat/card.php                  | 2 +-
 htdocs/expedition/card.php               | 6 ++++--
 htdocs/expedition/shipment.php           | 6 ++++--
 htdocs/expensereport/card.php            | 6 ++++--
 htdocs/fichinter/card.php                | 4 +++-
 htdocs/fourn/card.php                    | 4 +++-
 htdocs/fourn/commande/card.php           | 4 +++-
 htdocs/fourn/facture/card.php            | 4 +++-
 htdocs/livraison/card.php                | 4 +++-
 htdocs/product/stock/productlot_card.php | 6 ++++--
 htdocs/societe/card.php                  | 2 ++
 htdocs/supplier_proposal/card.php        | 4 +++-
 17 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 506b0c6fa8d..aab95264a57 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -189,9 +189,11 @@ if (empty($reshook))
 	if ($action == 'update_extras') {
         $object->fetch($id);
 
+        $object->oldcopy = dol_clone($object);
+
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
         if ($ret < 0) $error++;
         if (! $error)
         {
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 380edc5a472..02c1b0e65bb 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1228,9 +1228,11 @@ if (empty($reshook))
 	}
 
 	else if ($action == 'update_extras') {
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 		if (! $error)
 		{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 21975439872..2cb899fcfe6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1268,9 +1268,11 @@ if (empty($reshook))
 
 	if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
 		if (! $error)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5681b0c339c..969f4d532cb 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2112,9 +2112,11 @@ if (empty($reshook))
 
 
 	if ($action == 'update_extras') {
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from add form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
 		if (! $error) {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index f869c01aa53..43d28c9abbd 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -444,9 +444,11 @@ if (empty($reshook))
 	}
 	else if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
 		if (! $error) {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e27bbfb7655..3b7ab5ae49b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -880,7 +880,7 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 		if ($ret < 0) $error++;
 
 		if (! $error) {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 82d6c746640..27b70e1b8cf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -155,9 +155,11 @@ if (empty($reshook))
 
 	if ($action == 'update_extras')
 	{
-	    // Fill array 'array_options' with data from update form
+		$object->oldcopy = dol_clone($object);
+
+		// Fill array 'array_options' with data from update form
 	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
 	    if ($ret < 0) $error++;
 
 	    if (! $error)
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 0141fc1dea5..3b7a2d74818 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -180,9 +180,11 @@ if (empty($reshook))
 
     if ($action == 'update_extras')
     {
-        // Fill array 'array_options' with data from update form
+    	$object->oldcopy = dol_clone($object);
+
+    	// Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
 
         if (! $error)
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index bb90442a110..dd5db880bc9 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -286,9 +286,11 @@ if (empty($reshook))
 
     if ($action == 'update_extras')
     {
-        // Fill array 'array_options' with data from update form
+    	$object->oldcopy = dol_clone($object);
+
+    	// Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
 
         if (! $error)
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 3eddb02c28b..9b623d21279 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -741,9 +741,11 @@ if (empty($reshook))
 
 	if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
 		if (! $error)
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6f06a6778fd..c6f0c8bb446 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -114,9 +114,11 @@ if (empty($reshook))
 	if ($action == 'update_extras') {
         $object->fetch($id);
 
+        $object->oldcopy = dol_clone($object);
+
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 
         if ($ret < 0) $error++;
         if (! $error)
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 15148cbcc2a..f87b4c9bd25 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -945,9 +945,11 @@ if (empty($reshook))
 
 	if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from add form
 		$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
 		if (! $error)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cfba614492e..cc6fb29fa5a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1255,9 +1255,11 @@ if (empty($reshook))
 	}
 	if ($action == 'update_extras')
 	{
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from add form
 		$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b2218508ef6..06c602df330 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -193,9 +193,11 @@ elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 // Update extrafields
 if ($action == 'update_extras')
 {
+	$object->oldcopy = dol_clone($object);
+
 	// Fill array 'array_options' with data from update form
 	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 	if ($ret < 0) $error++;
 
 	if (! $error)
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 8e639c90108..f269e260b25 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -122,9 +122,11 @@ if (empty($reshook))
 
 	if ($action == 'update_extras')
     {
-        // Fill array 'array_options' with data from update form
+    	$object->oldcopy = dol_clone($object);
+
+    	// Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
         if ($ret < 0) $error++;
 
         if (! $error)
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ed8e6c74c6e..55c598fdd84 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -327,6 +327,8 @@ if (empty($reshook))
     if ($action == 'update_extras') {
         $object->fetch($socid);
 
+        $object->oldcopy = dol_clone($object);
+
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c4f5c5c6ba9..8d8e46a6ae9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -927,9 +927,11 @@ if (empty($reshook))
 	}
 
 	else if ($action == 'update_extras') {
+		$object->oldcopy = dol_clone($object);
+
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
 		if (! $error)

From f3e1e81219916363936e09e79da8a7c4f61dc286 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 16:11:25 +0100
Subject: [PATCH 194/386] Fix update of extrafield password that are crypted

---
 htdocs/core/class/commonobject.class.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 60d7f4a8c5e..990d158af56 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4673,10 +4673,26 @@ abstract class CommonObject
 			   				$algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));
 			   				if ($algo != '')
 			   				{
-				   				$new_array_options[$key] = dol_hash($this->array_options[$key], $algo);
-				   				/*var_dump($algo);
-				   				var_dump($this->array_options[$key]);
-				   				var_dump($new_array_options[$key]);*/
+			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					{
+				   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
+				   					//var_dump($action);
+			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
+				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same thaan submited new value, it means we don't change it, so we don't update.
+				   					{
+				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+				   					}
+									else
+									{
+										// var_dump($algo);
+										$newvalue = dol_hash($this->array_options[$key], $algo);
+										$new_array_options[$key] = $newvalue;
+									}
+			   					}
+			   					else
+			   					{
+			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+			   					}
 			   				}
 			   			}
 			   			else	// Common usage

From 7cf7bf6e4591ac09e06cd16ef63d227895e48ac7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 16:26:23 +0100
Subject: [PATCH 195/386] Code comment

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 990d158af56..f5e429bf54a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4673,12 +4673,13 @@ abstract class CommonObject
 			   				$algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));
 			   				if ($algo != '')
 			   				{
+			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
+			   					//var_dump($action);
+			   					//var_dump($this->oldcopy);exit;
 			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
-				   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
-				   					//var_dump($action);
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
-				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same thaan submited new value, it means we don't change it, so we don't update.
+				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
 				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
 				   					}

From d8bf553ea9d1e99c568c1a1b1df5d08afc7576d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2018 19:55:15 +0100
Subject: [PATCH 196/386] Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD
 for logo indexing

---
 htdocs/core/class/commonobject.class.php |   2 +
 htdocs/core/lib/files.lib.php            | 134 +++++++++++++++++++----
 htdocs/societe/card.php                  |  17 ++-
 htdocs/societe/class/societe.class.php   |  28 ++---
 4 files changed, 140 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f5e429bf54a..55e3c380c31 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4116,6 +4116,7 @@ abstract class CommonObject
 	 * @param 	int 		$hideref 		1 to hide product reference. 0 by default
 	 * @param   null|array  $moreparams     Array to provide more information
 	 * @return 	int 						>0 if OK, <0 if KO
+	 * @see	addFileIntoDatabaseIndex
 	 */
 	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)
 	{
@@ -4354,6 +4355,7 @@ abstract class CommonObject
 
 	/**
 	 *  Build thumb
+	 *  @TODO Move this into files.lib.php
 	 *
 	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
 	 *	@return		void
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 85d80f646d0..529f58dbbf1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -950,7 +950,7 @@ function dolCheckVirus($src_file)
  *  Note:
  *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
  *  - Test on antivirus is always done (if antivirus set).
- *  - Database of files is NOT updated.
+ *  - Database of files is NOT updated (this is done by dol_add_file_process() that calls this function).
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -1554,28 +1554,10 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					// Update table of files
 					if ($donotupdatesession)
 					{
-						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-
-						if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
+						if ($result < 0)
 						{
-							$filename = basename($destfile);
-							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-							$ecmfile=new EcmFiles($db);
-							$ecmfile->filepath = $rel_dir;
-							$ecmfile->filename = $filename;
-							$ecmfile->label = md5_file(dol_osencode($destfull));	// MD5 of file content
-							$ecmfile->fullpath_orig = $TFile['name'][$i];
-							$ecmfile->gen_or_uploaded = 'uploaded';
-							$ecmfile->description = '';    // indexed content
-							$ecmfile->keyword = '';        // keyword content
-							$result = $ecmfile->create($user);
-							if ($result < 0)
-							{
-								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-							}
+							setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
 						}
 					}
 
@@ -1679,6 +1661,114 @@ function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=
 	}
 }
 
+
+/**
+ *  Add a file into database index.
+ *  Called by dol_add_file_process when uploading a file and on other cases.
+ *  See also commonGenerateDocument that also add/update database index when a file is generated.
+ *
+ *  @param      string	$dir			Directory name (full real path without ending /)
+ *  @param		string	$file			File name
+ *  @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
+ *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
+ */
+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig='', $mode='uploaded', $setsharekey=0)
+{
+	global $db, $user;
+
+	$result = 0;
+
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	{
+		$filename = basename($file);
+		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile=new EcmFiles($db);
+		$ecmfile->filepath = $rel_dir;
+		$ecmfile->filename = $filename;
+		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
+		$ecmfile->fullpath_orig = $fullpathorig;
+		$ecmfile->gen_or_uploaded = $mode;
+		$ecmfile->description = '';    // indexed content
+		$ecmfile->keyword = '';        // keyword content
+		if ($setsharekey)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$ecmfile->share = getRandomPassword(true);
+		}
+
+		$result = $ecmfile->create($user);
+		if ($result < 0)
+		{
+			dol_syslog($ecmfile->error);
+		}
+	}
+
+	return $result;
+}
+
+
+/**
+ *  Delete files into database index using search criterias.
+ *
+ *  @param      string	$dir			Directory name (full real path without ending /)
+ *  @param		string	$file			File name
+ *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
+ *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
+ */
+function deleteFilesIntoDatabaseIndex($dir, $file, $mode='uploaded')
+{
+	global $conf, $db, $user;
+
+	$error = 0;
+
+	if (empty($dir))
+	{
+		dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
+		return -1;
+	}
+
+	$db->begin();
+
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+	$filename = basename($file);
+	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+	if (! $error)
+	{
+		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
+		$sql.= ' WHERE entity = '.$conf->entity;
+		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
+		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
+		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			$error++;
+			dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
+		}
+	}
+
+	// Commit or rollback
+	if ($error) {
+		$db->rollback();
+		return - 1 * $error;
+	} else {
+		$db->commit();
+		return 1;
+	}
+}
+
+
 /**
  * 	Convert an image file into another format.
  *  This need Imagick php extension.
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 55c598fdd84..4e013581a25 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -713,13 +713,18 @@ if (empty($reshook))
                             }
                             else
                             {
-                                // Create small thumbs for company (Ratio is near 16/9)
-                                // Used on logon for example
-                                $imgThumbSmall = vignette($newfile, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+                            	// Create thumbs
+                            	$object->addThumbs($newfile);
 
-                                // Create mini thumbs for company (Ratio is near 16/9)
-                                // Used on menu or for setup page for example
-                                $imgThumbMini = vignette($newfile, $maxwidthmini, $maxheightmini, '_mini', $quality);
+                                // 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), '', '', 'uploaded', 1);
+                                	// now we index the uploaded logo file
+                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+                                }
                             }
                         }
                     }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f67d1a1d9e7..f5c0f004794 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1121,10 +1121,11 @@ class Societe extends CommonObject
 	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
 	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
 	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
-	 *    @param    string	$email   		Email (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   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='')
+	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
 	{
 		global $langs;
 		global $conf;
@@ -1166,17 +1167,18 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
 		$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_ext) $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int) $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		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.nom_alias = '".$this->db->escape($nom_alias)."'";
+		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		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)

From daeebae647b23f1b31c31523bc3a459ab818517b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 12:32:48 +0100
Subject: [PATCH 197/386] FIX Can use odx templates that does not include lines
 tags

---
 .../doc/doc_generic_order_odt.modules.php     |  64 +++++----
 .../doc/doc_generic_contract_odt.modules.php  | 121 ++++++++++--------
 .../doc/doc_generic_shipment_odt.modules.php  |  60 +++++----
 .../doc/doc_generic_invoice_odt.modules.php   |  60 +++++----
 .../doc/doc_generic_proposal_odt.modules.php  |  60 +++++----
 ..._generic_supplier_proposal_odt.modules.php |  60 +++++----
 .../doc/doc_generic_usergroup_odt.modules.php |  60 +++++----
 7 files changed, 287 insertions(+), 198 deletions(-)

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 9ff01c9f5b5..0fb5dbabc03 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
@@ -163,7 +163,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
    			}
    			$texte.='<div id="div_'.get_class($this).'">';
 		}
-		
+
 		$texte.= '</td>';
 
 		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
@@ -368,7 +368,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// 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
 
@@ -392,30 +392,42 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -468,7 +480,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 d99d43396bc..cec54709479 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
@@ -290,17 +290,38 @@ class doc_generic_contract_odt extends ModelePDFContract
 				{
 					$socobject=$object->thirdparty;
 				}
-				// Make substitution
-				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
-				);
-				complete_substitutions_array($substitutionarray, $langs, $object);
+
+				$object->fetch_optionals();
+
+
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				/* deprecated
+				$substitutionarray['__FROM_NAME__'] = $this->emetteur->name;
+				$substitutionarray['__FROM_EMAIL__'] = $this->emetteur->email;
+				$substitutionarray['__TOTAL_TTC__'] = $object->total_ttc;
+				$substitutionarray['__TOTAL_HT__'] = $object->total_ht;
+				$substitutionarray['__TOTAL_VAT__'] = $object->total_vat;
+				*/
+
+				// Make substitutions into ODT
+				$array_contract=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in contract as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$substitutionarray = array_merge($substitutionarray,$array_contract,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+				$tmparray = $substitutionarray;
+				
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$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
 
 				// Line of free text
@@ -311,6 +332,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
 				}
 
+
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
@@ -344,24 +366,6 @@ class doc_generic_contract_odt extends ModelePDFContract
 				{
 				}
 
-				// Make substitutions into odt
-				$array_contract=$this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-		                // retrieve contact information for use in contract as contact_xxx tags
-                		$array_thirdparty_contact = array();
-                		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
-
-				$tmparray = array_merge($array_contract,$array_user,$array_soc,$array_thirdparty,$array_objet,$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 {
@@ -379,33 +383,46 @@ class doc_generic_contract_odt extends ModelePDFContract
 					{
 					}
 				}
+
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -456,7 +473,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 77a5677c003..9c45c135ac3 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
@@ -437,30 +437,42 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_shipment_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_shipment_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -511,7 +523,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 79b848c5773..c9f18218d9a 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
@@ -401,30 +401,42 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -475,7 +487,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 372edb5e5de..e8af7d87cae 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
@@ -421,30 +421,42 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -495,7 +507,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 4f445501669..0e2a932ce3b 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
@@ -413,30 +413,42 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
-						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
-						}
-						$listlines->merge();
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->lines as $line)
+						{
+							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -487,7 +499,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else
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 d237e1bce38..443981907e0 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
@@ -389,7 +389,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$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 
+					try
 					{
 						if (preg_match('/logo$/',$key)) // Image
 						{
@@ -408,34 +408,46 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Replace tags of lines
 				try
 				{
-					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->members as $u)
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					}
+					catch(OdfException $e)
 					{
-						$tmparray=$this->get_substitutionarray_each_var_object($u,$outputlangs);
-						unset($tmparray['object_pass']);
-						unset($tmparray['object_pass_indatabase']);
-						complete_substitutions_array($tmparray, $outputlangs, $object, $user, "completesubstitutionarray_users");
-						// Call the ODTSubstitutionLine hook
-						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$u);
-						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-						foreach($tmparray as $key => $val)
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						foreach ($object->members as $u)
 						{
-							try
+							$tmparray=$this->get_substitutionarray_each_var_object($u,$outputlangs);
+							unset($tmparray['object_pass']);
+							unset($tmparray['object_pass_indatabase']);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $user, "completesubstitutionarray_users");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$u);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($tmparray as $key => $val)
 							{
-								if(!is_array($val)) {
-									$listlines->setVars($key, $val, true, 'UTF-8');
+								try
+								{
+									if(!is_array($val)) {
+										$listlines->setVars($key, $val, true, 'UTF-8');
+									}
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
 								}
 							}
-							catch(OdfException $e)
-							{
-							}
-							catch(SegmentException $e)
-							{
-							}
+							$listlines->merge();
 						}
-						$listlines->merge();
+						$odfHandler->mergeSegment($listlines);
 					}
-					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
 				{
@@ -443,7 +455,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
-				
+
 				// Replace labels translated
 				$tmparray=$outputlangs->get_translations_for_substitutions();
 				foreach($tmparray as $key=>$value)
@@ -486,7 +498,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
-				
+
 				return 1;   // Success
 			}
 			else

From 38d1fc27e0edfccebfff6e02649f761f5490a34f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 13:41:01 +0100
Subject: [PATCH 198/386] Start to introduce common substitution rules for odt
 substitutions

---
 .../core/class/commondocgenerator.class.php   |  4 ++--
 .../doc/doc_generic_order_odt.modules.php     | 17 ++++++-------
 .../doc/doc_generic_contract_odt.modules.php  | 15 +++---------
 .../doc/doc_generic_invoice_odt.modules.php   | 16 +++++++------
 .../doc/doc_generic_product_odt.modules.php   | 24 ++++++++++---------
 .../doc/doc_generic_project_odt.modules.php   | 19 ++++++++-------
 .../task/doc/doc_generic_task_odt.modules.php | 11 +++++----
 .../doc/doc_generic_proposal_odt.modules.php  | 19 ++++++++-------
 ..._generic_supplier_proposal_odt.modules.php |  9 ++++---
 9 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index c9c250ee1fa..dd296429d58 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -349,8 +349,8 @@ abstract class CommonDocGenerator
 		$array_key.'_id'=>$object->id,
 		$array_key.'_ref'=>$object->ref,
 		$array_key.'_ref_ext'=>$object->ref_ext,
-		$array_key.'_ref_customer'=>$object->ref_client,
-		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur)?$object->ref_fournisseur:''),
+		$array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+		$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($object->date,'hour'),
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 0fb5dbabc03..8178af40c37 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
@@ -354,21 +354,22 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				{
 				}
 
-				// Make substitutions into odt
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
-                // retrieve contact information for use in order as contact_xxx tags
-        		$array_thirdparty_contact = array();
-        		if ($usecontact)
-            			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				// retrieve contact information for use in order as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
-				// Call the ODTSubstitution hook
 
+				// 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
 
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 8eca65f62ec..ff7abbca53a 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
@@ -296,26 +296,17 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				/* deprecated
-				$substitutionarray['__FROM_NAME__'] = $this->emetteur->name;
-				$substitutionarray['__FROM_EMAIL__'] = $this->emetteur->email;
-				$substitutionarray['__TOTAL_TTC__'] = $object->total_ttc;
-				$substitutionarray['__TOTAL_HT__'] = $object->total_ht;
-				$substitutionarray['__TOTAL_VAT__'] = $object->total_vat;
-				*/
-
-				// Make substitutions into ODT
-				$array_contract=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);		// complete with vars not set as properties by get_substitutionarray_each_var_object
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in contract as contact_xxx tags
 				$array_thirdparty_contact = array();
 				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$substitutionarray = array_merge($substitutionarray,$array_contract,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				$substitutionarray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
 				$tmparray = $substitutionarray;
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 c9f18218d9a..6d9d5172a7f 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
@@ -361,20 +361,22 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				{
 				}
 
-				// Make substitutions into odt
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array();
 				$array_other=$this->get_substitutionarray_other($outputlangs);
-		                // retrieve contact information for use in invoice as contact_xxx tags
-                		$array_thirdparty_contact = array();
-                		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				// retrieve contact information for use in invoice as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
+
 				// 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
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 8af397d15c1..6c5fa8652f9 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
@@ -95,7 +95,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 	function info($langs)
 	{
 		global $conf,$langs;
-		
+
 		$langs->load("companies");
 		$langs->load("errors");
 
@@ -361,6 +361,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				//print html_entity_decode($odfHandler->__toString());
 				//print exit;
 
+				$object->fetch_optionals();
 
 				// Make substitutions into odt of freetext
 				try {
@@ -369,25 +370,26 @@ class doc_generic_product_odt extends ModelePDFProduct
 				catch(OdfException $e)
 				{
 				}
-				
-				// Make substitutions into odt
-				$array_global = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				//$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				//$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
-                // retrieve contact information for use in product as contact_xxx tags
-        		$array_thirdparty_contact = array();
-        		if ($usecontact)
-            			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				// retrieve contact information for use in product as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$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 {
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 35e8ace270e..5c0d025252e 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
@@ -569,24 +569,25 @@ class doc_generic_project_odt extends ModelePDFProjects
 				//print exit;
 
 
-
-
-				// Make substitutions into odt of user info
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
-                // retrieve contact information for use in project as contact_xxx tags
-        		$array_project_contact = array();
-        		if ($usecontact)
-            			$array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				// retrieve contact information for use in project as contact_xxx tags
+				$array_project_contact = array();
+				if ($usecontact) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
+
 				// 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
+
 				foreach($tmparray as $key=>$value)
 				{
 					try {
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 c846d7f6a23..5f7ff754a65 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
@@ -507,17 +507,18 @@ class doc_generic_task_odt extends ModelePDFTask
 				//print exit;
 
 
-
-
-				// Make substitutions into odt of user info
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
+
 				foreach($tmparray as $key=>$value)
 				{
 					try {
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 e8af7d87cae..bc34d5b5691 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
@@ -375,6 +375,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				//print html_entity_decode($odfHandler->__toString());
 				//print exit;
 
+				$object->fetch_optionals();
 
 				// Make substitutions into odt of freetext
 				try {
@@ -384,23 +385,25 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				{
 				}
 
-				// Make substitutions into odt
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
-		                // retrieve contact information for use in proposal as contact_xxx tags
-                		$array_thirdparty_contact = array();
-                		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				// retrieve contact information for use in proposal as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
-				$object->fetch_optionals();
+
 				// 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
+
 				foreach($tmparray as $key=>$value)
 				{
 					try {
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 0e2a932ce3b..a8497416501 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
@@ -381,18 +381,21 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				{
 				}
 
-				// Make substitutions into odt
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+				$tmparray = array_merge($substitutionarray,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
+
 				// 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
+
 				foreach($tmparray as $key=>$value)
 				{
 					try {

From e2e0f23d2990caf349676d82438a787a99e3f566 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 14:01:52 +0100
Subject: [PATCH 199/386] FIX Bad var for substitution of free text

---
 .../modules/contract/doc/doc_generic_contract_odt.modules.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ff7abbca53a..98b644c8cce 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
@@ -317,7 +317,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Line of free text
 				$newfreetext='';
-				$paramfreetext='contract_FREE_TEXT';
+				$paramfreetext='CONTRACT_FREE_TEXT';
 				if (! empty($conf->global->$paramfreetext))
 				{
 					$newfreetext=make_substitutions($conf->global->$paramfreetext,$tmparray);

From 1ec5a5d0bf58cd6f21b4dfff89b825dd9598629b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 14:02:27 +0100
Subject: [PATCH 200/386] FIX Generic substitution of constant disabled for
 sensitive constant

---
 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 8476ab90b02..3f194d3531a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5947,7 +5947,8 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 		if (dol_textishtml($text,1)) $msgishtml = 1;
 
 		$keyfound = $reg[1];
-		$newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
+		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+		else $newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text);
 	}
 

From 3b5a3915c44be7f06b91fae595e4b17db299844c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 14:23:52 +0100
Subject: [PATCH 201/386] NEW Use common substitution rule for language to get
 translation in ODT

---
 htdocs/core/class/commondocgenerator.class.php | 8 ++++++++
 htdocs/core/class/translate.class.php          | 1 +
 2 files changed, 9 insertions(+)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index dd296429d58..f6a410469de 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -316,6 +316,14 @@ abstract class CommonDocGenerator
    			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
     	);
 
+
+    	foreach($conf->global as $key => $val)
+    	{
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+    		else $newval = $val;
+    		$array_other['__['.$key.']__'] = $newval;
+    	}
+
     	return $array_other;
     }
 
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 14f017bef55..69fe031459d 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -1027,6 +1027,7 @@ class Translate
 
 		foreach($this->tab_translate as $code => $label) {
 			$substitutionarray['lang_'.$code] = $label;
+			$substitutionarray['__('.$code.')__'] = $label;
 		}
 
 		return $substitutionarray;

From c604ce0a0676046c143bcbadf72e44e644819aa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2018 15:31:30 +0100
Subject: [PATCH 202/386] Fix date in odt

---
 htdocs/core/class/commondocgenerator.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f6a410469de..f5a16aa540b 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -353,6 +353,8 @@ abstract class CommonDocGenerator
 			$sumcreditnote = $object->getSumCreditNotesUsed();
 		}
 
+		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
+
 		$resarray=array(
 		$array_key.'_id'=>$object->id,
 		$array_key.'_ref'=>$object->ref,
@@ -361,9 +363,9 @@ 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($object->date,'hour'),
-		$array_key.'_date'=>dol_print_date($object->date,'day'),
-		$array_key.'_date_rfc'=>dol_print_date($object->date,'dayrfc'),
+        $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_creation'=>dol_print_date($object->date_creation,'day'),

From 029ef534d04b80292a381b19a6a4a43ea1803d47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2018 10:55:02 +0100
Subject: [PATCH 203/386] Clean deprecated code (property "special" removed
 from mod descriptor)

---
 htdocs/admin/modulehelp.php                   |  7 +---
 htdocs/admin/modules.php                      | 13 ++-----
 htdocs/contrat/class/contrat.class.php        | 28 +++++++------
 htdocs/core/lib/admin.lib.php                 |  2 -
 htdocs/core/modules/modAccounting.class.php   |  1 -
 htdocs/core/modules/modAdherent.class.php     |  1 -
 htdocs/core/modules/modAgenda.class.php       |  1 -
 htdocs/core/modules/modApi.class.php          |  4 +-
 htdocs/core/modules/modBanque.class.php       |  5 +--
 htdocs/core/modules/modBarcode.class.php      |  1 -
 htdocs/core/modules/modBlockedLog.class.php   |  2 -
 htdocs/core/modules/modBookmark.class.php     |  5 +--
 htdocs/core/modules/modCashDesk.class.php     |  1 -
 htdocs/core/modules/modCategorie.class.php    | 11 +++---
 htdocs/core/modules/modClickToDial.class.php  |  3 +-
 htdocs/core/modules/modCollab.class.php       |  2 -
 htdocs/core/modules/modCommande.class.php     |  9 ++---
 htdocs/core/modules/modComptabilite.class.php |  7 ++--
 htdocs/core/modules/modContrat.class.php      | 23 ++++++-----
 htdocs/core/modules/modCron.class.php         |  2 -
 htdocs/core/modules/modDeplacement.class.php  | 11 +++---
 .../modules/modDocumentGeneration.class.php   |  1 -
 htdocs/core/modules/modDon.class.php          |  1 -
 .../core/modules/modDynamicPrices.class.php   |  2 -
 htdocs/core/modules/modECM.class.php          |  2 -
 htdocs/core/modules/modExpedition.class.php   |  5 +--
 .../core/modules/modExpenseReport.class.php   |  1 -
 htdocs/core/modules/modExport.class.php       |  1 -
 htdocs/core/modules/modExternalRss.class.php  |  1 -
 htdocs/core/modules/modExternalSite.class.php |  4 +-
 htdocs/core/modules/modFTP.class.php          |  6 +--
 htdocs/core/modules/modFacture.class.php      |  1 -
 htdocs/core/modules/modFckeditor.class.php    |  1 -
 htdocs/core/modules/modFicheinter.class.php   |  7 ++--
 htdocs/core/modules/modFournisseur.class.php  |  1 -
 htdocs/core/modules/modGeoIPMaxmind.class.php |  4 +-
 htdocs/core/modules/modGravatar.class.php     |  4 +-
 htdocs/core/modules/modHRM.class.php          | 39 +++++++++----------
 htdocs/core/modules/modHoliday.class.php      |  2 -
 htdocs/core/modules/modImport.class.php       |  1 -
 htdocs/core/modules/modIncoterm.class.php     |  2 -
 htdocs/core/modules/modLabel.class.php        |  1 -
 htdocs/core/modules/modLdap.class.php         |  4 +-
 htdocs/core/modules/modLoan.class.php         |  9 ++---
 htdocs/core/modules/modMailing.class.php      |  1 -
 htdocs/core/modules/modMailmanSpip.class.php  |  3 +-
 htdocs/core/modules/modMargin.class.php       |  2 -
 .../core/modules/modModuleBuilder.class.php   |  2 -
 .../core/modules/modMultiCurrency.class.php   |  2 -
 htdocs/core/modules/modNotification.class.php |  3 +-
 htdocs/core/modules/modOauth.class.php        |  4 +-
 htdocs/core/modules/modOpenSurvey.class.php   |  2 -
 htdocs/core/modules/modPaybox.class.php       |  4 +-
 htdocs/core/modules/modPaypal.class.php       |  4 +-
 htdocs/core/modules/modPrelevement.class.php  | 13 +++----
 htdocs/core/modules/modPrinting.class.php     |  4 +-
 htdocs/core/modules/modProduct.class.php      |  1 -
 htdocs/core/modules/modProductBatch.class.php |  9 ++---
 htdocs/core/modules/modProjet.class.php       |  1 -
 htdocs/core/modules/modPropale.class.php      | 11 +++---
 .../core/modules/modReceiptPrinter.class.php  |  4 +-
 htdocs/core/modules/modResource.class.php     |  3 --
 htdocs/core/modules/modSalaries.class.php     |  1 -
 htdocs/core/modules/modService.class.php      |  1 -
 htdocs/core/modules/modSkype.class.php        |  4 +-
 htdocs/core/modules/modSociete.class.php      |  1 -
 htdocs/core/modules/modStock.class.php        |  1 -
 htdocs/core/modules/modStripe.class.php       |  4 +-
 .../modules/modSupplierProposal.class.php     | 13 +++----
 htdocs/core/modules/modSyslog.class.php       |  2 -
 htdocs/core/modules/modTax.class.php          | 17 ++++----
 htdocs/core/modules/modUser.class.php         |  1 -
 htdocs/core/modules/modVariants.class.php     |  2 -
 htdocs/core/modules/modWebServices.class.php  |  4 +-
 .../modules/modWebServicesClient.class.php    |  4 +-
 htdocs/core/modules/modWebsite.class.php      |  2 -
 htdocs/core/modules/modWorkflow.class.php     |  2 -
 .../core/modules/modMyModule.class.php        |  2 +-
 htdocs/public/demo/index.php                  |  2 -
 79 files changed, 130 insertions(+), 245 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index bc48feb076f..dd90774a05b 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -163,8 +163,6 @@ foreach ($modulesdir as $dir)
 		    						$modules[$i] = $objMod;
 		    			            $filename[$i]= $modName;
 
-		    			            $special = $objMod->special;
-
 		    			            // 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();
@@ -180,13 +178,11 @@ foreach ($modulesdir as $dir)
 		    			                $moduleposition = 800;
 		    			            }
 
-		    			            if ($special == 1) $familykey='interface';
-
 		    			            $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 = isset($specialtostring[$special])?$specialtostring[$special]:'unknown';
+		    						$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;
@@ -240,7 +236,6 @@ foreach($orders as $tmpkey => $tmpvalue)
     $i++;
 }
 $value = $orders[$key];
-$special = $objMod->special;
 $tab=explode('_',$value);
 $familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 00c8d14219e..db8251d0562 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -358,8 +358,6 @@ foreach ($modulesdir as $dir)
 		    			            $filename[$i]= $modName;
 		    					    $modules[$modName] = $objMod;
 
-		    			            $special = $objMod->special;
-
 		    			            // 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)) {
 		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
@@ -374,8 +372,6 @@ foreach ($modulesdir as $dir)
 		    			                $moduleposition = 800;
 		    			            }
 
-		    			            if ($special == 1) $familykey='interface';
-
 		    			            // Add list of warnings to show into arrayofwarnings and arrayofwarningsext
 		    			            if (! empty($objMod->warnings_activation))
 		    			            {
@@ -390,7 +386,7 @@ foreach ($modulesdir as $dir)
 		    						$dirmod[$i]  = $dir;
 		    						//print $i.'-'.$dirmod[$i].'<br>';
 		    			            // Set categ[$i]
-		    						$specialstring = isset($specialtostring[$special])?$specialtostring[$special]:'unknown';
+		    						$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;
@@ -531,12 +527,9 @@ if ($mode == 'common')
     	$objMod  = $modules[$modName];
     	$dirofmodule = $dirmod[$key];
 
-    	$special = $objMod->special;
-
-    	//print $objMod->name." - ".$key." - ".$objMod->special.' - '.$objMod->version."<br>";
+    	//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
     	//if (($mode != (isset($specialtostring[$special])?$specialtostring[$special]:'unknown') && $mode != 'expdev')
-    	if (($special >= 4 && $mode != 'expdev')
-    		|| ($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())
         {
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0b84b05b6fd..0d5262ac66b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -316,9 +316,10 @@ class Contrat extends CommonObject
 	 *
 	 * @param	User		$user      		Object User making action
      * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+     * @param	string		$comment		Comment
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function closeAll(User $user, $notrigger=0)
+	function closeAll(User $user, $notrigger=0, $comment='')
 	{
 		$this->db->begin();
 
@@ -337,7 +338,7 @@ class Contrat extends CommonObject
 				$contratline->date_cloture=$now;
 				$contratline->fk_user_cloture=$user->id;
 				$contratline->statut='5';
-				$result=$contratline->close_line($user, $now);
+				$result=$contratline->close_line($user, $now, $comment, $notrigger);
 				if ($result < 0)
 				{
 					$error++;
@@ -3140,9 +3141,10 @@ class ContratLigne extends CommonObjectLine
 	 * @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
 	 * @return int                    	<0 if KO, >0 if OK
 	 */
-	function close_line($user, $date_end, $comment = '')
+	function close_line($user, $date_end, $comment = '', $notrigger=0)
 	{
 		global $langs, $conf;
 
@@ -3164,15 +3166,19 @@ class ContratLigne extends CommonObjectLine
 		$sql .= " WHERE rowid = " . $this->id . " AND statut = 4";
 
 		$resql = $this->db->query($sql);
-		if ($resql) {
-			// Call trigger
-			$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
-			if ($result < 0) {
-				$error++;
-				$this->db->rollback();
-				return -1;
+		if ($resql)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
+				if ($result < 0) {
+					$error++;
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
 			}
-			// End call triggers
 
 			$this->db->commit();
 			return 1;
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 65cc2965bea..7991b711660 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1290,8 +1290,6 @@ function complete_elementList_with_modules(&$elementList)
                             $filename[$i]= $modName;
                             $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
                             //print "x".$modName." ".$orders[$i]."\n<br>";
-                            if (isset($categ[$objMod->special])) $categ[$objMod->special]++;                    // Array of all different modules categories
-                            else $categ[$objMod->special]=1;
                             $dirmod[$i] = $dirroot;
                             if (! empty($objMod->module_parts['contactelement']))
                             {
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 9bad202251e..ea7208cc5dd 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -54,7 +54,6 @@ class modAccounting extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'accounting';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index aa098146dc7..afdbfcf5ada 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -56,7 +56,6 @@ class modAdherent extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->special = 0;
         $this->picto='user';
 
         // Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 89085ea4d6c..01aa8896c35 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -59,7 +59,6 @@ class modAgenda extends DolibarrModules
 		$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);
-		$this->special = 0;
 		$this->picto='action';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 34c8e62a03f..3e27031fd6f 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -51,7 +51,7 @@ class modApi extends DolibarrModules
 
 		// 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->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)
@@ -60,8 +60,6 @@ class modApi extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
 		// 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'
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index c9fde5f0087..d32a63b5a86 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -58,7 +58,6 @@ class modBanque extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='account';
 
 		// Data directories to create when module is enabled
@@ -138,8 +137,8 @@ class modBanque extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index da8b51c8e8e..1f734af0871 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -51,7 +51,6 @@ class modBarcode extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 2;
 		$this->picto='barcode';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index b18f8bebf62..07331bcbc3c 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -55,8 +55,6 @@ class modBlockedLog extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 8924be16ba4..191e12bc2eb 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -52,7 +52,6 @@ class modBookmark extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 2;
 		$this->picto='bookmark';
 
 		// Data directories to create when module is enabled
@@ -98,10 +97,10 @@ class modBookmark extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par d�faut
 		$this->rights[$r][4] = 'supprimer';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
+
 	}
 }
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 33b44297628..4be7a937d1a 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -55,7 +55,6 @@ class modCashDesk extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'list';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index b56d405c354..153dd9ae58b 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -54,7 +54,6 @@ class modCategorie extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'category';
 
 		// Data directories to create when module is enabled
@@ -107,12 +106,12 @@ class modCategorie extends DolibarrModules
 		$this->rights[$r][4] = 'supprimer';
 		$r++;
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
@@ -308,7 +307,7 @@ class modCategorie extends DolibarrModules
 			's.url'=>"company",
 			'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'";
         $resql=$this->db->query($sql);
@@ -346,7 +345,7 @@ class modCategorie extends DolibarrModules
         	}
         }
         // 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';
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index c0983cc1a8b..4a5bcfc2f89 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -43,7 +43,7 @@ class modClickToDial extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 58;
 
-		$this->family = "technic";
+		$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));
 		$this->description = "Gestion du Click To Dial";
@@ -51,7 +51,6 @@ class modClickToDial extends DolibarrModules
 		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 1;
 		$this->picto='phoning';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 01a80d0b702..5349b000ac3 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -54,8 +54,6 @@ class modCollab extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 0;
         // Name of image file used for this module.
         $this->picto='globe';
 
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index e80833ae7c4..aecfb8bd090 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -59,7 +59,6 @@ class modCommande extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='order';
 
 		// Data directories to create when module is enabled
@@ -104,7 +103,7 @@ class modCommande extends DolibarrModules
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft orders';
 		$this->const[$r][4] = 0;*/
-		
+
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),
@@ -177,12 +176,12 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][4] = 'commande';
 		$this->rights[$r][5] = 'export';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index c07318fb36b..41349d214fc 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -57,7 +57,6 @@ class modComptabilite extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
         $this->picto='accounting';
 
 		// Config pages
@@ -94,12 +93,12 @@ class modComptabilite extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'resultat';
 		$this->rights[$r][5] = 'lire';
-		
-		
+
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
+
 	}
 
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 1b17b773c77..ac722cd04ef 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -55,7 +55,6 @@ class modContrat extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='contract';
 
 		// Data directories to create when module is enabled
@@ -71,28 +70,28 @@ class modContrat extends DolibarrModules
 		// Constants
 		$this->const = array();
 		$r=0;
-		
+
 		$this->const[$r][0] = "CONTRACT_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_contract_serpis";
 		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des contrats';
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		$this->const[$r][0] = "CONTRACT_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "strato";
 		$this->const[$r][3] = 'Name of PDF model of contract';
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		$this->const[$r][0] = "CONTRACT_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/contracts";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_contracts.php','enabledbydefaulton'=>'Home'),
@@ -103,7 +102,7 @@ class modContrat extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'contrat';
 		$r=0;
-		
+
 		$r++;
 		$this->rights[$r][0] = 161;
 		$this->rights[$r][1] = 'Lire les contrats';
@@ -146,12 +145,12 @@ class modContrat extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$langs->load("contracts");
@@ -223,7 +222,7 @@ class modContrat extends DolibarrModules
 		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/contracts/template_contract.odt';
 		$dirodt=DOL_DATA_ROOT.'/doctemplates/contracts';
 		$dest=$dirodt.'/template_contract.odt';
-		
+
 		if (file_exists($src) && ! file_exists($dest))
 		{
 		    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -236,12 +235,12 @@ class modContrat extends DolibarrModules
 		        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.")"
 		);
-		
+
 		return $this->_init($sql,$options);
 	}
 }
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 8afcc26c80f..b148149910f 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -54,8 +54,6 @@ class modCron extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
         // Name of image file used for this module.
         $this->picto = 'technic';
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index ec8d665b1e0..3baa7b74590 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -54,7 +54,6 @@ class modDeplacement extends DolibarrModules
 		$this->version = 'dolibarr_deprecated';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = "trip";
 
 		// Data directories to create when module is enabled
@@ -108,12 +107,12 @@ class modDeplacement extends DolibarrModules
 		$this->rights[5][3] = 0;
 		$this->rights[5][4] = 'export';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		$r=0;
 
@@ -134,12 +133,12 @@ class modDeplacement extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
-		
+
 		if (! empty($user))   // Not defined during migration process
 		{
     		$childids = $user->getAllChildIds();
     		$childids[]=$user->id;
-    		
+
     		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
 		}
 	}
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index ec40c8b6dc5..211fb38feca 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -53,7 +53,6 @@ class modDocumentGeneration extends DolibarrModules
 		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='email';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 08564e241aa..dacfad736bf 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -52,7 +52,6 @@ class modDon extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		// Name of png file (without png) used for this module.
 		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
 		$this->picto='bill';
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index 21aa3644e3e..c7bc152ff64 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -49,8 +49,6 @@ class modDynamicPrices extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 0;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index b263b16e29e..5b85ada7f70 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -57,8 +57,6 @@ class modECM extends DolibarrModules
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=other)
-		$this->special = 0;
 		// Name of png file (without png) used for this module
 		$this->picto='dir';
 
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 94c86e6e3b1..6fab26d68f6 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -58,7 +58,6 @@ class modExpedition extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = "sending";
 
 		// Data directories to create when module is enabled
@@ -222,8 +221,8 @@ class modExpedition extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 4d84c0a6d05..9cc16969748 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -51,7 +51,6 @@ class modExpenseReport extends DolibarrModules
 		$this->description = "Manage and claim expense reports (transportation, meal, ...)";
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='trip';
 
 		// Data directories to create when module is enabled.
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 4f754711ea1..b88438f5fe1 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -51,7 +51,6 @@ class modExport extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'technic';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index e3f4a538c4d..cf02888b9d2 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -52,7 +52,6 @@ class modExternalRss extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 1;
 		$this->picto='rss';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 388bc340776..18bb0b000b2 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -49,7 +49,7 @@ class modExternalSite extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','product','technic','other'
 		// It is used to sort modules in module setup page
-		$this->family = "other";
+		$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 (XXX is id value)
@@ -58,8 +58,6 @@ class modExternalSite extends DolibarrModules
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=other)
-		$this->special = 1;
 		// Name of png file (without png) used for this module
 		$this->picto='bookmark';
 		// Call to inside lang's file
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 5e4785d4225..bdd745437e1 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -48,7 +48,7 @@ class modFTP extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','product','ecm','technic','other'
 		// It is used to sort modules in module setup page
-		$this->family = "other";
+		$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 (XXX is id value)
@@ -57,8 +57,6 @@ class modFTP extends DolibarrModules
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
 		// Name of png file (without png) used for this module
 		$this->picto='dir';
 
@@ -110,7 +108,7 @@ class modFTP extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'write';
 
-		
+
 		// Menus
 		//-------
 		$this->menu[$r]=array('fk_menu'=>0,
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 04628560d74..9a23c0e5e9d 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -57,7 +57,6 @@ class modFacture extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'bill';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 54e1eadd735..812aa227ff6 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -52,7 +52,6 @@ class modFckeditor extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 2;
 		// Name of png file (without png) used for this module.
 		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
 		$this->picto='list';
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 0d9f73b76e4..0ba8f1bc42d 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -58,7 +58,6 @@ class modFicheinter extends DolibarrModules
         $this->version = 'dolibarr';
 
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->special = 0;
         $this->picto = "intervention";
 
         // Data directories to create when module is enabled
@@ -147,12 +146,12 @@ class modFicheinter extends DolibarrModules
         $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.
-        
-        
+
+
         //Exports
         //--------
         $r=1;
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 74c0070c92e..6034af489e5 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -59,7 +59,6 @@ class modFournisseur extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='company';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index eeb1b482198..88bc8b7e8b9 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -44,7 +44,7 @@ class modGeoIPMaxmind extends DolibarrModules
 
 		// 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->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)
@@ -53,8 +53,6 @@ class modGeoIPMaxmind extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
 		// 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/images directory, use this->picto=DOL_URL_ROOT.'/module/images/file.png'
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index c8ef071cf7e..8f25ed2025a 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -48,7 +48,7 @@ class modGravatar extends DolibarrModules
 
 		// 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->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)
@@ -57,8 +57,6 @@ class modGravatar extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
 		// 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/images directory, use this->picto=DOL_URL_ROOT.'/module/images/file.png'
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 3d1ea43f63c..033b6396fbe 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -31,41 +31,40 @@ class modHRM extends DolibarrModules
 	 * Constructor.
 	 * Define names, constants, directories, boxes, permissions
 	 *
-	 * @param DoliDB $db        	
+	 * @param DoliDB $db
 	 */
 	public function __construct($db)
 	{
 		global $langs, $conf;
-		
+
 		$this->db = $db;
 
 		$this->numero = 4000;
 		$this->rights_class = 'hrm';
-		
+
 		$this->family = "hr";
 		// 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 employees carrier and feelings (department, employment contract)";
-		
+
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
-		
+
 		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-		$this->special = 0;
 	    // 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';
-		
+
 		// define triggers
 		$this->module_parts = array();
-		
+
 		// Data directories to create when module is enabled
 		$this->dirs = array();
-		
+
 		// Config pages
 		$this->config_page_url = array('admin_hrm.php@hrm');
-		
+
 		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array(/*"
@@ -76,14 +75,14 @@ class modHRM extends DolibarrModules
 		$this->conflictwith = array();
 		$this->phpmin = array (
 			5,
-			3 
+			3
 		); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array (
 			3,
-			9 
+			9
 		); // Minimum version of Dolibarr required by module
 		$this->langfiles = array (
-			"hrm" 
+			"hrm"
 		);
 
 		// Dictionnaries
@@ -95,7 +94,7 @@ class modHRM extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array ();
-		
+
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
@@ -106,21 +105,21 @@ class modHRM extends DolibarrModules
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'read';
 		$r ++;
-		
+
 		$this->rights[$r][0] = 4002;
 		$this->rights[$r][1] = 'Create employees';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'write';
 		$r ++;
-		
+
 		$this->rights[$r][0] = 4003;
 		$this->rights[$r][1] = 'Delete employees';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'delete';
 		$r ++;
-		
+
 		$this->rights[$r][0] = 4004;
 		$this->rights[$r][1] = 'Export employees';
 		$this->rights[$r][3] = 0;
@@ -128,13 +127,13 @@ class modHRM extends DolibarrModules
 		$this->rights[$r][5] = 'export';
 		$r ++;
 
-		
+
 		// 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
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index aef9eb9a7bb..3fd056b525e 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -62,8 +62,6 @@ class modHoliday extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
 		// 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'
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index 18696ef4b11..01d66644dc7 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -51,7 +51,6 @@ class modImport extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto = 'technic';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 7b992fe0fde..7d4d1251f31 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -57,8 +57,6 @@ class modIncoterm extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
 		$this->picto='generic';
 
 		$this->module_parts = array();
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 4f7cb8cacbb..2d91fd121bb 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -51,7 +51,6 @@ class modLabel extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 2;
 		$this->picto='label';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index 27174a7dda0..0f183bd6c76 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -42,15 +42,13 @@ class modLdap extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 200;
 
-		$this->family = "technic";
+		$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));
 		$this->description = "Synchronisation Ldap";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
 		// 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/images directory, use this->picto=DOL_URL_ROOT.'/module/images/file.png'
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 7e445a3dbce..51779f6ffc5 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -54,7 +54,6 @@ class modLoan extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
@@ -118,7 +117,7 @@ class modLoan extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'delete';
 		$this->rights[$r][5] = '';
-		
+
 		$r++;
 		$this->rights[$r][0] = 525;
 		$this->rights[$r][1] = 'Access loan calculator';
@@ -135,12 +134,12 @@ class modLoan extends DolibarrModules
 		$this->rights[$r][4] = 'export';
 		$this->rights[$r][5] = '';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 64966e2105c..46b31a08696 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -51,7 +51,6 @@ class modMailing extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='email';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 209dcba3d2b..9a019db7fea 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -43,7 +43,7 @@ class modMailmanSpip extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 105;
 
-		$this->family = "technic";
+		$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));
 		$this->description = "Mailman or Spip interface for member module";
@@ -52,7 +52,6 @@ class modMailmanSpip extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 1;
 		$this->picto='technic';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 0a7f1a73a67..53fba120656 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -57,8 +57,6 @@ class modMargin extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=other)
-		$this->special = 2;
 		// Name of png file (without png) used for this module.
 		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
 		$this->picto='margin';
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 606cdd7af22..2c7b917d6d2 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -51,8 +51,6 @@ class modModuleBuilder extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 9d1be806de1..0dbfe3380cf 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -65,8 +65,6 @@ class modMultiCurrency extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
 		// 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'
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index a4a56e1da0d..cc016d294b5 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -41,7 +41,7 @@ class modNotification extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 600;
 
-		$this->family = "technic";
+		$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));
 		$this->description = "EMail notifications (push) on business Dolibarr events";
@@ -49,7 +49,6 @@ class modNotification extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 1;
 		$this->picto='email';
 
 		// Data directories to create when module is enabled.
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 0dce715a9f4..8b045608a6d 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -46,7 +46,7 @@ class modOauth extends DolibarrModules
         $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 = "technic";
+        $this->family = "interface";
         $this->module_position = 510;
         // 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));
@@ -55,8 +55,6 @@ class modOauth extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
         $this->version = 'dolibarr';
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index ea10750ad7c..fcee9f585aa 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -61,8 +61,6 @@ class modOpenSurvey extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
 		// 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'
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 6cbdd5e2127..164c9b0753a 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -48,7 +48,7 @@ class modPayBox extends DolibarrModules
 
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
-        $this->family = "other";
+        $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)
@@ -57,8 +57,6 @@ class modPayBox extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=other)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 08f1c77e6d6..3ea0535bd4f 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -49,7 +49,7 @@ class modPaypal extends DolibarrModules
 
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
-        $this->family = "other";
+        $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)
@@ -58,8 +58,6 @@ class modPaypal extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=other)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 542a02e7589..4d91c937d99 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -57,7 +57,6 @@ class modPrelevement extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		// Name of png file (without png) used for this module
 		$this->picto='payment';
 
@@ -74,15 +73,15 @@ class modPrelevement extends DolibarrModules
 		// Constants
 		$this->const = array();
 		$r=0;
-		
+
 		$this->const[$r][0] = "BANK_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "sepamandate";
 		$this->const[$r][3] = 'Name of manager to generate SEPA mandate';
 		$this->const[$r][4] = 0;
 		$r++;
-		
-		
+
+
 		// Boxes
 		$this->boxes = array();
 
@@ -129,11 +128,11 @@ class modPrelevement extends DolibarrModules
         $this->rights[2][4] = 'bons';
         $this->rights[2][5] = 'configurer';
 */
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
+
 	}
 
 
@@ -155,7 +154,7 @@ class modPrelevement extends DolibarrModules
 		$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);
 	}
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 89bf6115dae..9924e1861b4 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -46,7 +46,7 @@ class modPrinting extends DolibarrModules
         $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 = "technic";
+        $this->family = "interface";
         $this->module_position = 520;
         // 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));
@@ -54,8 +54,6 @@ class modPrinting extends DolibarrModules
         $this->description = "Enable Direct Printing System.";
         $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 427b2cd72e0..b2a0a6faf4f 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -59,7 +59,6 @@ class modProduct extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='product';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 9dbc8eb0212..91e8ddbae3c 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -47,7 +47,7 @@ class modProductBatch extends DolibarrModules
 
 		$this->family = "products";
 		$this->module_position = 45;
-		
+
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
@@ -56,7 +56,6 @@ class modProductBatch extends DolibarrModules
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 
 		$this->picto='stock';
 
@@ -95,12 +94,12 @@ class modProductBatch extends DolibarrModules
 		$this->rights = array();		// Permission array used by this module
 		$r=0;
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		$r=0;
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index edf5a1ab050..ab837803349 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -58,7 +58,6 @@ class modProjet extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->config_page_url = array("project.php@projet");
 		$this->picto='project';
 
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index a6b38f7d5ff..d4db0130492 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -58,7 +58,6 @@ class modPropale extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='propal';
 
 		// Data directories to create when module is enabled
@@ -101,13 +100,13 @@ class modPropale extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		/*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft proposals';
 		$this->const[$r][4] = 0;
 		$r++;*/
-				
+
 		// Boxes
 		$this->boxes = array(
            	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
@@ -170,12 +169,12 @@ class modPropale extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'export';
 
-		
+
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 50c93f07220..02e156a7abf 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -46,7 +46,7 @@ class modReceiptPrinter extends DolibarrModules
         $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 = "technic";
+        $this->family = "interface";
         $this->module_position = 530;
         // 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));
@@ -55,8 +55,6 @@ class modReceiptPrinter extends DolibarrModules
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
         $this->version = 'development';
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 148dbece597..a13410ddcf1 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -69,9 +69,6 @@ class modResource 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);
-		// Where to store the module in setup page
-		// (0=common,1=interface,2=others,3=very specific)
-		$this->special = 2;
 		// 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'
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index aecb9eeb49f..1e648c1386a 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -60,7 +60,6 @@ class modSalaries extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 7a9a3f4df3f..20261e98ca6 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -57,7 +57,6 @@ class modService extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='service';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
index 4c7d862cf66..d84520318a3 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -44,7 +44,7 @@ class modSkype extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "crm";
+        $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));
         $this->description = "Enable Skype links into contacts";
@@ -52,8 +52,6 @@ class modSkype extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // Name of image file used for this module.
         $this->picto='skype';
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index c41c2d391cc..52e865cbdbc 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -58,7 +58,6 @@ class modSociete extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->config_page_url = array("societe.php@societe");
 		// Name of image file used for this module.
 		$this->picto='company';
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index c23a02eeac1..ccbf6f83f57 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -57,7 +57,6 @@ class modStock extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='stock';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 7e6b15dee74..46af17cee55 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -48,7 +48,7 @@ class modStripe extends DolibarrModules
 
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
-        $this->family = "other";
+        $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)
@@ -57,8 +57,6 @@ class modStripe extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=other)
-        $this->special = 1;
         // 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'
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 8869f0cd343..34584ea3ffa 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -56,7 +56,6 @@ class modSupplierProposal extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='supplier_proposal';
 
 		$this->dirs = array();
@@ -177,7 +176,7 @@ class modSupplierProposal extends DolibarrModules
             'position'=>302
 		);
 		$r++;
-		
+
 		$this->menu[$r]=array(
 		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 		    'type'=>'left',
@@ -233,8 +232,8 @@ class modSupplierProposal extends DolibarrModules
 
 		return $this->_init($sql, $options);
 	}
-	
-	
+
+
 
 	/**
 	 * Function called when module is disabled.
@@ -249,8 +248,8 @@ class modSupplierProposal extends DolibarrModules
 	    $sql = array(
 	        "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"
 	    );
-	
+
 	    return $this->_remove($sql, $options);
-	}	
-	
+	}
+
 }
\ No newline at end of file
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 5f7ad0f387f..97c7b71ae21 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -57,8 +57,6 @@ class modSyslog extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 2;
 		// Name of image file used for this module.
 		$this->picto='technic';
 
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 8dfc7283b90..f3fa7d4e9db 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -58,7 +58,6 @@ class modTax extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
@@ -119,10 +118,10 @@ class modTax extends DolibarrModules
 
 		// Menus
 		//-------
-		
+
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=0;
@@ -140,7 +139,7 @@ class modTax extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax').')';
-		
+
 		// Import social contributions
 		$r++;
 		$this->import_code[$r]=$this->rights_class.'_'.$r;
@@ -151,14 +150,14 @@ class modTax extends DolibarrModules
 		$this->import_fields_array[$r]=array('t.libelle'=>"Label*",'t.fk_type'=>"Type",
 		    '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')
 		);
 		$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"
 		);
-		
+
 		// Import Taxes
 		$r++;
 		$this->import_code[$r]=$this->rights_class.'_'.$r;
@@ -169,14 +168,14 @@ class modTax extends DolibarrModules
 		$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'
 		);
-		
+
 		$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')
 		);
 		$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'
 		);
-		
+
 	}
 
 
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 95474ac8921..92323f853f6 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -55,7 +55,6 @@ class modUser extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 0;
 		$this->picto='group';
 
 		// Data directories to create when module is enabled
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 358a35b4435..87a2e2ce491 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -62,8 +62,6 @@ class modVariants extends DolibarrModules
 		$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);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
 		// 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'
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index ae979eb026e..8963f81813f 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -40,7 +40,7 @@ class modWebServices extends DolibarrModules
         $this->db = $db;
         $this->numero = 2600;
 
-        $this->family = "technic";
+        $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));
         $this->description = "Enable the Dolibarr web services server";
@@ -48,8 +48,6 @@ class modWebServices extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index 2dd0ee871c5..9b6535143b3 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -40,7 +40,7 @@ class modWebServicesClient extends DolibarrModules
         $this->db = $db;
         $this->numero = 2660;
 
-        $this->family = "technic";
+        $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));
         $this->description = "Enable the web service client to call external supplier web services";
@@ -48,8 +48,6 @@ class modWebServicesClient extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index d62576c5063..fb6e91283db 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -54,8 +54,6 @@ class modWebsite extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 0;
         // Name of image file used for this module.
         $this->picto='globe';
 
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 5c348cdf77f..e721513073a 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -56,8 +56,6 @@ class modWorkflow extends DolibarrModules
         $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);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
         // 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'
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 1d8ba3dace6..eea2a85e656 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -53,7 +53,7 @@ class modMyModule extends DolibarrModules
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'mymodule';
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
+		// 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', ...)
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 61685ed8267..81450bd8a04 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -178,8 +178,6 @@ foreach ($modulesdir as $dir)
                             $filename[$i]= $modName;
                             $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
                             //print "x".$modName." ".$orders[$i]."\n<br>";
-       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
-       			            else $categ[$objMod->special]=1;
                             $dirmod[$i] = $dirroot;
                             $j++;
                             $i++;

From dd204947b8fff0c09ccaf3c0b82cc551a061da2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2018 11:00:50 +0100
Subject: [PATCH 204/386] CSS

---
 htdocs/public/demo/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 81450bd8a04..61919c54b1a 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -327,7 +327,7 @@ foreach ($demoprofiles as $profilearray)
 		    print '<div class="clearboth"></div>';
 		}
 
-		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
+		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" id="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
         print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@@ -338,7 +338,7 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
+        print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
 
 
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';

From 1f60d9ba81534d799349a87d8b37e0ba1b5d1899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2018 13:14:55 +0100
Subject: [PATCH 205/386] Fix travis

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

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 033b6396fbe..a209fdccf2e 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -31,7 +31,7 @@ class modHRM extends DolibarrModules
 	 * Constructor.
 	 * Define names, constants, directories, boxes, permissions
 	 *
-	 * @param DoliDB $db
+	 * @param 	DoliDB 	$db		Database handler
 	 */
 	public function __construct($db)
 	{

From 2cd5ed65a658dec9cc94d2bb900a944554db09a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2018 14:13:09 +0100
Subject: [PATCH 206/386] Clean deprecated (field unit_charge in supplier
 price)

---
 htdocs/core/class/html.formmargin.class.php   |  4 +---
 .../fourn/class/fournisseur.product.class.php | 24 ++++++-------------
 .../install/mysql/migration/7.0.0-8.0.0.sql   |  2 ++
 .../tables/llx_product_fournisseur_price.sql  |  5 ++--
 htdocs/product/composition/card.php           |  2 +-
 htdocs/product/fournisseurs.php               | 17 -------------
 htdocs/product/list.php                       |  2 +-
 7 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 5f78fa0e283..cf1b7064a01 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -85,8 +85,6 @@ class FormMargin
 				$product = new ProductFournisseur($db);
 				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
 					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0)
-					$line->pa_ht += $product->fourn_unitcharges;
 			}
 			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
 			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
@@ -96,7 +94,7 @@ class FormMargin
 			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
 			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa = $line->qty * $pa_ht;
-			
+
 			// calcul des marges
 			if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) {    // remise
 				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 74da470c04c..c8c24afc942 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -64,10 +64,6 @@ class ProductFournisseur extends Product
     var $fourn_unitprice;
     var $fourn_tva_tx;
     var $fourn_tva_npr;
-    /**
-     * @deprecated
-     */
-    var $fourn_unitcharges;       // old version used a buggy system to calculate margin of a charge field on supplier price. Now margin is on pmp, best supplier price or cost price.
 
     var $fk_supplier_price_expression;
     var $supplier_reputation;     // reputation of supplier
@@ -215,7 +211,6 @@ class ProductFournisseur extends Product
  		$error=0;
 
 		$unitBuyPrice = price2num($buyprice/$qty,'MU');
-		$unitCharges = price2num($charges/$qty,'MU');
 
 		$now=dol_now();
 
@@ -250,7 +245,6 @@ class ProductFournisseur extends Product
 			$sql.= " remise_percent = ".$remise_percent.",";
 			$sql.= " remise = ".$remise.",";
 			$sql.= " unitprice = ".$unitBuyPrice.",";
-			$sql.= " unitcharges = ".$unitCharges.",";   // deprecated
 			$sql.= " fk_availability = ".$availability.",";
 			$sql.= " entity = ".$conf->entity.",";
 			$sql.= " tva_tx = ".price2num($tva_tx).",";
@@ -306,7 +300,7 @@ class ProductFournisseur extends Product
             if ($resql) {
                 // Add price for this quantity to supplier
                 $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price(";
-                $sql .= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation)";
+                $sql .= "datec, fk_product, fk_soc, ref_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)";
                 $sql .= " values('" . $this->db->idate($now) . "',";
                 $sql .= " " . $this->id . ",";
                 $sql .= " " . $fourn->id . ",";
@@ -319,7 +313,6 @@ class ProductFournisseur extends Product
                 $sql .= " " . $unitBuyPrice . ",";
                 $sql .= " " . $tva_tx . ",";
                 $sql .= " " . $charges . ",";
-                $sql .= " " . $unitCharges . ",";
                 $sql .= " " . $availability . ",";
                 $sql .= " ".($newdefaultvatcode?"'".$this->db->escape($newdefaultvatcode)."'":"null").",";
                 $sql .= " " . $newnpr . ",";
@@ -393,7 +386,7 @@ class ProductFournisseur extends Product
     {
         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.fk_availability,";
-        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
+        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " pfp.supplier_reputation";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
@@ -418,7 +411,6 @@ class ProductFournisseur extends Product
             	$this->fourn_remise_percent     = $obj->remise_percent;
             	$this->fourn_remise             = $obj->remise;
             	$this->fourn_unitprice          = $obj->unitprice;
-            	$this->fourn_unitcharges        = $obj->unitcharges;	// deprecated
             	$this->fourn_tva_tx				= $obj->tva_tx;
             	// TODO
             	// $this->fourn_tva_npr			= $obj->fourn_tva_npr; // TODO this field not exist in llx_product_fournisseur_price. We should add it ?
@@ -478,7 +470,7 @@ class ProductFournisseur extends Product
 
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
         $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_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.unitcharges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation";
+        $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.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
         $sql.= " WHERE pfp.entity IN (".getEntity('productprice').")";
@@ -510,7 +502,6 @@ class ProductFournisseur extends Product
 				$prodfourn->fourn_remise			= $record["remise"];
 				$prodfourn->fourn_unitprice			= $record["unitprice"];
 				$prodfourn->fourn_charges           = $record["charges"];		// deprecated
-				$prodfourn->fourn_unitcharges       = $record["unitcharges"];	// deprecated
                 $prodfourn->fourn_tva_tx			= $record["tva_tx"];
                 $prodfourn->fourn_id				= $record["fourn_id"];
                 $prodfourn->fourn_name				= $record["supplier_name"];
@@ -588,7 +579,7 @@ class ProductFournisseur extends Product
 
         $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, pfp.unitcharges, ";
+        $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.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE s.entity IN (".getEntity('societe').")";
@@ -623,7 +614,7 @@ class ProductFournisseur extends Product
                 {
                     $fourn_price = $record["price"];
                     // discount calculated buy price
-                    $fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) + $record["unitcharges"] - $record["remise"];
+                    $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"];
@@ -657,7 +648,6 @@ class ProductFournisseur extends Product
                         $this->fourn_remise             = $record["remise"];
                         $this->fourn_unitprice          = $record["unitprice"];
                         $this->fourn_charges            = $record["charges"];		// deprecated
-                        $this->fourn_unitcharges        = $record["unitcharges"];	// deprecated
                         $this->fourn_tva_tx             = $record["tva_tx"];
                         $this->fourn_id                 = $record["fourn_id"];
                         $this->fourn_name               = $record["supplier_name"];
@@ -755,14 +745,14 @@ class ProductFournisseur extends Product
             $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 align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) + $productFourn->fourn_unitcharges - $productFourn->fourn_remise):'').'</td>';
+                $out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').'</td>';
                 $out.= '<td align="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_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
+            $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;
     }
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 6488a7dafde..79148c6887d 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
@@ -29,6 +29,8 @@
 
 -- For 8.0
 
+ALTER TABLE llx_product_fournisseur_price DROP COLUMN unitcharges;
+
 ALTER TABLE llx_societe ADD COLUMN fk_entrepot integer DEFAULT 0;
 ALTER TABLE llx_projet ADD COLUMN bill_time integer DEFAULT 0;
 
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 1c86bfe04f8..14664225a9d 100755
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -29,13 +29,12 @@ create table llx_product_fournisseur_price
   fk_soc				integer,
   ref_fourn				varchar(30),
   fk_availability		integer,	   
-  price					double(24,8) DEFAULT 0,
+  price					double(24,8) DEFAULT 0,		-- price without tax for quantity
   quantity				double,
   remise_percent		double NOT NULL DEFAULT 0,
   remise				double NOT NULL DEFAULT 0,
-  unitprice				double(24,8) DEFAULT 0,
+  unitprice				double(24,8) DEFAULT 0,		-- unit price without tax
   charges				double(24,8) DEFAULT 0,		-- to store transport cost. Constant PRODUCT_CHARGES must be set to see it.
-  unitcharges			double(24,8) DEFAULT 0,		-- deprecated
   default_vat_code	    varchar(10),
   tva_tx				double(6,3) NOT NULL,
   localtax1_tx		    double(6,3) DEFAULT 0,
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index a6cc3427243..79120aa1191 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -370,7 +370,7 @@ if ($id > 0 || ! empty($ref))
 						}
 						print '</td>';
 
-					    $totalline=price2num($value['nb'] * ($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) + $product_fourn->fourn_unitcharges - $product_fourn->fourn_remise), 'MT');
+					    $totalline=price2num($value['nb'] * ($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) - $product_fourn->fourn_remise), 'MT');
 						$total+=$totalline;
 
 						print '<td align="right">';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5219291e8af..4f266611940 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -638,11 +638,6 @@ if ($id > 0 || $ref)
 				print_liste_field_titre("DiscountQtyMin",$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("NbDaysToDelivery",$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre("ReputationForThisProduct",$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder);
-				// Charges ????
-				if ($conf->global->PRODUCT_CHARGES)
-				{
-					if (! empty($conf->margin->enabled)) print_liste_field_titre("UnitCharges");
-				}
 				print_liste_field_titre('');
 				print "</tr>\n";
 
@@ -708,18 +703,6 @@ if ($id > 0 || $ref)
 						}
 						print'</td>';
 
-						// Charges ????
-						/*
-						if ($conf->global->PRODUCT_CHARGES)
-						{
-							if (! empty($conf->margin->enabled))
-							{
-								print '<td align="right">';
-								print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
-								print '</td>';
-							}
-						}*/
-
 						if (is_object($hookmanager))
 						{
 							$parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$object->id);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index ebb2c0a421a..59b76ecab69 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -793,7 +793,7 @@ else
 								if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
 								{
 									$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
-									print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) + $product_fourn->fourn_unitcharges - $product_fourn->fourn_remise).' '.$langs->trans("HT"),$htmltext);
+									print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"),$htmltext);
 								}
 								else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
 							}

From 60525b9c181d0d2de728a34ec1cd57e7b39ac1be Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 25 Feb 2018 15:35:41 +0100
Subject: [PATCH 207/386] Fix: multicompany transverse mode is managed by the
 module

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e6ced69ea64..8cc18900d70 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -67,9 +67,7 @@ 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);
 }
-if(! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-	$caneditgroup = ($conf->entity == 1) && ! empty($user->admin) && empty($user->entity);
-}
+
 // Define value to know what current user can do on properties of edited user
 if ($id)
 {

From d8a0cb73872f311b58b818c8f5294e9a5cff18da Mon Sep 17 00:00:00 2001
From: guillaume-uH57J9 <guillaume-uH57J9@users.noreply.github.com>
Date: Sun, 25 Feb 2018 19:43:53 +0100
Subject: [PATCH 208/386] install, don't use innodb engine for pgsql

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

diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 44661c191d7..a891a2f590e 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -201,8 +201,10 @@ if ($action == "set")
                 {
                     $buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
                 }
-                else if ($conf->db->type == 'mssql')
+                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);
                 }

From ef60d095c0b2b8a0495b48a94e41fae9b8764d0c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 25 Feb 2018 19:55:10 +0100
Subject: [PATCH 209/386] Fix: syntax error

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

diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index e6103ee8fb9..3aaca6f00b5 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -31,4 +31,4 @@ CREATE TABLE llx_expensereport_rules (
   code_expense_rules_type	varchar(50) NOT NULL,
   is_for_all				tinyint DEFAULT '0',
   entity					integer DEFAULT 1
-) ENGINE=InnoDB
\ No newline at end of file
+) ENGINE=InnoDB;
\ No newline at end of file

From 093ea49cc67161ec6075be1859932ee1a86c2d97 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 25 Feb 2018 17:43:19 +0100
Subject: [PATCH 210/386] Fix: use "multidir_output" instead "dir_output"

---
 htdocs/admin/propal.php                       |  2 +-
 htdocs/api/class/api_documents.class.php      |  2 +-
 htdocs/comm/index.php                         |  6 +++---
 htdocs/comm/propal/card.php                   |  6 +++---
 htdocs/comm/propal/class/propal.class.php     | 10 +++++-----
 htdocs/comm/propal/document.php               |  4 ++--
 htdocs/comm/propal/index.php                  |  9 +++++----
 htdocs/comm/propal/list.php                   |  8 ++++----
 htdocs/core/class/conf.class.php              |  5 ++++-
 htdocs/core/class/html.formfile.class.php     |  3 +++
 htdocs/core/class/notify.class.php            |  8 ++++----
 htdocs/core/lib/files.lib.php                 | 19 +++++++++----------
 htdocs/core/lib/functions.lib.php             |  2 +-
 htdocs/core/lib/propal.lib.php                |  4 ++--
 .../doc/doc_generic_proposal_odt.modules.php  |  8 ++++----
 .../modules/propale/doc/pdf_azur.modules.php  |  8 ++++----
 16 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 8d09e81e142..ee0db9d594a 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -631,7 +631,7 @@ print "<tr class=\"liste_titre\">\n";
 print "  <td>".$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Value")."</td>\n";
 print "</tr>\n";
-print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->propal->dir_output."</td>\n</tr>\n";
+print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->propal->multidir_output[$conf->entity]."</td>\n</tr>\n";
 print "</table>\n<br>";
 
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index d5b30d67d11..07f124741fe 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -306,7 +306,7 @@ class Documents extends DolibarrApi
 				throw new RestException(404, 'Proposal not found');
 			}
 
-			$upload_dir = $conf->propal->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
+			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
 		}
 		else if ($modulepart == 'commande' || $modulepart == 'order')
 		{
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 91004c86f67..bdf92b31905 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -676,8 +676,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 {
 	$langs->load("propal");
 
-	$sql = "SELECT s.nom as name, s.rowid, p.rowid as propalid, 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.code_client";
+	$sql = "SELECT s.nom as name, s.rowid, s.code_client";
+	$sql.= ", 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.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -726,7 +726,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 02c1b0e65bb..37df118773f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1292,7 +1292,7 @@ if (empty($reshook))
 	}
 
 	// Actions to build doc
-	$upload_dir = $conf->propal->dir_output;
+	$upload_dir = $conf->propal->multidir_output[$object->entity];
 	$permissioncreate=$user->rights->propal->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -2425,7 +2425,7 @@ if ($action == 'create')
 		 * Documents generes
 		 */
 		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
+		$filedir = $conf->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 		$genallowed = $user->rights->propal->lire;
 		$delallowed = $user->rights->propal->creer;
@@ -2466,7 +2466,7 @@ if ($action == 'create')
 	// Presend form
 	$modelmail='propal_send';
 	$defaulttopic='SendPropalRef';
-	$diroutput = $conf->propal->dir_output;
+	$diroutput = $conf->propal->multidir_output[$object->entity];
 	$trackid = 'pro'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 850fa969bbb..3adc58ecbae 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1749,8 +1749,8 @@ class Propal extends CommonObject
 				// to  not lose the linked files
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
-				$dirsource = $conf->propal->dir_output.'/'.$oldref;
-				$dirdest = $conf->propal->dir_output.'/'.$newref;
+				$dirsource = $conf->propal->multidir_output[$this->entity].'/'.$oldref;
+				$dirdest = $conf->propal->multidir_output[$this->entity].'/'.$newref;
 
 				if (file_exists($dirsource))
 				{
@@ -1759,7 +1759,7 @@ class Propal extends CommonObject
 					{
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles=dol_dir_list($conf->propal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+						$listoffiles=dol_dir_list($dirdest, 'files', 1, '^'.preg_quote($oldref,'/'));
 						foreach($listoffiles as $fileentry)
 						{
 							$dirsource=$fileentry['name'];
@@ -2815,9 +2815,9 @@ class Propal extends CommonObject
 					{
 						// We remove directory
 						$ref = dol_sanitizeFileName($this->ref);
-						if ($conf->propal->dir_output && !empty($this->ref))
+						if ($conf->propal->multidir_output[$this->entity] && !empty($this->ref))
 						{
-							$dir = $conf->propal->dir_output . "/" . $ref ;
+							$dir = $conf->propal->multidir_output[$this->entity] . "/" . $ref ;
 							$file = $dir . "/" . $ref . ".pdf";
 							if (file_exists($file))
 							{
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index ba373c78f44..4ceae6b1221 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -75,7 +75,7 @@ $object->fetch($id,$ref);
 if ($object->id > 0)
 {
     $object->fetch_thirdparty();
-    $upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
+    $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
 }
 
@@ -90,7 +90,7 @@ $form = new Form($db);
 
 if ($object->id > 0)
 {
-	$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
+	$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');
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index a313ab299f0..e9dce10ea0b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -216,7 +216,7 @@ $max=5;
  * Last modified proposals
  */
 
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
 $sql.= " date_cloture as datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -262,7 +262,7 @@ if ($resql)
 
 			print '<td width="16" align="right" class="nobordernopadding">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
@@ -296,7 +296,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 
 	$now=dol_now();
 
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+	$sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -341,7 +342,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index a47625e100b..3bc3b120a84 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -110,7 +110,7 @@ if (! empty($socid))
 }
 $result = restrictedArea($user, $module, $objectid, $dbtable);
 
-$diroutputmassaction=$conf->propal->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction=$conf->propal->multidir_output[$conf->entity] . '/temp/massgeneration/'.$user->id;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propallist'));
@@ -214,7 +214,7 @@ if (empty($reshook))
 	$objectlabel='Proposals';
 	$permtoread = $user->rights->propal->lire;
 	$permtodelete = $user->rights->propal->supprimer;
-	$uploaddir = $conf->propal->dir_output;
+	$uploaddir = $conf->propal->multidir_output[$conf->entity];
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -242,7 +242,7 @@ if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= ' s.rowid as socid, s.nom as name, s.email, 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,";
-$sql.= ' p.rowid, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
+$sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
 $sql.= ' p.datec as date_creation, p.tms as date_update,';
 $sql.= " pr.rowid as project_id, pr.ref as project_ref,";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
@@ -663,7 +663,7 @@ if ($resql)
 			// Other picto tool
 			print '<td width="16" align="right" class="nobordernopadding">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index a1d051440c3..0705d2fd60d 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -310,7 +310,7 @@ class Conf
 
 		// For user storage
 		$this->user->multidir_output	= array($this->entity => $rootfordata."/users");
-		$this->user->multidir_temp		= array($this->entity => $rootfordata."/users/temp");
+		$this->user->multidir_temp	= array($this->entity => $rootfordata."/users/temp");
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
@@ -320,6 +320,9 @@ class Conf
 		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
 
 		// For propal storage
+		$this->propal->multidir_output	= array($this->entity => $rootfordata."/propale");
+		$this->propal->multidir_temp		= array($this->entity => $rootfordata."/propale/temp");
+		// For backward compatibility
 		$this->propal->dir_output=$rootfordata."/propale";
 		$this->propal->dir_temp=$rootfordata."/propale/temp";
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b139483b610..ffe5a459699 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -299,6 +299,9 @@ class FormFile
 			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
 		}
 
+		// Add entity in $param
+		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
+
 		$printer=0;
 		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
 		{
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 7554a82a5fd..cff29099743 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -392,13 +392,13 @@ class Notify
 								break;
 							case 'PROPAL_VALIDATE':
 								$link='/comm/propal/card.php?id='.$object->id;
-								$dir_output = $conf->propal->dir_output;
+								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
 								break;
 							case 'PROPAL_CLOSE_SIGNED':
 								$link='/comm/propal/card.php?id='.$object->id;
-								$dir_output = $conf->propal->dir_output;
+								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$newref);
 								break;
@@ -574,13 +574,13 @@ class Notify
 						break;
 					case 'PROPAL_VALIDATE':
 						$link='/comm/propal/card.php?id='.$object->id;
-						$dir_output = $conf->propal->dir_output;
+						$dir_output = $conf->propal->multidir_output[$object->entity];
 						$object_type = 'propal';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
 						break;
 					case 'PROPAL_CLOSE_SIGNED':
 						$link='/comm/propal/card.php?id='.$object->id;
-						$dir_output = $conf->propal->dir_output;
+						$dir_output = $conf->propal->multidir_output[$object->entity];
 						$object_type = 'propal';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$newref);
 						break;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 529f58dbbf1..fb816ece6c9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2147,10 +2147,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
-	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
+	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
@@ -2195,10 +2195,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
-	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
+	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_temp.'/'.$original_file;
+		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
@@ -2362,13 +2362,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping for mass actions
-	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
+	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
@@ -2402,7 +2402,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
+	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2457,14 +2457,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les propales
-	else if ($modulepart == 'propal' && !empty($conf->propal->dir_output))
+	else if ($modulepart == 'propal' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3f194d3531a..78cf44d2795 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7108,7 +7108,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
 
 	if ($alldata == 1)
 	{
-		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:''), 'mime'=>dol_mimetype($relativepath), );
 		else return array();
 	}
 
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index f0d42888745..c50661de831 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -35,7 +35,7 @@ function propal_prepare_head($object)
 	$langs->load("propal");
 	$langs->load("compta");
 	$langs->load("companies");
-	
+
 	$h = 0;
 	$head = array();
 
@@ -86,7 +86,7 @@ function propal_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->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $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);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
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 bc34d5b5691..0b71e9e862f 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
@@ -246,7 +246,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$outputlangs->load("companies");
 		$outputlangs->load("bills");
 
-		if ($conf->propal->dir_output)
+		if ($conf->propal->multidir_output[$conf->entity])
 		{
 			// If $object is id instead of object
 			if (! is_object($object))
@@ -261,7 +261,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				}
 			}
 
-			$dir = $conf->propal->dir_output;
+			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
 			$file = $dir . "/" . $objectref . ".odt";
@@ -303,7 +303,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				//print "file=".$file;
 				//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
 
-				dol_mkdir($conf->propal->dir_temp);
+				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
 
 
 				// If CUSTOMER contact defined on proposal, we use it
@@ -357,7 +357,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
-						'PATH_TO_TMP'	  => $conf->propal->dir_temp,
+						'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
 						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 7be8b6a0d08..a54cfbf212f 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -230,7 +230,7 @@ class pdf_azur extends ModelePDFPropales
 
 		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-		if ($conf->propal->dir_output)
+		if ($conf->propal->multidir_output[$conf->entity])
 		{
 			$object->fetch_thirdparty();
 
@@ -239,13 +239,13 @@ class pdf_azur extends ModelePDFPropales
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
-				$dir = $conf->propal->dir_output;
+				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->propal->dir_output . "/" . $objectref;
+				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 			}
 
@@ -1501,7 +1501,7 @@ class pdf_azur extends ModelePDFPropales
 		{
 			$top_shift = $pdf->getY() - $current_y;
 		}
-		
+
 		if ($showaddress)
 		{
 			// Sender properties

From 365fffddf5e4bb0b2178781eea7c07e6ce027ef3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 26 Feb 2018 11:00:49 +0100
Subject: [PATCH 211/386] Fix: missing object entity

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ffe5a459699..b7b94e7e644 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -850,6 +850,10 @@ class FormFile
 		$out='';
 		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
+		// Get object entity
+		preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir).'$/', $filedir, $regs);
+		$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : $conf->entity);
+
 		$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
 
 		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
@@ -903,7 +907,7 @@ class FormFile
 				}
 
 				// Download
-				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
 				$mime=dol_mimetype($relativepath,'',0);
 				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
 				$tmpout.= '>';

From 0d125524456a9a7dd655975223f98653b4ad40e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 11:57:29 +0100
Subject: [PATCH 212/386] NEW Can enter time spent from the list of time spent
 of project

---
 htdocs/core/class/html.formprojet.class.php |  67 ++++++-----
 htdocs/projet/class/project.class.php       |   6 +-
 htdocs/projet/tasks.php                     |  17 ++-
 htdocs/projet/tasks/time.php                | 126 +++++++++++++++++---
 4 files changed, 156 insertions(+), 60 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index f1d407d3bba..9f03213a16d 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -292,7 +292,7 @@ class FormProjets
 	}
 
 	/**
-	 *	Output a combo list with projects qualified for a third party
+	 *	Output a combo list with tasks qualified for a third party
 	 *
 	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
 	 *	@param  int		$selected   	Id task preselected
@@ -304,9 +304,11 @@ class FormProjets
      *  @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
+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500')
+	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500', $projectsListId='', $showproject='all')
 	{
 		global $user,$conf,$langs;
 
@@ -317,11 +319,13 @@ class FormProjets
 		$hideunselectables = false;
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
-		$projectsListId = false;
-		if (empty($user->rights->projet->all->lire))
+		if (empty($projectsListId))
 		{
-			$projectstatic=new Project($this->db);
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			if (empty($user->rights->projet->all->lire))
+			{
+				$projectstatic=new Project($this->db);
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			}
 		}
 
 		// Search all projects
@@ -332,7 +336,7 @@ class FormProjets
 		$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		$sql.= " ORDER BY p.ref, t.ref ASC";
@@ -378,31 +382,38 @@ class FormProjets
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);     // Project ref
-						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
-						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
+						$labeltoshow = '';
 
-						if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+						if ($showproject == 'all')
+						{
+							$labeltoshow.=dol_trunc($obj->ref,18);     // Project ref
+							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+							//else $labeltoshow.=' ('.$langs->trans("Private").')';
+							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
 
-						$disabled=0;
-						if ($obj->fk_statut == 0)
-						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
-						{
-							if ($discard_closed == 2) $disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+
+							$disabled=0;
+							if ($obj->fk_statut == 0)
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Draft");
+							}
+							else if ($obj->fk_statut == 2)
+							{
+								if ($discard_closed == 2) $disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Closed");
+							}
+							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							}
+							$labeltoshow.=' - ';
 						}
+
 						// Label for task
-						$labeltoshow.=' - '.$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
+						$labeltoshow.=$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c8096559c9c..6e8c12793cc 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1141,10 +1141,10 @@ class Project extends CommonObject
      *
      * @param 	User	$user			User object
      * @param 	int		$mode			0=All project I have permission on (assigned to me and public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
-     * @param 	int		$list			0=Return array,1=Return string list
+     * @param 	int		$list			0=Return array, 1=Return string list
      * @param	int		$socid			0=No filter on third party, id of third party
-     * @param	string		$filter			additionnal filter on project (statut, ref, ...)
-     * @return 	array or string			Array of projects id, or string with projects id separated with ","
+     * @param	string	$filter			additionnal filter on project (statut, ref, ...)
+     * @return 	array or string			Array of projects id, or string with projects id separated with "," if list is 1
      */
     function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
     {
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 11367951976..2eb9bc1e44f 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -455,29 +455,25 @@ else if ($id > 0 || ! empty($ref))
 		}
 	}
 
+	print '<br>';
 
-	/*
-	 * Actions
-	 */
-	print '<div class="tabsAction">';
-
+	// Link to create task
 	if ($user->rights->projet->all->creer || $user->rights->projet->creer)
 	{
 		if ($object->public || $userWrite > 0)
 		{
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
+			$linktocreatetask = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
 		}
 		else
 		{
-			print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
+			$linktocreatetask = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
 		}
 	}
 	else
 	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+		$linktocreatetask = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
 	}
 
-	print '</div>';
 
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
@@ -492,8 +488,9 @@ else if ($id > 0 || ! empty($ref))
 
 	$title=$langs->trans("ListOfTasks");
 	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
+
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
-	print load_fiche_titre($title,$linktotasks,'title_generic.png');
+	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'title_generic.png');
 
 	// 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).
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 49e917e4b61..44bed2119d2 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 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.'/core/class/html.formprojet.class.php';
 
 $langs->load('projects');
 
@@ -38,6 +39,7 @@ $projectid=GETPOST('projectid','int');
 $ref=GETPOST('ref','alpha');
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+$cancel=GETPOST('cancel','alpha');
 $withproject=GETPOST('withproject','int');
 $project_ref=GETPOST('project_ref','alpha');
 
@@ -89,6 +91,8 @@ $extralabels_task=$extrafields_task->fetch_name_optionals_label($object->table_e
  * Actions
  */
 
+if (GETPOST('cancel','alpha')) { $action=''; }
+
 $parameters=array('socid'=>$socid, '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');
@@ -137,10 +141,17 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 
 	if (! $error)
 	{
-		$object->fetch($id, $ref);
+		if ($id || $ref)
+		{
+			$object->fetch($id, $ref);
+		}
+		else
+		{
+			$object->fetch(GETPOST('taskid','int'));
+		}
 		$object->fetch_projet();
 
-		if (empty($object->projet->statut))
+		if (empty($object->project->statut))
 		{
 			setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 			$error++;
@@ -175,7 +186,8 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 	}
 	else
 	{
-		$action='';
+		if (empty($id)) $action='createtime';
+		else $action='createtime';
 	}
 }
 
@@ -277,6 +289,7 @@ llxHeader("",$langs->trans("Task"));
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$formproject = new FormProjets($db);
 $userstatic = new User($db);
 
 if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
@@ -398,35 +411,26 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			dol_fiche_end();
 
 
-			/*
-			 * Actions
-			 */
+			print '<br>';
 
+			// Link to create time
 			if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
 			{
-    			print '<div class="tabsAction">';
-
     			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
     			{
     			    if ($object->public || $userWrite > 0)
     			    {
-    			        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
+    			    	$linktocreatetime = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.'&withproject=1&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'</a>';
     			    }
     			    else
     			    {
-    			        print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
+    			    	$linktocreatetime = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'</a>';
     			    }
     			}
     			else
     			{
-    			    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+    				$linktocreatetime = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'</a>';
     			}
-
-    			print '</div>';
-			}
-			else
-			{
-				print '<br>';
 			}
 		}
 	}
@@ -528,12 +532,14 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 
 		/*
-		 * Form to add time spent
+		 * Form to add time spent on task
 		 */
+
 		if ($user->rights->projet->lire)
 		{
 			print '<br>';
 
+			print '<!-- form to add time spent on task -->'."\n";
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="addtimespent">';
@@ -676,7 +682,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			    $title=$langs->trans("ListTaskTimeUserProject");
 			    $linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
 			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
-			    print load_fiche_titre($title,$linktotasks,'title_generic.png');
+			    print load_fiche_titre($title,$linktotasks.' &nbsp; '.$linktocreatetime,'title_generic.png');
 			}
 
 			$i = 0;
@@ -694,6 +700,88 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		}
 
 
+		/*
+		 * Form to add time spent
+		 */
+		if ($action == 'createtime' && empty($id) && $user->rights->projet->lire)
+		{
+			print '<!-- form to add time spent -->'."\n";
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="addtimespent">';
+			print '<input type="hidden" name="projectid" value="'.$projectstatic->id.'">';
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+
+			print '<table class="noborder nohover" width="100%">';
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Date").'</td>';
+			print '<td>'.$langs->trans("Task").'</td>';
+			print '<td>'.$langs->trans("By").'</td>';
+			print '<td>'.$langs->trans("Note").'</td>';
+			print '<td>'.$langs->trans("NewTimeSpent").'</td>';
+			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
+			print '<td></td>';
+			print "</tr>\n";
+
+			print '<tr class="oddeven">';
+
+			// Date
+			print '<td class="maxwidthonsmartphone">';
+			//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
+			$newdate='';
+			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone'?2:1), 1, 2, "timespent_date", 1, 0, 1);
+			print '</td>';
+
+			// Task
+			print '<td class="maxwidthonsmartphone">';
+			$formproject->selectTasks(-1, GETPOST('taskid','int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+			print '</td>';
+
+			// Contributor
+			print '<td class="maxwidthonsmartphone">';
+			print img_object('','user','class="hideonsmartphone"');
+			$contactsofproject=$projectstatic->getListContactId('internal');
+			if (count($contactsofproject)>0)
+			{
+				if (in_array($user->id, $userid=$contactsofproject)) $userid = $user->id;
+				else $userid=$contactsofproject[0];
+				if ($projectstatic->public) $contactsofproject = array();
+				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
+			}
+			else
+			{
+				print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
+			}
+			print '</td>';
+
+			// Note
+			print '<td>';
+			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
+			print '</td>';
+
+			// Duration - Time spent
+			print '<td>';
+			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
+			print '</td>';
+
+			// Progress declared
+			print '<td class="nowrap">';
+			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
+			print '</td>';
+
+			print '<td align="center">';
+			print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'">';
+			print ' &nbsp; ';
+			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '</td></tr>';
+
+			print '</table></form>';
+
+			print '<br>';
+		}
+
+
 		$arrayofselected=is_array($toselect)?$toselect:array();
 
 		$params='';

From 46f70ebf8e2cea36b5ccd0d2c3d9617b5a01b3d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 12:01:13 +0100
Subject: [PATCH 213/386] FIX Useless clean of tree

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

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 2eb9bc1e44f..4a5bcdab70b 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -575,7 +575,7 @@ else if ($id > 0 || ! empty($ref))
 		}
 		else
 		{
-			if ($nboftaskshown < count($tasksarray))
+			if ($nboftaskshown < count($tasksarray) && ! GETPOST('search_user_id','int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');

From 1aa1b0a3ea882b5324b7009628a90f44a18baf8c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 26 Feb 2018 12:15:30 +0100
Subject: [PATCH 214/386] Fix: avoid warning during "upgrade2" process

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fd221649141..90747f0675b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4495,7 +4495,7 @@ abstract class CommonObject
 			{
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
-			$optionsArray = $extrafields->attributes[$this->table_element]['label'];
+			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:'');
 		}
 		else
 		{

From 46c2f098e04be71ccb2e9ab78b2fd7ceca9b4fde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 12:21:01 +0100
Subject: [PATCH 215/386] NEW Can enter time spent from the list of time spent
 of project

---
 htdocs/langs/en_US/projects.lang |  1 +
 htdocs/projet/tasks/time.php     | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index ab044618556..dd79af04bcb 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -91,6 +91,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
 ListActionsAssociatedProject=List of events associated with 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
 ActivityOnProjectThisWeek=Activity on project this week
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 44bed2119d2..57294fda1de 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -410,17 +410,16 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 			dol_fiche_end();
 
-
 			print '<br>';
 
 			// Link to create time
-			if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
-			{
+			//if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
+			//{
     			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
     			{
-    			    if ($object->public || $userWrite > 0)
+    				if ($projectstatic->public || $userWrite > 0)
     			    {
-    			    	$linktocreatetime = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.'&withproject=1&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'</a>';
+    			    	$linktocreatetime = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'</a>';
     			    }
     			    else
     			    {
@@ -431,7 +430,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			{
     				$linktocreatetime = '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'</a>';
     			}
-			}
+			//}
 		}
 	}
 
@@ -531,14 +530,17 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		dol_fiche_end();
 
 
+		$title=$langs->trans("ListTaskTimeForTask");
+		//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
+		print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
+
+
 		/*
 		 * Form to add time spent on task
 		 */
 
-		if ($user->rights->projet->lire)
+		if ($action == 'createtime' && $object->id > 0 && $user->rights->projet->lire)
 		{
-			print '<br>';
-
 			print '<!-- form to add time spent on task -->'."\n";
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -597,7 +599,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '</td>';
 
 			print '<td align="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+			print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'">';
+			print ' &nbsp; ';
+			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
 			print '</td></tr>';
 
 			print '</table></form>';
@@ -682,7 +686,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			    $title=$langs->trans("ListTaskTimeUserProject");
 			    $linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
 			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
-			    print load_fiche_titre($title,$linktotasks.' &nbsp; '.$linktocreatetime,'title_generic.png');
+			    print load_fiche_titre($title,$linktotasks.' &nbsp; '.$linktocreatetime, 'title_generic.png');
 			}
 
 			$i = 0;

From ce928d915058e94e4ba09959639feeb971f9572b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 12:32:26 +0100
Subject: [PATCH 216/386] Fix search criteria lost

---
 htdocs/projet/tasks/time.php | 38 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 57294fda1de..68da050c41e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -529,6 +529,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		dol_fiche_end();
 
+		print '<!-- List of time spent for task -->'."\n";
 
 		$title=$langs->trans("ListTaskTimeForTask");
 		//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
@@ -683,7 +684,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 			if (! empty($projectidforalltimes))
 			{
-			    $title=$langs->trans("ListTaskTimeUserProject");
+				print '<!-- List of time spent for project -->'."\n";
+
+				$title=$langs->trans("ListTaskTimeUserProject");
 			    $linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
 			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 			    print load_fiche_titre($title,$linktotasks.' &nbsp; '.$linktocreatetime, 'title_generic.png');
@@ -788,19 +791,24 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		$arrayofselected=is_array($toselect)?$toselect:array();
 
-		$params='';
+		$param='';
 		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-		if ($search_note != '') $params.= '&amp;search_note='.urlencode($search_note);
-		if ($search_duration != '') $params.= '&amp;search_field2='.urlencode($search_duration);
-		if ($optioncss != '') $param.='&optioncss='.$optioncss;
+		if ($search_month > 0) $param.= '&search_month='.urlencode($search_month);
+		if ($search_year > 0) $param.= '&search_year='.urlencode($search_year);
+		if ($search_user > 0) $param.= '&search_user='.urlencode($search_user);
+		if ($search_task_ref != '') $param.= '&search_task_ref='.urlencode($search_task_ref);
+		if ($search_task_label != '') $param.= '&search_task_label='.urlencode($search_task_label);
+		if ($search_note != '') $param.= '&search_note='.urlencode($search_note);
+		if ($search_duration != '') $param.= '&amp;search_field2='.urlencode($search_duration);
+		if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
 		/*
 		// Add $param from extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 		*/
-		if ($id) $params.='&amp;id='.$id;
-		if ($projectid) $params.='&amp;projectid='.$projectid;
-		if ($withproject) $params.='&amp;withproject='.$withproject;
+		if ($id) $param.='&id='.urlencode($id);
+		if ($projectid) $param.='&projectid='.urlencode($projectid);
+		if ($withproject) $param.='&withproject='.urlencode($withproject);
 
 
 		$arrayofmassactions =  array(
@@ -886,16 +894,16 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '</tr>'."\n";
 
 		print '<tr class="liste_titre">';
-		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$params,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$param,'',$sortfield,$sortorder);
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
-            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);
-            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);
+            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$param,'',$sortfield,$sortorder);
+            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$param,'',$sortfield,$sortorder);
         }
-        if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$params,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$params,'align="right"',$sortfield,$sortorder);
+        if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$param,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$param,'align="right"',$sortfield,$sortorder);
+		if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 		/*
     	// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

From cb45c867113583d37b9d1baed7afd63e577f95f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 13:21:16 +0100
Subject: [PATCH 217/386] WIP Option PROJECT_BILL_TIME_SPENT

---
 htdocs/langs/en_US/main.lang |  1 +
 htdocs/projet/tasks/time.php | 49 ++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 19c7967e43a..0fd9fe52b3e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -334,6 +334,7 @@ PriceUHTCurrency=U.P (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
 AmountHTShort=Amount (net)
 AmountTTCShort=Amount (inc. tax)
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 68da050c41e..66323989d26 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  *
@@ -241,7 +241,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->lire
 
 if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire)
 {
-	$object->fetchTimeSpent($_GET['lineid']);
+	$object->fetchTimeSpent(GETPOST('lineid','int'));
 	// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 	$result = $object->delTimeSpent($user);
 
@@ -252,6 +252,10 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 		$error++;
 		$action='';
 	}
+	else
+	{
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	}
 }
 
 // Retreive First Task ID of Project if withprojet is on to allow project prev next to work
@@ -441,7 +445,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		if ($action == 'deleteline')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id>0?"id=".$object->id:'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid",'int').($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
 
 		$param=($withproject?'&withproject=1':'');
@@ -615,7 +619,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	{
 		if ($action == 'deleteline')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id>0?"id=".$object->id:'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid','int').($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
 
 	    // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
@@ -634,6 +638,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    $arrayfields['t.note']=array('label'=>$langs->trans("Note"), 'checked'=>1);
 	    $arrayfields['t.task_duration']=array('label'=>$langs->trans("Duration"), 'checked'=>1);
 	    $arrayfields['value'] =array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled)?0:1));
+	    $arrayfields['valuebilled'] =array('label'=>$langs->trans("AmountInvoiced"), 'checked'=>1, 'enabled'=>(empty($conf->global->PROJECT_BILL_TIME_SPENT)?0:1));
 	    // Extra fields
 	    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	    {
@@ -650,8 +655,11 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm,";
 		$sql .= " pt.ref, pt.label,";
-		$sql .= " u.lastname, u.firstname, u.login, u.photo";
-		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+		$sql .= " u.lastname, u.firstname, u.login, u.photo,";
+		$sql .= " il.fk_facture as invoice_id, il.total_ht";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facturedet as il ON il.rowid = t.invoice_line_id";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
 		else $sql.= " AND pt.fk_projet IN (".$projectidforalltimes.")";
@@ -876,9 +884,11 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
         if (! empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
 		// Duration
         if (! empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
-		// Value in currency
+		// Value in main currency
         if (! empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
-		/*
+        // Value billed
+        if (! empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre"></td>';
+        /*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 		*/
@@ -894,16 +904,17 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '</tr>'."\n";
 
 		print '<tr class="liste_titre">';
-		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$param,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.task_date']['checked']))      print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$param,'',$sortfield,$sortorder);
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
             if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$param,'',$sortfield,$sortorder);
             if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$param,'',$sortfield,$sortorder);
         }
-        if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$param,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$param,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+        if (! empty($arrayfields['author']['checked']))           print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.note']['checked']))           print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$param,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.task_duration']['checked']))  print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$param,'align="right"',$sortfield,$sortorder);
+		if (! empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+		if (! empty($arrayfields['valuebilled']['checked']))      print_liste_field_titre($arrayfields['valuebilled']['label'],$_SERVER['PHP_SELF'],'il.total_ht','',$param,'align="right"',$sortfield,$sortorder);
 		/*
     	// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1052,6 +1063,18 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			$totalarray['totalvalue'] += $value;
             }
 
+            // Value billed
+            if (! empty($arrayfields['valuebilled']['checked']))
+            {
+            	print '<td align="right">';
+            	$valuebilled = price2num($task_time->total_ht);
+            	if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+            	print '</td>';
+            	if (! $i) $totalarray['nbfield']++;
+            	if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+            	$totalarray['totalvaluebilled'] += $valuebilled;
+            }
+
             /*
             // Extra fields
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

From de89893d5720189e0bb301b56903b4de4e3146c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 14:09:15 +0100
Subject: [PATCH 218/386] NEW Show total of time consumed in week in time spent
 entry page

---
 htdocs/core/js/timesheet.js                   | 16 +++++-
 .../class/fournisseur.commande.class.php      | 50 +++----------------
 htdocs/projet/activity/perday.php             |  9 +++-
 htdocs/projet/activity/perweek.php            | 12 ++---
 htdocs/projet/tasks/time.php                  | 11 ++--
 htdocs/theme/eldy/style.css.php               |  3 ++
 htdocs/theme/md/style.css.php                 |  3 ++
 7 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index 20a713ce220..ae7d839919c 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -216,6 +216,21 @@ function updateTotal(days,mode)
         if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+days).addClass("bold");
         else jQuery('.totalDay'+days).removeClass("bold");
     	jQuery('.totalDay'+days).text(pad(total.getHours())+':'+pad(total.getMinutes()));
+    	
+    	var total = new Date(0);
+        total.setHours(0);
+        total.setMinutes(0); 
+        for (var i=0; i<7; i++)
+        {
+        	var taskTime= new Date(0);
+        	result=parseTime(jQuery('.totalDay'+i).text(),taskTime);
+        	if (result >= 0)
+        	{
+        		total.setHours(total.getHours()+taskTime.getHours());
+        		total.setMinutes(total.getMinutes()+taskTime.getMinutes());
+        	}
+        }
+    	jQuery('.totalDayAll').text(pad(total.getHours())+':'+pad(total.getMinutes()));
     }
     else
     {
@@ -260,7 +275,6 @@ function updateTotal(days,mode)
         else jQuery('.totalDay'+days).removeClass("bold");
     	jQuery('.totalDay'+days).text(total);
     }
-    
 }
 
    
\ No newline at end of file
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e13e08acd7b..cf007659487 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2964,12 +2964,12 @@ class CommandeFournisseur extends CommonOrder
     					}
     				}elseif(! empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED) )
 				{//set livraison to 'tot' if more products received than wished. (and if $closeopenorder is set to 1 of course...)
-					
+
 					$close=0;
-					
+
 					if( count($diff_array) > 0 )
 					{//there are some difference between  the two arrays
-	
+
 						//scan the array of results
 						foreach($diff_array as $key => $value)
 						{//if the quantity delivered is greater or equal to wish quantity
@@ -2977,11 +2977,11 @@ class CommandeFournisseur extends CommonOrder
 							{
 								$close++;
 							}
-		
+
 						}
 					}
 
-					
+
 					if($close == count($diff_array))
 					{//all the products are received equal or more than the wished quantity
 						if ($closeopenorder)
@@ -3001,8 +3001,8 @@ class CommandeFournisseur extends CommonOrder
 							}
 							return 4;
 						}
-					
-					
+
+
 					}
 					else
 					{//all the products are not received
@@ -3012,7 +3012,7 @@ class CommandeFournisseur extends CommonOrder
 						}
 						return 4;
 					}
-					
+
 				}
     				else
     				{
@@ -3157,40 +3157,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
         }
     }
 
-    /**
-     *  Mise a jour de l'objet ligne de commande en base
-     *
-     *  @return		int		<0 si ko, >0 si ok
-     */
-    public function updateTotal()
-    {
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseurdet SET";
-        $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.= " WHERE rowid = ".$this->rowid;
-
-        dol_syslog(get_class($this)."::updateTotal", LOG_DEBUG);
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
     /**
      *	Insert line into database
      *
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 85848eefedc..b61c5aff922 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -595,10 +595,15 @@ if (count($tasksarray) > 0)
 	if ($isdiff)
 	{
 		print '<tr class="oddeven othertaskwithtime">';
-        print '<td colspan="'.$colspan.'">';
+        print '<td colspan="3">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
-		print '<td align="center">';
+		print '<td align="right" class="leftborder plannedworkload"></td>';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="leftborder"></td>';
+		print '<td class="center">';
 		$timeonothertasks=($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]);
 		//if ($timeonothertasks)
 		//{
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index d64a5fad6cd..a52ea4fd6d8 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -531,8 +531,8 @@ $colspan=7;
 
 if ($conf->use_javascript_ajax)
 {
-	print '<tr class="liste_total">
-                <td class="liste_total" colspan="'.$colspan.'">';
+	print '<tr class="liste_total">';
+    print '<td class="liste_total" colspan="'.$colspan.'">';
 	print $langs->trans("Total");
 	print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
 	print '</td>';
@@ -547,8 +547,8 @@ if ($conf->use_javascript_ajax)
 
 		print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 	}
-	print '<td class="liste_total"></td>
-    	</tr>';
+	print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>';
+	print '</tr>';
 }
 
 
@@ -625,7 +625,7 @@ if (count($tasksarray) > 0)
 				$cssweekend='weekend';
 			}
 
-			print '<td align="center'.($cssweekend?' '.$cssweekend:'').'">';
+			print '<td class="center hide'.$idw.' '.($cssweekend?' '.$cssweekend:'').'">';
 			$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$timeonothertasks=($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
 			if ($timeonothertasks)
@@ -658,7 +658,7 @@ if (count($tasksarray) > 0)
 
 					print '<td class="liste_total hide'.$idw.($cssweekend?' '.$cssweekend:'').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 				}
-                print '<td class="liste_total"></td>
+                print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
 }
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 66323989d26..912551012b0 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -79,11 +79,7 @@ $projectstatic = new Project($db);
 $extrafields_project = new ExtraFields($db);
 $extrafields_task = new ExtraFields($db);
 
-if ($projectid > 0 || ! empty($ref))
-{
-    // fetch optionals attributes and labels
-    $extralabels_projet=$extrafields_project->fetch_name_optionals_label($projectstatic->table_element);
-}
+$extralabels_projet=$extrafields_project->fetch_name_optionals_label($projectstatic->table_element);
 $extralabels_task=$extrafields_task->fetch_name_optionals_label($object->table_element);
 
 
@@ -278,10 +274,9 @@ if (! empty($project_ref) && ! empty($withproject))
 
 // To show all time lines for project
 $projectidforalltimes=0;
-if (GETPOST('projectid'))
+if (GETPOST('projectid','none'))
 {
-    $projectidforalltimes=GETPOST('projectid','int');
-
+	$projectidforalltimes=GETPOST('projectid','int');
 }
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2b150d64a5e..df41d1301ef 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -407,6 +407,9 @@ td.onholidayallday {
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
 }
+td.leftborder, td.hide6 {
+	border-right: 1px solid #ccc;
+}
 
 td.actionbuttons a {
     padding-left: 6px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 07c02ba74fa..40b3fefc634 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -411,6 +411,9 @@ td.actionbuttons a {
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
 }
+td.leftborder, td.hide6 {
+	border-right: 1px solid #ccc;
+}
 
 select.flat, form.flat select {
 	font-weight: normal;

From 82475e2e5f17667bc7517baf5a46ac2c5327d7ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 14:28:51 +0100
Subject: [PATCH 219/386] WIP Option PROJECT_BILL_TIME_SPENT

---
 htdocs/langs/en_US/projects.lang      |  1 +
 htdocs/projet/card.php                | 26 ++++++++++++++++++++++++++
 htdocs/projet/class/project.class.php |  7 ++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index dd79af04bcb..5f71b230537 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Time spent
 MyTimeSpent=My time spent
+BillTime=Bill the time spent
 Tasks=Tasks
 Task=Task
 TaskDateStart=Task start date
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 71be9b5d4a3..7494a5a15bb 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -161,6 +161,7 @@ if (empty($reshook))
 			$object->statut          = $status;
 			$object->opp_status      = $opp_status;
 			$object->opp_percent     = $opp_percent;
+			$object->bill_time       = (GETPOST('bill_time','alpha')=='on'?1:0);
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -261,6 +262,7 @@ if (empty($reshook))
 			if (isset($_POST['budget_amount'])) $object->budget_amount= price2num(GETPOST('budget_amount','alpha'));
 			if (isset($_POST['opp_status']))    $object->opp_status   = $opp_status;
 			if (isset($_POST['opp_percent']))   $object->opp_percent  = $opp_percent;
+			$object->bill_time       = (GETPOST('bill_time','alpha')=='on'?1:0);
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -599,6 +601,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST("description",'none')).'</textarea>';
 	print '</td></tr>';
 
+	// Bill time
+	if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<tr><td>'.$langs->trans("BillTime").'</td>';
+		print '<td><input type="checkbox" name="bill_time"'.(GETPOST('bill_time','alpha')!=''?' checked="checked"':'').'"></td>';
+		print '</tr>';
+	}
+
 	if ($conf->categorie->enabled) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
@@ -826,6 +836,14 @@ elseif ($object->id > 0)
 		print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
 		print '</td></tr>';
 
+		// Bill time
+		if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		{
+			print '<tr><td>'.$langs->trans("BillTime").'</td>';
+			print '<td><input type="checkbox" name="bill_time"'.((GETPOSTISSET('bill_time')?GETPOST('bill_time','alpha'):$object->bill_time) ? ' checked="checked"' : '').'"></td>';
+			print '</tr>';
+		}
+
 		// Tags-Categories
 		if ($conf->categorie->enabled)
 		{
@@ -948,6 +966,14 @@ elseif ($object->id > 0)
 		print nl2br($object->description);
 		print '</td></tr>';
 
+		// Bill time
+		if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		{
+			print '<tr><td>'.$langs->trans("BillTime").'</td>';
+			print '<td>'.yn($object->bill_time).'</td>';
+			print '</tr>';
+		}
+
 		// Categories
 		if($conf->categorie->enabled) {
 			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6e8c12793cc..ed25f3ba813 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -64,6 +64,7 @@ class Project extends CommonObject
 	var $user_close_id;
     var $public;      //!< Tell if this is a public or private project
     var $budget_amount;
+    var $bill_time;			// Is the time spent on project must be invoiced or not
 
     var $statuts_short;
     var $statuts_long;
@@ -178,6 +179,7 @@ class Project extends CommonObject
         $sql.= ", datee";
         $sql.= ", opp_amount";
         $sql.= ", budget_amount";
+        $sql.= ", bill_time";
         $sql.= ", entity";
         $sql.= ") VALUES (";
         $sql.= "'" . $this->db->escape($this->ref) . "'";
@@ -297,6 +299,7 @@ class Project extends CommonObject
             $sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
             $sql.= ", budget_amount = " . (strcmp($this->budget_amount, '')  ? price2num($this->budget_amount) : "null");
             $sql.= ", fk_user_modif = " . $user->id;
+            $sql.= ", bill_time = " . ($this->bill_time ? 1 : 0);
             $sql.= " WHERE rowid = " . $this->id;
 
             dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -394,7 +397,8 @@ class Project extends CommonObject
         if (empty($id) && empty($ref)) return -1;
 
         $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
-        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
+        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
+        $sql.= " note_private, note_public, model_pdf, bill_time";
         $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
         if (! empty($id))
         {
@@ -441,6 +445,7 @@ class Project extends CommonObject
                 $this->opp_percent	= $obj->opp_percent;
                 $this->budget_amount	= $obj->budget_amount;
                 $this->modelpdf	= $obj->model_pdf;
+                $this->bill_time = (int) $obj->bill_time;
 
                 $this->db->free($resql);
 

From 7e48db2869981a17853d62c5e06e40d5fc31e5a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 15:03:09 +0100
Subject: [PATCH 220/386] Clean code

---
 htdocs/admin/system/filecheck.php           | 2 +-
 htdocs/api/class/api_setup.class.php        | 2 +-
 htdocs/cashdesk/class/Facturation.class.php | 2 +-
 htdocs/cashdesk/validation_verif.php        | 2 +-
 htdocs/core/lib/admin.lib.php               | 4 ++--
 htdocs/core/lib/functions.lib.php           | 2 +-
 htdocs/core/lib/pdf.lib.php                 | 2 +-
 htdocs/holiday/define_holiday.php           | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 60c20dfafe7..38cf0b3f0df 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -140,7 +140,7 @@ if (GETPOST('target') == 'remote')
     if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
     {
         $xmlfile = $xmlarray['content'];
-        //print "eee".$xmlfile."eee";
+        //print "xmlfilestart".$xmlfile."xmlfileend";
         $xml = simplexml_load_string($xmlfile);
     }
     else
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 27b909c2dad..65ba8f4ff37 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -638,7 +638,7 @@ class Setup extends DolibarrApi
     		if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
     		{
     			$xmlfile = $xmlarray['content'];
-    			//print "eee".$xmlfile."eee";
+    			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
     		}
     		else
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 8bfd1d3082c..769a69a23fa 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -233,7 +233,7 @@ class Facturation
         $this->prix_total_localtax2 = $total_localtax2;
 
         $this->montant_tva = $total_ttc - $total_ht;
-        //print $this->prix_total_ttc.'eeee'; exit;
+        //print 'total: '.$this->prix_total_ttc; exit;
     }
 
     /**
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 399e2984ea8..431f921a1fb 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -324,7 +324,7 @@ switch ($action)
                     	{
                     		// We set status to payed
                     		$result=$invoice->set_paid($user);
-                  			//print 'eeeee';exit;
+                  			//print 'set paid';exit;
                     	}
 
                     }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 7991b711660..fcc3098c730 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -870,7 +870,7 @@ function activateModule($value,$withdeps=1)
     // Test if Dolibarr version ok
     $verdol=versiondolibarrarray();
     $vermin=isset($objMod->need_dolibarr_version)?$objMod->need_dolibarr_version:0;
-    //print 'eee '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
+    //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;
@@ -1498,7 +1498,7 @@ function showModulesExludedForExternal($modules)
 
 			//if (empty($conf->global->$moduleconst)) continue;
 			if (! in_array($modulename,$listofmodules)) continue;
-			//var_dump($modulename.'eee'.$langs->trans('Module'.$module->numero.'Name'));
+			//var_dump($modulename.' - '.$langs->trans('Module'.$module->numero.'Name'));
 
 			if ($i > 0) $text.=', ';
 			else $text.=' ';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3f194d3531a..72ff4343d38 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1999,7 +1999,7 @@ function dol_now($mode='gmt')
 	}*/
 	else if ($mode == 'tzuser')				// Time for now with user timezone added
 	{
-		//print 'eeee'.time().'-'.mktime().'-'.gmmktime();
+		//print 'time: '.time().'-'.mktime().'-'.gmmktime();
 		$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
 		$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
 		$ret=(int) dol_now('gmt')+($offsettz+$offsetdst);
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 377f2215b6d..ab7ce8599b0 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1003,7 +1003,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	$freetextheight=0;
 	if ($line)	// Free text
 	{
-		//$line="eee<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
+		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
 	    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.
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index a7d4789468e..e4421505b00 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -128,7 +128,7 @@ if (empty($reshook))
     	    //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 'eee'.$val['rowid'].'-'.$userValue;
+    	    //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)

From 7ca5ac03ccb5a758434b70b7537bf8676dcda968 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 26 Feb 2018 17:40:31 +0100
Subject: [PATCH 221/386] FIX: discount card: only display relevant discounts
 types (customer/supplier)

---
 htdocs/comm/remx.php              | 663 ++++++++++++++++--------------
 htdocs/langs/en_US/companies.lang |   1 +
 2 files changed, 351 insertions(+), 313 deletions(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 177b4456912..92e2f1d5d71 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -235,12 +235,17 @@ if ($socid > 0)
 	$object = new Societe($db);
 	$object->fetch($socid);
 
+	$isCustomer = $object->client == 1 || $object->client == 3;
+	$isSupplier = $object->fournisseur == 1;
+
+	$displayCustomer = $conf->global->MAIN_FEATURES_LEVEL <= 0 || $isCustomer;
+	$displaySupplier = $conf->global->MAIN_FEATURES_LEVEL > 0 && $isSupplier;
+
 	/*
 	 * Display tabs
 	 */
 	$head = societe_prepare_head($object);
 
-
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="setremise">';
@@ -253,39 +258,54 @@ if ($socid > 0)
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
+    
+    if(! $displayCustomer && ! $displaySupplier) {
+    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+
+    	dol_fiche_end();
+
+    	print '</form>';
+
+    	llxFooter();
+    	$db->close();
+    	exit;
+    }
+    
+    
 	print '<table class="border centpercent">';
 
-	// Calcul avoirs client en cours
-	$remise_all=$remise_user=0;
-	$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-	$sql.= " WHERE rc.fk_soc = " . $object->id;
-	$sql.= " AND rc.entity = " . $conf->entity;
-	$sql.= " AND discount_type = 0"; // Exclude supplier discounts
-	$sql.= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
-	$sql.= " GROUP BY rc.fk_user";
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		$remise_all+=$obj->amount;
-		if ($obj->fk_user == $user->id) $remise_user+=$obj->amount;
-	}
-	else
-	{
-		dol_print_error($db);
+	if($displayCustomer) {	// Calcul avoirs client en cours
+		$remise_all=$remise_user=0;
+		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND discount_type = 0"; // Exclude supplier discounts
+		$sql.= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
+		$sql.= " GROUP BY rc.fk_user";
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			$remise_all+=$obj->amount;
+			if ($obj->fk_user == $user->id) $remise_user+=$obj->amount;
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
+		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+	
+		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 '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
-	print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
-
-	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>';
-	}
-
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	if($displaySupplier) {
 		// Calcul avoirs fournisseur en cours
 		$remise_all=$remise_user=0;
 		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
@@ -328,9 +348,18 @@ if ($socid > 0)
     	print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
 
     	print '<div class="underbanner clearboth"></div>';
+ 
+    	if($conf->global->MAIN_FEATURES_LEVEL <= 0 || ($isCustomer && ! $isSupplier)) {
+    		print '<input type="hidden" name="discount_type" value="0" />';
+    	}
+    	
+    	if($conf->global->MAIN_FEATURES_LEVEL > 0 && (! $isCustomer && $isSupplier)) {
+    		print '<input type="hidden" name="discount_type" value="1" />';
+    	}
+
     	print '<table class="border" width="100%">';
-		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-			print '<tr><td>'.$langs->trans('DiscountType').'</td>';
+		if($conf->global->MAIN_FEATURES_LEVEL > 0 && $isCustomer && $isSupplier) {
+			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';
 			print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 			print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 			print '</td></tr>';
@@ -378,144 +407,147 @@ if ($socid > 0)
 	 */
 	
 	print load_fiche_titre($langs->trans("DiscountStillRemaining"));
-	
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-	}
 
-	$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
-	$sql.= " rc.datec as dc, rc.description,";
-	$sql.= " rc.fk_facture_source,";
-	$sql.= " u.login, u.rowid as user_id,";
-	$sql.= " fa.facnumber as ref, fa.type as type";
-	$sql.= " FROM  ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-	$sql.= " WHERE rc.fk_soc = " . $object->id;
-	$sql.= " AND rc.entity = " . $conf->entity;
-	$sql.= " AND u.rowid = rc.fk_user";
-	$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
-	$sql.= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
-	$sql.= " ORDER BY rc.datec DESC";
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	if($displayCustomer) {
+		if($displaySupplier) {
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
 		}
-		print '<table width="100%" class="noborder">';
-		print '<tr class="liste_titre">';
-		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td>'.$langs->trans("ReasonDiscount").'</td>';
-		print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
-		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
-		print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td width="100" align="center">'.$langs->trans("DiscountOfferedBy").'</td>';
-		print '<td width="50">&nbsp;</td>';
-		print '</tr>';
 
-		$showconfirminfo=array();
-
-		$i = 0;
-		$num = $db->num_rows($resql);
-		if ($num > 0)
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql.= " rc.datec as dc, rc.description,";
+		$sql.= " rc.fk_facture_source,";
+		$sql.= " u.login, u.rowid as user_id,";
+		$sql.= " fa.facnumber as ref, fa.type as type";
+		$sql.= " FROM  ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND u.rowid = rc.fk_user";
+		$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
+		$sql.= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
+		$sql.= " ORDER BY rc.datec DESC";
+	
+		$resql=$db->query($sql);
+		if ($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="nowrap">';
-    				$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="nowrap">';
-    				$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="nowrap">';
-    				$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>';
-    				print $obj->description;
-    				print '</td>';
-    			}
-    			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-    			print '<td align="right">'.price($obj->amount_ht).'</td>';
-    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
-    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
-    			print '<td align="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="nowrap">';
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
-    				print ' &nbsp; ';
-    				print '<a 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++;
-    		}
+			print '<table width="100%" class="noborder">';
+			print '<tr class="liste_titre">';
+			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
+			print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
+			print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
+			print '<td width="100" align="center">'.$langs->trans("DiscountOfferedBy").'</td>';
+			print '<td width="50">&nbsp;</td>';
+			print '</tr>';
+	
+			$showconfirminfo=array();
+	
+			$i = 0;
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
+	    		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="nowrap">';
+	    				$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="nowrap">';
+	    				$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="nowrap">';
+	    				$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>';
+	    				print $obj->description;
+	    				print '</td>';
+	    			}
+	    			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
+	    			print '<td align="right">'.price($obj->amount_ht).'</td>';
+	    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+	    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
+	    			print '<td align="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="nowrap">';
+	    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
+	    				print ' &nbsp; ';
+	    				print '<a 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++;
+	    		}
+			}
+			else
+			{
+			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+			$db->free($resql);
+			print "</table>";
+	
+			if (count($showconfirminfo))
+			{
+				$amount1=price2num($showconfirminfo['amount_ttc']/2,'MT');
+				$amount2=($showconfirminfo['amount_ttc']-$amount1);
+				$formquestion=array(
+					'text' => $langs->trans('TypeAmountOfEachNewDiscount'),
+					array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
+					array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
+				);
+				$langs->load("dict");
+				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage?'&backtopage='.urlencode($backtopage):''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($showconfirminfo['amount_ttc']),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
+			}
 		}
 		else
 		{
-		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		$db->free($resql);
-		print "</table>";
-
-		if (count($showconfirminfo))
-		{
-			$amount1=price2num($showconfirminfo['amount_ttc']/2,'MT');
-			$amount2=($showconfirminfo['amount_ttc']-$amount1);
-			$formquestion=array(
-				'text' => $langs->trans('TypeAmountOfEachNewDiscount'),
-				array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
-				array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
-			);
-			$langs->load("dict");
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage?'&backtopage='.urlencode($backtopage):''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($showconfirminfo['amount_ttc']),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
+			dol_print_error($db);
 		}
 	}
-	else
-	{
-		dol_print_error($db);
-	}
 
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-		print '</div>'; // class="fichehalfleft"
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
+	if($displaySupplier) {
+		if($displayCustomer) {
+			print '</div>'; // class="fichehalfleft"
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
+		}
 
 		/*
 		 * Liste remises fixes fournisseur restant en cours (= liees a aucune facture ni ligne de facture)
@@ -537,7 +569,6 @@ if ($socid > 0)
 		$resql=$db->query($sql);
 		if ($resql)
 		{
-			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 			print '<table width="100%" class="noborder">';
 			print '<tr class="liste_titre">';
 			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -646,9 +677,11 @@ if ($socid > 0)
 			dol_print_error($db);
 		}
 
-		print '</div>'; // class="ficheaddleft"
-		print '</div>'; // class="fichehalfright"
-		print '</div>'; // class="fichecenter"
+		if($displayCustomer) {
+			print '</div>'; // class="ficheaddleft"
+			print '</div>'; // class="fichehalfright"
+			print '</div>'; // class="fichecenter"
+		}
 	}
 
 	print '<br>';
@@ -659,161 +692,164 @@ if ($socid > 0)
 	
 	print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
 
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-	}
-
-	// Remises liees a lignes de factures
-	$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
-	$sql.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
-	$sql.= " rc.fk_facture_source,";
-	$sql.= " u.login, u.rowid as user_id,";
-	$sql.= " f.rowid, f.facnumber,";
-	$sql.= " fa.facnumber as ref, fa.type as type";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sql.= " , ".MAIN_DB_PREFIX."user as u";
-	$sql.= " , ".MAIN_DB_PREFIX."facturedet as fc";
-	$sql.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-	$sql.= " WHERE rc.fk_soc =". $object->id;
-	$sql.= " AND rc.fk_facture_line = fc.rowid";
-	$sql.= " AND fc.fk_facture = f.rowid";
-	$sql.= " AND rc.fk_user = u.rowid";
-	$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
-	$sql.= " ORDER BY dc DESC";
-	//$sql.= " UNION ";
-	// Remises liees a factures
-	$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
-	$sql2.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
-	$sql2.= " rc.fk_facture_source,";
-	$sql2.= " u.login, u.rowid as user_id,";
-	$sql2.= " f.rowid, f.facnumber,";
-	$sql2.= " fa.facnumber as ref, fa.type as type";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sql2.= " , ".MAIN_DB_PREFIX."user as u";
-	$sql2.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-	$sql2.= " WHERE rc.fk_soc =". $object->id;
-	$sql2.= " AND rc.fk_facture = f.rowid";
-	$sql2.= " AND rc.fk_user = u.rowid";
-	$sql2.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
-	$sql2.= " ORDER BY dc DESC";
-
-	$resql=$db->query($sql);
-	$resql2=null;
-	if ($resql) $resql2=$db->query($sql2);
-	if ($resql2)
-	{
-		if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	if($displayCustomer) {
+		if($displaySupplier) {
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
 		}
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td>'.$langs->trans("ReasonDiscount").'</td>';
-		print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
-		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
-		print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td width="100" align="center">'.$langs->trans("Author").'</td>';
-		print '<td width="50">&nbsp;</td>';
-		print '</tr>';
 
-		$tab_sqlobj=array();
-		$tab_sqlobjOrder=array();
-		$num = $db->num_rows($resql);
-		if ($num > 0)
+		// Remises liees a lignes de factures
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
+		$sql.= " rc.fk_facture_source,";
+		$sql.= " u.login, u.rowid as user_id,";
+		$sql.= " f.rowid, f.facnumber,";
+		$sql.= " fa.facnumber as ref, fa.type as type";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql.= " , ".MAIN_DB_PREFIX."user as u";
+		$sql.= " , ".MAIN_DB_PREFIX."facturedet as fc";
+		$sql.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
+		$sql.= " WHERE rc.fk_soc =". $object->id;
+		$sql.= " AND rc.fk_facture_line = fc.rowid";
+		$sql.= " AND fc.fk_facture = f.rowid";
+		$sql.= " AND rc.fk_user = u.rowid";
+		$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
+		$sql.= " ORDER BY dc DESC";
+		//$sql.= " UNION ";
+		// Remises liees a factures
+		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql2.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
+		$sql2.= " rc.fk_facture_source,";
+		$sql2.= " u.login, u.rowid as user_id,";
+		$sql2.= " f.rowid, f.facnumber,";
+		$sql2.= " fa.facnumber as ref, fa.type as type";
+		$sql2.= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql2.= " , ".MAIN_DB_PREFIX."user as u";
+		$sql2.= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
+		$sql2.= " WHERE rc.fk_soc =". $object->id;
+		$sql2.= " AND rc.fk_facture = f.rowid";
+		$sql2.= " AND rc.fk_user = u.rowid";
+		$sql2.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
+		$sql2.= " ORDER BY dc DESC";
+	
+		$resql=$db->query($sql);
+		$resql2=null;
+		if ($resql) $resql2=$db->query($sql2);
+		if ($resql2)
 		{
-    		for ($i = 0;$i < $num; $i++)
-    		{
-    			$sqlobj = $db->fetch_object($resql);
-    			$tab_sqlobj[] = $sqlobj;
-    			$tab_sqlobjOrder[]=$db->jdate($sqlobj->dc);
-    		}
-		}
-		$db->free($resql);
-
-		$num = $db->num_rows($resql2);
-		for ($i = 0;$i < $num;$i++)
-		{
-			$sqlobj = $db->fetch_object($resql2);
-			$tab_sqlobj[] = $sqlobj;
-			$tab_sqlobjOrder[]= $db->jdate($sqlobj->dc);
-		}
-		$db->free($resql2);
-		array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
-
-		$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="nowrap">';
-    				$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="nowrap">';
-    				$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="nowrap">';
-    				$facturestatic->id=$obj->fk_facture_source;
-    				$facturestatic->ref=$obj->ref;
-    				$facturestatic->type=$obj->type;
-    				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
-    				print '</td>';
-    			}
-    			else
-    			{
-    				print '<td>';
-    				print $obj->description;
-    				print '</td>';
-    			}
-    			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
-    			print '<td align="right">'.price($obj->amount_ht).'</td>';
-    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
-    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
-    			print '<td align="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++;
-    		}
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre">';
+			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
+			print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
+			print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
+			print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
+			print '<td width="100" align="center">'.$langs->trans("Author").'</td>';
+			print '<td width="50">&nbsp;</td>';
+			print '</tr>';
+	
+			$tab_sqlobj=array();
+			$tab_sqlobjOrder=array();
+			$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);
+	    		}
+			}
+			$db->free($resql);
+	
+			$num = $db->num_rows($resql2);
+			for ($i = 0;$i < $num;$i++)
+			{
+				$sqlobj = $db->fetch_object($resql2);
+				$tab_sqlobj[] = $sqlobj;
+				$tab_sqlobjOrder[]= $db->jdate($sqlobj->dc);
+			}
+			$db->free($resql2);
+			array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
+	
+			$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="nowrap">';
+	    				$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="nowrap">';
+	    				$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="nowrap">';
+	    				$facturestatic->id=$obj->fk_facture_source;
+	    				$facturestatic->ref=$obj->ref;
+	    				$facturestatic->type=$obj->type;
+	    				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
+	    				print '</td>';
+	    			}
+	    			else
+	    			{
+	    				print '<td>';
+	    				print $obj->description;
+	    				print '</td>';
+	    			}
+	    			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
+	    			print '<td align="right">'.price($obj->amount_ht).'</td>';
+	    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+	    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
+	    			print '<td align="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
+			{
+			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+	
+			print "</table>";
 		}
 		else
 		{
-		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			dol_print_error($db);
 		}
-
-		print "</table>";
-	}
-	else
-	{
-		dol_print_error($db);
 	}
 
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-		print '</div>'; // class="fichehalfleft"
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
+	if($displaySupplier) {
+		if($displayCustomer) {
+			print '</div>'; // class="fichehalfleft"
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
+		}
 
 		// Remises liees a lignes de factures
 		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
@@ -856,7 +892,6 @@ if ($socid > 0)
 		if ($resql) $resql2=$db->query($sql2);
 		if ($resql2)
 		{
-			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
 			print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
@@ -958,10 +993,12 @@ if ($socid > 0)
 		{
 			dol_print_error($db);
 		}
-		
-		print '</div>'; // class="ficheaddleft"
-		print '</div>'; // class="fichehalfright"
-		print '</div>'; // class="fichecenter"
+
+		if($displayCustomer) {
+			print '</div>'; // class="ficheaddleft"
+			print '</div>'; // class="fichehalfright"
+			print '</div>'; // class="fichecenter"
+		}
 	}
 }
 
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 2eb1ba88e57..dde515c0223 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -79,6 +79,7 @@ VATIsUsed=Sales tax is used
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders

From 941a8e5e2bca02a80142e26d9d802d6de27b98fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 20:12:29 +0100
Subject: [PATCH 222/386] FIX: Properties updated if update successfull.

---
 htdocs/contrat/class/contrat.class.php | 95 ++++++++++++--------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0d5262ac66b..64ffd794453 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -262,9 +262,10 @@ 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
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function activateAll($user, $date_start='', $notrigger=0)
+	function activateAll($user, $date_start='', $notrigger=0, $comment='')
 	{
 		if (empty($date_start)) $date_start = dol_now();
 
@@ -282,7 +283,7 @@ class Contrat extends CommonObject
 			{
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, -1);
+				$result = $contratline->active_line($user, $date_start, -1, $comment);
 				if ($result < 0)
 				{
 					$error++;
@@ -1468,49 +1469,39 @@ class Contrat extends CommonObject
 			{
 				$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
 
-				$result=$this->update_statut($user);
-				if ($result > 0)
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
 				{
-
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+					$contractline = new ContratLigne($this->db);
+					$contractline->array_options=$array_options;
+					$contractline->id=$contractlineid;
+					$result=$contractline->insertExtraFields();
+					if ($result < 0)
 					{
-						$contractline = new ContratLigne($this->db);
-						$contractline->array_options=$array_options;
-						$contractline->id=$contractlineid;
-						$result=$contractline->insertExtraFields();
-						if ($result < 0)
-						{
-							$this->error[]=$contractline->error;
-							$error++;
-						}
-					}
-
-					if (empty($error)) {
-					    // Call trigger
-					    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
-					    if ($result < 0)
-					    {
-					    	$error++;
-					    }
-					    // End call triggers
-					}
-
-					if ($error)
-					{
-						$this->db->rollback();
-						return -1;
-					}
-					else
-					{
-						$this->db->commit();
-						return $contractlineid;
+						$this->error[]=$contractline->error;
+						$error++;
 					}
 				}
-				else
+
+				if (empty($error)) {
+				    // Call trigger
+				    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
+				    if ($result < 0)
+				    {
+				    	$error++;
+				    }
+				    // End call triggers
+				}
+
+				if ($error)
 				{
 					$this->db->rollback();
 					return -1;
 				}
+				else
+				{
+					$this->db->commit();
+					return $contractlineid;
+				}
 			}
 			else
 			{
@@ -3095,13 +3086,6 @@ class ContratLigne extends CommonObjectLine
 	{
 		global $langs, $conf;
 
-		// Update object
-		$this->date_ouverture = $date;
-		$this->date_fin_validite = $date_end;
-		$this->fk_user_ouverture = $user->id;
-		$this->date_cloture = null;
-		$this->commentaire = $comment;
-
 		$error = 0;
 
 		$this->db->begin();
@@ -3119,15 +3103,26 @@ class ContratLigne extends CommonObjectLine
 		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
-			if ($result < 0) {
-				$error++;
+			if ($result < 0) $error++;
+			// End call triggers
+
+			if (! $error)
+			{
+				$this->statut = 4;
+				$this->date_ouverture = $date;
+				$this->date_fin_validite = $date_end;
+				$this->fk_user_ouverture = $user->id;
+				$this->date_cloture = null;
+				$this->commentaire = $comment;
+
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
 				$this->db->rollback();
 				return -1;
 			}
-			// End call triggers
-
-			$this->db->commit();
-			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();

From 19ae24f693cc1531bc5ca6b2316aee189ed9373d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 21:03:52 +0100
Subject: [PATCH 223/386] Code comment

---
 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 123330004ed..c1f218f15f8 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3392,7 +3392,7 @@ class Product extends CommonObject
 	 * 	@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       				Prod
+	 *  @return     array       				Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
 	 */
 	function getChildsArbo($id, $firstlevelonly=0, $level=1)
 	{

From 3c552cec15e48cb7a33cadfb4488f488150e3c2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 21:16:40 +0100
Subject: [PATCH 224/386] FIX Missing restore_lastsearch_values

---
 htdocs/comm/propal/card.php    | 2 +-
 htdocs/commande/card.php       | 2 +-
 htdocs/compta/facture/card.php | 2 +-
 htdocs/contrat/card.php        | 2 +-
 htdocs/fichinter/card.php      | 2 +-
 htdocs/fourn/commande/card.php | 2 +-
 htdocs/fourn/facture/card.php  | 2 +-
 htdocs/holiday/card.php        | 2 +-
 htdocs/livraison/card.php      | 2 +-
 htdocs/product/stock/card.php  | 2 +-
 htdocs/projet/card.php         | 2 +-
 htdocs/projet/tasks/task.php   | 2 +-
 htdocs/societe/card.php        | 2 +-
 htdocs/societe/list.php        | 2 +-
 htdocs/user/card.php           | 2 +-
 htdocs/user/group/card.php     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 02c1b0e65bb..9194ec62c49 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -201,7 +201,7 @@ if (empty($reshook))
 	{
 		$result = $object->delete($user);
 		if ($result > 0) {
-			header('Location: ' . DOL_URL_ROOT . '/comm/propal/list.php');
+			header('Location: ' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1');
 			exit();
 		} else {
 			$langs->load("errors");
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2cb899fcfe6..26166ab3f75 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -185,7 +185,7 @@ if (empty($reshook))
 		$result = $object->delete($user);
 		if ($result > 0)
 		{
-			header('Location: index.php');
+			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
 		}
 		else
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 969f4d532cb..a08b6663c38 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -191,7 +191,7 @@ if (empty($reshook))
 
 		$result = $object->delete($user, 0, $idwarehouse);
 		if ($result > 0) {
-			header('Location: ' . DOL_URL_ROOT . '/compta/facture/list.php');
+			header('Location: ' . DOL_URL_ROOT . '/compta/facture/list.php?restore_lastsearch_values=1');
 			exit();
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3b7ab5ae49b..c92246cf82a 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -842,7 +842,7 @@ if (empty($reshook))
 		$result=$object->delete($user);
 		if ($result >= 0)
 		{
-			header("Location: index.php");
+			header("Location: list.php?restore_lastsearch_values=1");
 			return;
 		}
 		else
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 9b623d21279..b2533ba553c 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -470,7 +470,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
-		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
+		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
 		exit;
 	}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f87b4c9bd25..6f541803d55 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -850,7 +850,7 @@ if (empty($reshook))
 		$result=$object->delete($user);
 		if ($result > 0)
 		{
-			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php');
+			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
 		}
 		else
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cc6fb29fa5a..0368d5cd7c8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -224,7 +224,7 @@ if (empty($reshook))
 		$result=$object->delete($user);
 		if ($result > 0)
 		{
-			header('Location: list.php');
+			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
 		}
 		else
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index ce985b51738..59cb522d7d5 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -299,7 +299,7 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 	if (! $error)
 	{
 		$db->commit();
-		header('Location: list.php');
+		header('Location: list.php?restore_lastsearch_values=1');
 		exit;
 	}
 	else
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 06c602df330..0e61adcb279 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -165,7 +165,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 	{
 		$db->commit();
 		if (! empty($backtopage)) header("Location: ".$backtopage);
-		else header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
 		exit;
 	}
 	else
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 8ab36de3428..61bd5c3d47f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -117,7 +117,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->su
 	if ($result > 0)
 	{
 	    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php');
+		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?resotre_lastsearch_values=1');
 		exit;
 	}
 	else
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 7494a5a15bb..c5cfb9b3756 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -409,7 +409,7 @@ if (empty($reshook))
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-			header("Location: index.php");
+			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
 		}
 		else
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 3d1ccfb8fe1..85a6461fbfb 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -125,7 +125,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 
 		if ($object->delete($user) > 0)
 		{
-			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':''));
+			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject?'&withproject=1':''));
 			exit;
 		}
 		else
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 37f60150dd8..dfe6f07cd53 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -796,7 +796,7 @@ if (empty($reshook))
 
         if ($result > 0)
         {
-            header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
+            header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
             exit;
         }
         else
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 47852c71403..9861f4b8d66 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -998,7 +998,7 @@ while ($i < min($num, $limit))
 		$savalias = $obj->name_alias;
 		if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
 		print '<td class="tdoverflowmax200">';
-		print $companystatic->getNomUrl(1,'',100);
+		print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		print "</td>\n";
 		$companystatic->name_alias = $savalias;
         if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9e7c90f79ac..a11c18daca7 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -157,7 +157,7 @@ if (empty($reshook)) {
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorUserCannotBeDelete"), null, 'errors');
 			} else {
-				header("Location: index.php");
+				header("Location: index.php?restore_lastsearch_values=1");
 				exit;
 			}
 		}
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 8f99fa1bb81..52de09d566d 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -91,7 +91,7 @@ if (empty($reshook)) {
 		{
 			$object->fetch($id);
 			$object->delete();
-			header("Location: index.php");
+			header("Location: index.php?restore_lastsearch_values=1");
 			exit;
 		}
 		else

From 8d963adb43846b1e1f5b43ac429fe1e5738cea64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2018 21:30:31 +0100
Subject: [PATCH 225/386] Fix error message

---
 htdocs/contrat/class/contrat.class.php | 2 +-
 htdocs/langs/en_US/errors.lang         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 64ffd794453..02868eb369c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1342,7 +1342,7 @@ class Contrat extends CommonObject
 		// Check parameters
 		if ($fk_product <= 0 && empty($desc))
 		{
-			$this->error="DescRequiredForFreeProductLines";
+			$this->error="ErrorDescRequiredForFreeProductLines";
 			return -1;
 		}
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f87a30ecfb2..86460452286 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
 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
 
 # Warnings
 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 239e83491333c71d705f6666818a98352e7a86b1 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 27 Feb 2018 10:03:51 +0100
Subject: [PATCH 226/386] FIX: supplier credit notes: remove handled TODO

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 570966d8600..7c0159c814f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2730,7 +2730,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 				$this->error = $this->db->lasterror();
 			}
 		}
-		// TODO free discount linked to line as in customer invoice 
+
 		if (! $error)
 		{
 			$this->db->commit();

From 712fafb776634ce75bcf6aee8e8664f8c53470c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 10:07:38 +0100
Subject: [PATCH 227/386] code sample

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

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index b0265a28e3f..e11925f075f 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -175,7 +175,7 @@ class ActionsMyModule
 	 */
 	function beforePDFCreation($parameters, &$object, &$action)
 	{
-		global $langs,$conf;
+		global $conf, $user, $langs;
 		global $hookmanager;
 
 		$outputlangs=$langs;
@@ -204,7 +204,7 @@ class ActionsMyModule
 	 */
 	function afterPDFCreation($parameters, &$pdfhandler, &$action)
 	{
-		global $langs,$conf;
+		global $conf, $user, $langs;
 		global $hookmanager;
 
 		$outputlangs=$langs;

From a4ae70020264861d293afd2ed254a1f0598a62fc Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Tue, 27 Feb 2018 11:11:32 +0100
Subject: [PATCH 228/386] FIX : Avoid empty value to fk_multicurrency attribute

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 92e04e1672b..5cf5b6c7b40 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4067,7 +4067,7 @@ class OrderLine extends CommonOrderLine
         $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
 	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", ".(! empty($this->fk_multicurrency) ? $this->fk_multicurrency : 'NULL');
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".$this->multicurrency_subprice;
 		$sql.= ", ".$this->multicurrency_total_ht;

From 5b925a5912cefc2644cc2aaf51c9e005e7a02b91 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Tue, 27 Feb 2018 11:08:23 +0000
Subject: [PATCH 229/386] Fix misspelled restore_lastsearch_values

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

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 61bd5c3d47f..f732c44fc31 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -117,7 +117,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->su
 	if ($result > 0)
 	{
 	    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?resotre_lastsearch_values=1');
+		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1');
 		exit;
 	}
 	else

From e58cf4db42d98526310336059b96c9a223fa27ab Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Tue, 27 Feb 2018 11:44:03 +0000
Subject: [PATCH 230/386] Fix missing insert bill_time in project.class on
 create

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ed25f3ba813..bc78d285945 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -196,6 +196,7 @@ class Project extends CommonObject
         $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
         $sql.= ", " . (strcmp($this->opp_amount,'') ? price2num($this->opp_amount) : 'null');
         $sql.= ", " . (strcmp($this->budget_amount,'') ? price2num($this->budget_amount) : 'null');
+        $sql.= ", " . ($this->bill_time ? 1 : 0);
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 

From 2294a50c8993e673da49bac039e0a1b7180fefac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 13:05:59 +0100
Subject: [PATCH 231/386] Fix tooltip

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php  | 14 +++++++-------
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index a48e8a5f31a..0c141d8933a 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -93,15 +93,15 @@ $langs->load("modulebuilder");
 			else if (type == 'int')      { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'sellist')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'radio')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
-			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
+			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'sellist')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'radio')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();jQuery("#helppassword").hide();}
 			else if (type == 'separate') {
 				langfile.val('').prop('disabled',true);size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true);
 				jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index a919b545a36..63059964b74 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -91,16 +91,16 @@ $langs->load("modulebuilder");
 			else if (type == 'int')      { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'sellist')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'radio')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
-			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
-			else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'select')   { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'sellist')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'radio')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
+			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();jQuery("#helppassword").hide();}
+			else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").hide();}
 			else {	// type = string
 				size.val('').prop('disabled', true);
 				unique.removeAttr('disabled');

From 6bec121c9ffa83a381197169df747be2b8feadfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 13:26:57 +0100
Subject: [PATCH 232/386] Use name of var

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

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 06cfc0e0eac..a51d19f5b97 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -129,7 +129,7 @@ if ($action == 'other')
 
 	}
 
-	$value = GETPOST('activate_sousproduits','alpha');
+	$value = GETPOST('PRODUIT_SOUSPRODUITS','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value,'chaine',0,'',$conf->entity);
 
 	$value = GETPOST('activate_viewProdDescInForm','alpha');
@@ -580,7 +580,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
 print '<td width="60" align="right">';
-print $form->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1);
+print $form->selectyesno("PRODUIT_SOUSPRODUITS",$conf->global->PRODUIT_SOUSPRODUITS,1);
 print '</td>';
 print '</tr>';
 

From 24ae7b4780213ae7a7f9598a1fc9b51de44ce9a8 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Tue, 27 Feb 2018 14:45:17 +0000
Subject: [PATCH 233/386] Suppress count warning in admin_extrafields_view.tpl

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index db0e7f4284a..a80e320c1e5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -737,7 +737,7 @@ class ExtraFields
 		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed";
-		$sql .= ",entity";
+		$sql.= ",entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 6ab7fecbf10..23e5aff0cae 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -67,7 +67,7 @@ if ($conf->multicompany->enabled)  {
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-if (count($extrafields->attributes[$elementtype]['type']))
+if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type']))
 {
 	foreach($extrafields->attributes[$elementtype]['type'] as $key => $value)
 	{

From 9cf45266f5e7849e9b3c3827b7ff9255ddb5901e Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 27 Feb 2018 16:30:39 +0100
Subject: [PATCH 234/386] NEW: supplier relative discounts

---
 htdocs/comm/remise.php                        | 219 ++++++++++++++----
 htdocs/core/tpl/objectline_create.tpl.php     |   6 +-
 htdocs/fourn/card.php                         |  13 ++
 htdocs/fourn/commande/card.php                |  25 +-
 htdocs/fourn/facture/card.php                 |  43 ++--
 .../install/mysql/migration/7.0.0-8.0.0.sql   |  15 +-
 htdocs/install/mysql/tables/llx_societe.sql   |   1 +
 .../tables/llx_societe_remise_supplier.sql    |  34 +++
 htdocs/langs/en_US/companies.lang             |   2 +
 htdocs/societe/card.php                       |   2 +-
 .../societe/class/api_thirdparties.class.php  |   2 +-
 htdocs/societe/class/societe.class.php        |  65 +++++-
 htdocs/supplier_proposal/card.php             |  24 +-
 13 files changed, 351 insertions(+), 100 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_societe_remise_supplier.sql

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 1ad4612d879..bc87c2e65fc 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -56,7 +56,14 @@ if (GETPOST('action','aZ09') == 'setremise')
 {
 	$object = new Societe($db);
 	$object->fetch($id);
-	$result=$object->set_remise_client(price2num(GETPOST("remise")),GETPOST("note"),$user);
+
+	$discount_type = GETPOST('discount_type', 'int');
+
+	if(! empty($discount_type)) {
+		$result=$object->set_remise_supplier(price2num(GETPOST("remise")),GETPOST("note"),$user);
+	} else {
+		$result=$object->set_remise_client(price2num(GETPOST("remise")),GETPOST("note"),$user);
+	}
 
 	if ($result > 0)
 	{
@@ -100,6 +107,11 @@ if ($socid > 0)
 
 	$head = societe_prepare_head($object);
 
+	$isCustomer = $object->client == 1 || $object->client == 3;
+	$isSupplier = $object->fournisseur == 1;
+	
+	$displayCustomer = $conf->global->MAIN_FEATURES_LEVEL <= 0 || $isCustomer;
+	$displaySupplier = $conf->global->MAIN_FEATURES_LEVEL > 0 && $isSupplier;
 
 
 	print '<form method="POST" action="remise.php?id='.$object->id.'">';
@@ -114,20 +126,58 @@ if ($socid > 0)
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
+    
+    if(! $displayCustomer && ! $displaySupplier) {
+    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+    	
+    	dol_fiche_end();
+    	
+    	print '</form>';
+    	
+    	llxFooter();
+    	$db->close();
+    	exit;
+    }
+
 	print '<table class="border centpercent">';
 
-	// Discount
-	print '<tr><td class="titlefield">';
-	print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";
+	if($displayCustomer) {
+		// Customer discount
+		print '<tr><td class="titlefield">';
+		print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";
+	}
+	
+	if($displaySupplier) {
+		// Supplier discount
+		print '<tr><td class="titlefield">';
+		print $langs->trans("SupplierRelativeDiscount").'</td><td>'.price2num($object->remise_supplier_percent)."%</td></tr>";
+	}
+
 	print '</table>';
 	print '<br>';
 
 	print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
 
 	print '<div class="underbanner clearboth"></div>';
+
+	if($conf->global->MAIN_FEATURES_LEVEL <= 0 || ($isCustomer && ! $isSupplier)) {
+		print '<input type="hidden" name="discount_type" value="0" />';
+	}
+	
+	if($conf->global->MAIN_FEATURES_LEVEL > 0 && (! $isCustomer && $isSupplier)) {
+		print '<input type="hidden" name="discount_type" value="1" />';
+	}
 	
 	print '<table class="border centpercent">';
 
+	if($conf->global->MAIN_FEATURES_LEVEL > 0 && $isCustomer && $isSupplier) {
+		// Discount type
+		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';
+		print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+		print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+		print '</td></tr>';
+	}
+
 	// New value
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans("NewValue").'</td><td><input type="text" size="5" name="remise" value="'.dol_escape_htmltag(GETPOST("remise")).'">%</td></tr>';
@@ -155,57 +205,128 @@ if ($socid > 0)
 
 	print '<br>';
 
+	if($displayCustomer) {
+		if($displaySupplier) {
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
+		}
 
-	/*
-	 * List log of all percent discounts
-	 */
-	$sql  = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,";
-	$sql.= " u.login, u.rowid as user_id";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
-	$sql.= " WHERE rc.fk_soc = " . $object->id;
-	$sql.= " AND rc.entity = " . $conf->entity;
-	$sql.= " AND u.rowid = rc.fk_user_author";
-	$sql.= " ORDER BY rc.datec DESC";
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		print '<table class="noborder" width="100%">';
-		$tag = !$tag;
-		print '<tr class="liste_titre">';
-		print '<td width="160">'.$langs->trans("Date").'</td>';
-		print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
-		print '<td align="left">'.$langs->trans("NoteReason").'</td>';
-		print '<td align="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 align="center">'.price2num($obj->remise_percent).'%</td>';
-    			print '<td align="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++;
-    		}
+		/*
+		 * List log of all customer percent discounts
+		 */
+		$sql  = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,";
+		$sql.= " u.login, u.rowid as user_id";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND u.rowid = rc.fk_user_author";
+		$sql.= " ORDER BY rc.datec DESC";
+	
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			print '<table class="noborder" width="100%">';
+			$tag = !$tag;
+			print '<tr class="liste_titre">';
+			print '<td width="160">'.$langs->trans("Date").'</td>';
+			print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
+			print '<td align="left">'.$langs->trans("NoteReason").'</td>';
+			print '<td align="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 align="center">'.price2num($obj->remise_percent).'%</td>';
+	    			print '<td align="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>';
+			}		
+			$db->free($resql);
+			print "</table>";
 		}
 		else
 		{
-		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}		
-		$db->free($resql);
-		print "</table>";
-	}
-	else
-	{
-		dol_print_error($db);
+			dol_print_error($db);
+		}
 	}
 
+	if($displaySupplier) {
+		if($displayCustomer) {
+			print '</div>'; // class="fichehalfleft"
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
+		}
+
+		/*
+		 * List log of all supplier percent discounts
+		 */
+		$sql  = "SELECT rc.rowid, rc.remise_supplier as remise_percent, rc.note, rc.datec as dc,";
+		$sql.= " u.login, u.rowid as user_id";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";
+		$sql.= " WHERE rc.fk_soc = " . $object->id;
+		$sql.= " AND rc.entity = " . $conf->entity;
+		$sql.= " AND u.rowid = rc.fk_user_author";
+		$sql.= " ORDER BY rc.datec DESC";
+		
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			print '<table class="noborder" width="100%">';
+			$tag = !$tag;
+			print '<tr class="liste_titre">';
+			print '<td width="160">'.$langs->trans("Date").'</td>';
+			print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
+			print '<td align="left">'.$langs->trans("NoteReason").'</td>';
+			print '<td align="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 align="center">'.price2num($obj->remise_percent).'%</td>';
+					print '<td align="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>';
+			}
+			$db->free($resql);
+			print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		if($displayCustomer) {
+			print '</div>'; // class="ficheaddleft"
+			print '</div>'; // class="fichehalfright"
+			print '</div>'; // class="fichecenter"
+		}
+	}
 }
 
 llxFooter();
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d26a31b3cd2..103e557eb7c 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -322,8 +322,12 @@ else {
 		print $form->selectUnits($line->fk_unit, "units");
 		print '</td>';
 	}
+	$remise_percent = $buyer->remise_percent;
+	if($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+		$remise_percent = $seller->remise_supplier_percent;
+	}
 	?>
-	<td class="nobottom nowrap linecoldiscount" align="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):$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
+	<td class="nobottom nowrap linecoldiscount" align="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>
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 60f745d95c7..1929c11a464 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -257,6 +257,19 @@ if ($object->id > 0)
 	print '</tr>';
 
 	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		// Relative discounts (Discounts-Drawbacks-Rebates)
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans("CustomerRelativeDiscountShort");
+		print '<td><td align="right">';
+		if ($user->rights->societe->creer && !$user->societe_id > 0)
+		{
+			print '<a 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_supplier_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_supplier_percent.'%</a>':'').'</td>';
+		print '</tr>';
+
 		// Absolute discounts (Discounts-Drawbacks-Rebates)
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding">';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0111a8d11c7..88d654a8924 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1398,7 +1398,7 @@ if ($action=='create')
 		$availability_id	= (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0));
 		$shipping_method_id = (! empty($objectsrc->shipping_method_id)?$objectsrc->shipping_method_id:(! empty($soc->shipping_method_id)?$soc->shipping_method_id:0));
 		$demand_reason_id	= (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0));
-		$remise_percent		= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
+		$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:'';
 
@@ -1436,7 +1436,7 @@ if ($action=='create')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
-	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
+	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_supplier_percent . '">';
 	print '<input type="hidden" name="origin" value="' . $origin . '">';
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
@@ -1479,17 +1479,16 @@ if ($action=='create')
 
 	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $societe->id > 0)
 	{
-/* // TODO handle supplier relative discount
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($societe->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
+		if ($societe->remise_supplier_percent)
+			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_supplier_percent . '</a>');
 		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print $langs->trans("HasNoRelativeDiscountFromSupplier");
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
-*/
+
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 
 		if ($absolute_discount)
@@ -1897,13 +1896,13 @@ elseif (! empty($object->id))
 		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 	
 		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-/* // TODO handle supplier relative discount
-		if ($societe->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+
+		if ($societe->remise_supplier_percent)
+			print $langs->trans("HasRelativeDiscountFromSupplier", $societe->remise_supplier_percent);
 		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print $langs->trans("HasNoRelativeDiscountFromSupplier");
 		print '. ';
-*/
+
 		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
@@ -1913,7 +1912,7 @@ elseif (! empty($object->id))
 				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 			} else {
 				// Remise dispo de type remise fixe (not credit note)
-//				print '<br>';
+				print '<br>';
 				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
 			}
 		}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c1c04489f1d..b1efc5cbfa5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1625,7 +1625,7 @@ if ($action == 'create')
 			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:1));
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_supplier_id)?$soc->mode_reglement_supplier_id:0));
 			$fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
-			$remise_percent 	= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
+			$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:'';
 
@@ -1917,15 +1917,15 @@ if ($action == 'create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-/* // TODO handle supplier relative discount
-		if ($societe->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_percent . '</a>');
+
+		if ($societe->remise_supplier_percent)
+			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_supplier_percent . '</a>');
 		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print $langs->trans("HasNoRelativeDiscountFromSupplier");
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
-*/
+
 		if ($absolute_discount)
 			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
 		else
@@ -2428,17 +2428,17 @@ else
 			
 			print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
 			print '</td><td>';
-/* // TODO handle supplier relative discount
-			if ($societe->remise_percent)
-				print $langs->trans("CompanyHasRelativeDiscount", $societe->remise_percent);
+
+			if ($societe->remise_supplier_percent)
+				print $langs->trans("HasRelativeDiscountFromSupplier", $societe->remise_supplier_percent);
 			else
-				print $langs->trans("CompanyHasNoRelativeDiscount");
-			print ' ('.$addrelativediscount.')';
-*/
+				print $langs->trans("HasNoRelativeDiscountFromSupplier");
+			// print ' ('.$addrelativediscount.')';
+
 	
 			// Is there is commercial discount or down payment available ?
 			if ($absolute_discount > 0) {
-//				print '. ';
+				print '. ';
 				if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
 					if ($object->statut == 0) {
 						print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
@@ -2446,7 +2446,7 @@ else
 					} else {
 						if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
 							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-							print '<!--<br>-->' . $text . '.<br>';
+							print '<br>' . $text . '.<br>';
 						} else {
 							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 							$text2 = $langs->trans("AbsoluteDiscountUse");
@@ -2455,7 +2455,7 @@ else
 					}
 				} else {
 					// Discount available of type fixed amount (not credit note)
-//					print '<br>';
+					print '<br>';
 					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
 				}
 			} else {
@@ -2463,10 +2463,11 @@ else
 				{
 					if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
 						print ' (' . $addabsolutediscount . ')<br>';
-//					else
-//						print '. ';
-				} else
-				print '. ';
+					else
+						print '. ';
+				}
+				else
+					print '. ';
 			}
 			// Is there credit notes availables ?
 			if ($absolute_creditnote > 0)
@@ -2481,7 +2482,7 @@ else
 					}
 				} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 					// There is credit notes discounts available
-//					if (! $absolute_discount) print '<br>';
+					if (! $absolute_discount) print '<br>';
 					// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
 					$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
 					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
@@ -2503,7 +2504,7 @@ else
 			// }
 			print '</td></tr>';
         }
-				
+
         // Label
         print '<tr>';
         print '<td>'.$form->editfieldkey("Label",'label',$object->label,$object,($user->rights->fournisseur->facture->creer)).'</td>';
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 bfc2c79a679..4071356c982 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
@@ -35,4 +35,17 @@ ALTER TABLE llx_projet ADD COLUMN bill_time integer DEFAULT 0;
 ALTER TABLE llx_societe ADD COLUMN order_min_amount double(24,8) DEFAULT NULL AFTER outstanding_limit;
 ALTER TABLE llx_societe ADD COLUMN supplier_order_min_amount double(24,8) DEFAULT NULL AFTER order_min_amount;
 
-ALTER TABLE llx_societe_remise_except ADD COLUMN discount_type integer DEFAULT 0 NOT NULL AFTER fk_soc;
\ No newline at end of file
+ALTER TABLE llx_societe_remise_except ADD COLUMN discount_type integer DEFAULT 0 NOT NULL AFTER fk_soc;
+ALTER TABLE llx_societe ADD COLUMN remise_supplier real DEFAULT 0 AFTER remise_client;
+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,
+  datec				datetime,							-- creation date
+  fk_user_author	integer,							-- creation user
+  remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
+  note				text
+
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 9ffb9734d7f..f1714021fb8 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -78,6 +78,7 @@ create table llx_societe
   customer_rate            real           DEFAULT 0,            		-- taux fiabilite client (0 a 1)
   supplier_rate            real           DEFAULT 0,            		-- taux fiabilite fournisseur (0 a 1)
   remise_client            real           DEFAULT 0,            		-- remise systematique pour le client
+  remise_supplier          real           DEFAULT 0,            		-- remise systematique auprès du fournisseur
   mode_reglement           tinyint,                             		-- mode de reglement
   cond_reglement           tinyint,                             		-- condition de reglement
   mode_reglement_supplier  tinyint,                             		-- mode de reglement fournisseur
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
new file mode 100644
index 00000000000..c1b56f225c7
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
@@ -0,0 +1,34 @@
+-- ========================================================================
+-- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2011-2016 Regis Houssin        <regis.houssin@capnetworks.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/>.
+--
+--
+-- Historique evolution de la remise relative des tiers
+-- ========================================================================
+
+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,
+  datec				datetime,							-- creation date
+  fk_user_author	integer,							-- creation user
+  remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
+  note				text
+
+)ENGINE=innodb;
+
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index dde515c0223..aab3ee183da 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -268,6 +268,8 @@ CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index dcacf89d643..94fe7436041 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -149,7 +149,7 @@ if (empty($reshook))
 				$listofproperties=array(
 					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 					'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
-					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
 					'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
 					'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
 					'model_pdf', 'fk_projet'
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 49901c420f0..1cdfabf7fca 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -314,7 +314,7 @@ class Thirdparties extends DolibarrApi
 		$listofproperties=array(
 		'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 		'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
-		'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+		'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
 		'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
 		'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
 		'model_pdf', 'fk_projet'
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4bf2dbd0dab..ddf6f5c509a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -234,6 +234,7 @@ class Societe extends CommonObject
 	var $forme_juridique;
 
 	var $remise_percent;
+	var $remise_supplier_percent;
 	var $mode_reglement_supplier_id;
 	var $cond_reglement_supplier_id;
 	var $fk_prospectlevel;
@@ -1143,7 +1144,7 @@ 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, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
+		$sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, 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';
 		$sql .= ', s.fk_shipping_method';
 		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
@@ -1275,6 +1276,7 @@ class Societe extends CommonObject
 				$this->prefix_comm = $obj->prefix_comm;
 
 				$this->remise_percent		= $obj->remise_client;
+				$this->remise_supplier_percent		= $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
@@ -1657,6 +1659,67 @@ class Societe extends CommonObject
 			return 1;
 		}
 	}
+	
+	/**
+	 *  Definit la societe comme un client
+	 *
+	 *  @param	float	$remise		Valeur en % de la remise
+	 *  @param  string	$note		Note/Motif de modification de la remise
+	 *  @param  User	$user		Utilisateur qui definie la remise
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function set_remise_supplier($remise, $note, User $user)
+	{
+		global $conf, $langs;
+		
+		// Nettoyage parametres
+		$note=trim($note);
+		if (! $note)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			return -2;
+		}
+		
+		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
+		
+		if ($this->id)
+		{
+			$this->db->begin();
+			
+			$now=dol_now();
+			
+			// Positionne remise courante
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
+			$sql.= " WHERE rowid = " . $this->id;
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -1;
+			}
+			
+			// Ecrit trace dans historique des remises
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
+			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
+			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql.= " '".$this->db->escape($note)."',";
+			$sql.= " ".$user->id;
+			$sql.= ")";
+			
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				return -1;
+			}
+			
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 	/**
 	 *    	Add a discount for third party
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 259d3d0a5ca..93bf576ef71 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -995,7 +995,7 @@ if ($action == 'create')
 
 		$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
 		$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
-		$remise_percent 	= (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
+		$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));
 
 		// Replicate extrafields
@@ -1052,15 +1052,15 @@ if ($action == 'create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';		
-/* // TODO handle supplier relative discount
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
+
+		if ($soc->remise_supplier_percent)
+			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_supplier_percent . '</a>');
 		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print $langs->trans("HasNoRelativeDiscountFromSupplier");
 		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
 		print '. ';
 		print '<br>';
-*/
+
 		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);
 
 		if ($absolute_discount)
@@ -1427,13 +1427,13 @@ if ($action == 'create')
 		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 	
 		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-/* // TODO handle supplier relative discount
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+
+		if ($soc->remise_supplier_percent)
+			print $langs->trans("HasRelativeDiscountFromSupplier", $soc->remise_supplier_percent);
 		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print $langs->trans("HasNoRelativeDiscountFromSupplier");
 		print '. ';
-*/
+
 		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
@@ -1443,7 +1443,7 @@ if ($action == 'create')
 				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 			} else {
 				// Remise dispo de type remise fixe (not credit note)
-//				print '<br>';
+				print '<br>';
 				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
 			}
 		}

From 48e042b66935826aa2422961b843776ee907b4ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 16:33:40 +0100
Subject: [PATCH 235/386] FIX css border missing

---
 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 c92246cf82a..59688aab1a3 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1996,7 +1996,7 @@ else
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="closeline">';
 
-				print '<table class="noborder tableforservicepart2 boxtablenobottom" width="100%">';
+				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut_reelle;

From 8ac4cb9c430a162d3ae904ef63fb8a9702992fa0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 16:33:50 +0100
Subject: [PATCH 236/386] Add fetch_product

---
 htdocs/core/class/commonobject.class.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fd221649141..5235e59ef34 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1231,7 +1231,7 @@ abstract class CommonObject
 	}
 
 	/**
-	 *		Charge le projet d'id $this->fk_project dans this->projet
+	 *		Load the project with id $this->fk_project into this->project
 	 *
 	 *		@return		int			<0 if KO, >=0 if OK
 	 */
@@ -1251,7 +1251,25 @@ abstract class CommonObject
 	}
 
 	/**
-	 *		Charge le user d'id userid dans this->user
+	 *		Load the product with id $this->fk_product into this->product
+	 *
+	 *		@return		int			<0 if KO, >=0 if OK
+	 */
+	function fetch_product()
+	{
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+		if (empty($this->fk_product)) return 0;
+
+		$product = new Product($this->db);
+		$result = $product->fetch($this->fk_product);
+
+		$this->product = $product;
+		return $result;
+	}
+
+	/**
+	 *		Load the user with id $userid into this->user
 	 *
 	 *		@param	int		$userid 		Id du contact
 	 *		@return	int						<0 if KO, >0 if OK

From 03858d73b1b4476b657152d5a19c9d058a58790e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 17:30:13 +0100
Subject: [PATCH 237/386] NEW Add extrafield type "html"

---
 htdocs/core/class/extrafields.class.php       | 38 +++++++++++++++----
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  1 +
 .../core/tpl/admin_extrafields_edit.tpl.php   |  5 ++-
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index db0e7f4284a..08d6c3bfeaf 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -82,6 +82,7 @@ class ExtraFields
 	public static $type2label=array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
+	'html'=>'HtmlText',
 	'int'=>'Int',
 	'double'=>'Float',
 	'date'=>'Date',
@@ -133,7 +134,7 @@ class ExtraFields
 	 *
 	 *  @param	string			$attrname           Code of attribute
 	 *  @param  string			$label              label of attribute
-	 *  @param  int				$type               Type of attribute ('boolean', 'int', 'text', 'varchar', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+	 *  @param  int				$type               Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
 	 *  @param  int				$pos                Position of attribute
 	 *  @param  string			$size               Size/length of attribute
 	 *  @param  string			$elementtype        Element type ('member', 'product', 'thirdparty', ...)
@@ -189,7 +190,7 @@ class ExtraFields
 	 *  This is a private method. For public method, use addExtraField.
 	 *
 	 *	@param	string	$attrname			code of attribute
-	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'text', 'varchar', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
 	 *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @param	int		$unique				Is field unique or not
@@ -232,6 +233,8 @@ class ExtraFields
 			} elseif ($type=='link') {
 				$typedb='int';
 				$lengthdb='11';
+			} elseif ($type=='html') {
+				$typedb='text';
 			} elseif($type=='password') {
 				$typedb='varchar';
 				$lengthdb='128';
@@ -275,7 +278,7 @@ class ExtraFields
 	 *
 	 *	@param	string			$attrname		code of attribute
 	 *	@param	string			$label			label of attribute
-	 *  @param	int				$type			Type of attribute ('int', 'text', 'varchar', 'date', 'datehour', 'float')
+	 *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
 	 *  @param	int				$pos			Position of attribute
 	 *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
 	 *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
@@ -483,7 +486,7 @@ class ExtraFields
 	 *
 	 *  @param	string	$attrname			Name of attribute
 	 *  @param	string	$label				Label of attribute
-	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'text', 'varchar', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
 	 *  @param	int		$length				Length of attribute
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @param	int		$unique				Is field unique or not
@@ -529,6 +532,8 @@ class ExtraFields
 			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
 				$typedb='text';
 				$lengthdb='';
+			} elseif ($type == 'html') {
+				$typedb='text';
 			} elseif ($type=='link') {
 				$typedb='int';
 				$lengthdb='11';
@@ -800,15 +805,17 @@ class ExtraFields
 							{
 								if ($obj = $this->db->fetch_object($resql_entity_name))
 								{
-									$this->attribute_entitylabel[$tab->name]=$obj->label;
+									$this->attribute_entitylabel[$tab->name]=$obj->label;	// Old usage
 									$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=$obj->label;
 								}
 							}
 						}
 					}
+
+					$this->attributes[$tab->elementtype]['loaded']=1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;
+			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
 		}
 		else
 		{
@@ -933,6 +940,19 @@ class ExtraFields
 			$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 == 'text')
+		{
+			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,false,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 == 'html')
 		{
 			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
@@ -1373,7 +1393,7 @@ class ExtraFields
 			$list=$this->attributes[$extrafieldsobjectkey]['list'][$key];
 			$hidden=(($list == 0) ? 1 : 0);		// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
-		else
+		else	// Old usage
 		{
 			$elementtype=$this->attribute_elementtype[$key];	// seems not used
 			$label=$this->attribute_label[$key];
@@ -1646,6 +1666,10 @@ class ExtraFields
 		{
 			$value=dol_htmlentitiesbr($value);
 		}
+		elseif ($type == 'html')
+		{
+			$value=dol_htmlentitiesbr($value);
+		}
 		elseif ($type == 'password')
 		{
 			$value=preg_replace('/./i','*',$value);
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 0c141d8933a..51e6c518a7a 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -92,6 +92,7 @@ $langs->load("modulebuilder");
     		else if (type == 'double')   { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'int')      { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'html')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 63059964b74..9fb5eb27a64 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -90,6 +90,7 @@ $langs->load("modulebuilder");
     		else if (type == 'double')   { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'int')      { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'html')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar')  { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
@@ -182,7 +183,9 @@ elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($t
 <?php
 // Define list of possible type transition
 $typewecanchangeinto=array(
-	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password'),
+	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
+	'text'=>array('text','html'),
+	'html'=>array('text','html'),
 	'password'=>array('password', 'varchar'),
 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
     'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d6bf4d01fe9..0c5962c1183 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -392,6 +392,7 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
 TextLong=Long text
+HtmlText=Html text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour

From 7ba263c9abba55516ff5eacd16b9d2228aa338cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 19:03:14 +0100
Subject: [PATCH 238/386] Fix search on dates on template invoices

---
 htdocs/compta/facture/fiche-rec.php           |   6 +-
 .../compta/facture/invoicetemplate_list.php   | 105 +++++++++---------
 htdocs/theme/eldy/style.css.php               |   3 +-
 htdocs/theme/md/style.css.php                 |   3 +-
 4 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 43d28c9abbd..e1b5af4e88d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -116,6 +116,8 @@ $permissionnote = $user->rights->facture->creer; // Used by the include of actio
 $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
+$now = dol_now();
+
 
 /*
  * Actions
@@ -1133,7 +1135,7 @@ if ($action == 'create')
 		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m'));
 		print "</td></tr>";
 
-		// First date of execution for cron
+		// Date next run
 		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 		print $form->select_date($date_next_execution, '', 1, 1, '', "add", 1, 1, 1);
@@ -1533,6 +1535,8 @@ else
 		{
 			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
 		}
+		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
+		if ($action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
 		print '</td>';
 		print '</tr>';
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index d3a7c01b4c0..fe4a8a5c7cd 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -72,12 +72,12 @@ $search_montant_vat=GETPOST('search_montant_vat');
 $search_montant_ttc=GETPOST('search_montant_ttc');
 $search_payment_mode=GETPOST('search_payment_mode');
 $search_payment_term=GETPOST('search_payment_term');
-$day=GETPOST('day');
-$year=GETPOST('year');
-$month=GETPOST('month');
-$day_date_when=GETPOST('day_date_when');
-$year_date_when=GETPOST('year_date_when');
-$month_date_when=GETPOST('month_date_when');
+$search_day=GETPOST('search_day','int');
+$search_year=GETPOST('search_year','int');
+$search_month=GETPOST('search_month','int');
+$search_day_date_when=GETPOST('search_day_date_when','int');
+$search_year_date_when=GETPOST('search_year_date_when','int');
+$search_month_date_when=GETPOST('search_month_date_when','int');
 $search_recurring=GETPOST('search_recurring','int');
 $search_frequency=GETPOST('search_frequency','alpha');
 $search_unit_frequency=GETPOST('search_unit_frequency','alpha');
@@ -172,12 +172,12 @@ if (empty($reshook))
 		$search_montant_ttc='';
 		$search_payment_mode='';
 		$search_payment_term='';
-		$day='';
-		$year='';
-		$month='';
-		$day_date_when='';
-		$year_date_when='';
-		$month_date_when='';
+		$search_day='';
+		$search_year='';
+		$search_month='';
+		$search_day_date_when='';
+		$search_year_date_when='';
+		$search_month_date_when='';
 		$search_recurring='';
 		$search_frequency='';
 		$search_unit_frequency='';
@@ -239,38 +239,38 @@ if (! empty($search_payment_term) && $search_payment_term != '-1')   $sql .= nat
 if ($search_recurring == '1')     $sql .= ' AND f.frequency > 0';
 if ($search_recurring == '0')     $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
 if ($search_frequency != '')      $sql .= natural_search('f.frequency', $search_frequency, 1);
-if ($search_unit_frequency != '') $sql .= natural_search('f.unit_frequency', $search_unit_frequency);
+if ($search_unit_frequency != '') $sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
 if ($search_status != '' && $search_status >= -1)
 {
 	if ($search_status == 0) $sql.= ' AND frequency = 0 AND suspended = 0';
 	if ($search_status == 1) $sql.= ' AND frequency != 0 AND suspended = 0';
 	if ($search_status == -1) $sql.= ' AND suspended = 1';
 }
-if ($month > 0)
+if ($search_month > 0)
 {
-	if ($year > 0 && empty($day))
-		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else if ($year > 0 && ! empty($day))
-		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+	if ($search_year > 0 && empty($search_day))
+		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+	else if ($search_year > 0 && ! empty($search_day))
+		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
 	else
-		$sql.= " AND date_format(f.date_last_gen, '%m') = '".$month."'";
+		$sql.= " AND date_format(f.date_last_gen, '%m') = '".$db->escape($search_month)."'";
 }
-else if ($year > 0)
+else if ($search_year > 0)
 {
-	$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+	$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
-if ($month_date_when > 0)
+if ($search_month_date_when > 0)
 {
-	if ($year_date_when > 0 && empty($day_date_when))
-		$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,$month_date_when,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,$month_date_when,false))."'";
-	else if ($year_date_when > 0 && ! empty($day_date_when))
-		$sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date_when, $day_date_when, $year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date_when, $day_date_when, $year_date_when))."'";
+	if ($search_year_date_when > 0 && empty($search_day_date_when))
+		$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,$search_month_date_when,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,$search_month_date_when,false))."'";
+	else if ($search_year_date_when > 0 && ! empty($search_day_date_when))
+		$sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_date_when, $search_day_date_when, $search_year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_date_when, $search_day_date_when, $search_year_date_when))."'";
 	else
-		$sql.= " AND date_format(f.date_when, '%m') = '".$month_date_when."'";
+		$sql.= " AND date_format(f.date_when, '%m') = '".$db->escape($search_month_date_when)."'";
 }
-else if ($year_date_when > 0)
+else if ($search_year_date_when > 0)
 {
-	$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($year_date_when,12,false))."'";
+	$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,12,false))."'";
 }
 
 $nbtotalofrecords = '';
@@ -291,26 +291,26 @@ 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 ($socid)              $param.='&socid='.urlencode($socid);
-	if ($day)                $param.='&day='.urlencode($day);
-	if ($month)              $param.='&month='.urlencode($month);
-	if ($year)               $param.='&year=' .urlencode($year);
-	if ($day_date_when)      $param.='&day_date_when='.urlencode($day_date_when);
-	if ($month_date_when)    $param.='&month_date_when='.urlencode($month_date_when);
-	if ($year_date_when)     $param.='&year_date_when=' .urlencode($year_date_when);
-	if ($search_ref)         $param.='&search_ref=' .urlencode($search_ref);
-	if ($search_societe)     $param.='&search_societe=' .urlencode($search_societe);
+	if ($socid)                     $param.='&socid='.urlencode($socid);
+	if ($search_day)                $param.='&search_day='.urlencode($search_day);
+	if ($search_month)              $param.='&search_month='.urlencode($search_month);
+	if ($search_year)               $param.='&search_year=' .urlencode($search_year);
+	if ($search_day_date_when)      $param.='&search_day_date_when='.urlencode($search_day_date_when);
+	if ($search_month_date_when)    $param.='&search_month_date_when='.urlencode($search_month_date_when);
+	if ($search_year_date_when)     $param.='&search_year_date_when=' .urlencode($search_year_date_when);
+	if ($search_ref)                $param.='&search_ref=' .urlencode($search_ref);
+	if ($search_societe)            $param.='&search_societe=' .urlencode($search_societe);
 	if ($search_montant_ht != '')   $param.='&search_montant_ht=' .urlencode($search_montant_ht);
 	if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
 	if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($search_payment_mode != '') $param.='&search_payment_mode='.urlencode($search_payment_mode);
 	if ($search_payment_type != '') $param.='&search_payment_type='.urlencode($search_payment_type);
 	if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .urlencode($search_recurring);
-	if ($search_frequency > 0)      $param.='&search_frequency='  .urlencode($search_frequency);
-	if ($search_unit_frequency > 0) $param.='&search_unit_frequency='.urlencode($search_unit_frequency);
+	if ($search_frequency > 0)        $param.='&search_frequency='  .urlencode($search_frequency);
+	if ($search_unit_frequency != '') $param.='&search_unit_frequency='.urlencode($search_unit_frequency);
 	if ($search_status != '')		$param.='&search_status='.urlencode($search_status);
-	if ($option)             $param.="&option=".urlencode($option);
-	if ($optioncss != '')    $param.='&optioncss='.urlencode($optioncss);
+	if ($option)                    $param.="&option=".urlencode($option);
+	if ($optioncss != '')           $param.='&optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -420,18 +420,18 @@ if ($resql)
 	if (! empty($arrayfields['f.date_last_gen']['checked']))
 	{
 		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);
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+		$formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5);
 		print '</td>';
 	}
-	// Date due
+	// Date next generation
 	if (! empty($arrayfields['f.date_when']['checked']))
 	{
 		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_date_when" value="'.$day_date_when.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month_date_when" value="'.$month_date_when.'">';
-		$formother->select_year($year_date_when?$year_date_when:-1,'year_date_when',1, 20, 5);
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
+		$formother->select_year($search_year_date_when?$search_year_date_when:-1,'search_year_date_when',1, 20, 5);
 		print '</td>';
 	}
 	// Extra fields
@@ -583,21 +583,24 @@ if ($resql)
 			if (! empty($arrayfields['f.nb_gen_done']['checked']))
 			{
 				print '<td align="center">';
-				print ($objp->frequency ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+				print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 				print '</td>';
 				if (! $i) $totalarray['nbfield']++;
 			}
+			// Date last generation
 			if (! empty($arrayfields['f.date_last_gen']['checked']))
 			{
 			   print '<td align="center">';
-			   print ($objp->frequency ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+			   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']))
 			{
 			   print '<td align="center">';
 			   print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+			   if ($objp->frequency > 0 && $objp->date_last_gen && $objp->date_last_gen < $now) print img_warning($langs->trans("Late"));
 			   print '</td>';
 			   if (! $i) $totalarray['nbfield']++;
 			}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index df41d1301ef..3472a710e7a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -277,7 +277,8 @@ input.select2-input {
 
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .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=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_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when] {
 	margin-right: 4px;
 }
 input[type=submit] {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 40b3fefc634..397a3c9ff3a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -290,7 +290,8 @@ textarea.cke_source:focus
 
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .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 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=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_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {

From b090f0da9c0cc2fc67cee84eedcbbe876b9a092b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 19:07:58 +0100
Subject: [PATCH 239/386] Fix warning

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

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index fe4a8a5c7cd..0966807facd 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -600,7 +600,7 @@ if ($resql)
 			{
 			   print '<td align="center">';
 			   print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-			   if ($objp->frequency > 0 && $objp->date_last_gen && $objp->date_last_gen < $now) print img_warning($langs->trans("Late"));
+			   if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
 			   print '</td>';
 			   if (! $i) $totalarray['nbfield']++;
 			}

From 98b2b2980374442d0a3a6ae24f4db2d2e7dd53e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 19:37:29 +0100
Subject: [PATCH 240/386] Fix trans

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index ca21a40635a..ba28d019958 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -355,7 +355,7 @@ if ($num > 0)
 		print '<td>';
 		if (! empty($obj->label))
 		{
-			$object->ref = $obj->label;
+			$object->ref = $langs->trans($obj->label);
 			print $object->getNomUrl(0, '', 1);
 			$object->ref = $obj->rowid;
 		}

From 7ea770764333b9a0e9e33e060f8f3137e5c39f81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 19:53:03 +0100
Subject: [PATCH 241/386] NEW Can sort on priority in task scheduler list

---
 htdocs/cron/list.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index ba28d019958..9cdc59968a7 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -138,7 +138,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     		$action='';
     	}
 
-    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-2');		// Make a redirect to avoid to run twice the job when using back
+    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-2&restore_lastsearch_values=1');		// Make a redirect to avoid to run twice the job when using back
     	exit;
     }
 }
@@ -301,6 +301,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" align="center">';
 print $form->selectarray('status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $status, 1);
 print '</td><td class="liste_titre" align="right">';
@@ -312,6 +313,7 @@ print '</tr>';
 print '<tr class="liste_titre">';
 print_liste_field_titre("ID",$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronLabel",$_SERVER["PHP_SELF"],"t.label","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre("Prority",$_SERVER["PHP_SELF"],"t.priority","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronTask",'','',"",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronFrequency",'',"","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronDtStart",$_SERVER["PHP_SELF"],"t.datestart","",$param,'align="center"',$sortfield,$sortorder);
@@ -345,13 +347,16 @@ if ($num > 0)
 		$object->id = $obj->rowid;
 		$object->ref = $obj->rowid;
 		$object->label = $obj->label;
+		$object->priority = $obj->priority;
 
 		print '<tr class="oddeven">';
 
+		// Ref
 		print '<td class="nowrap">';
 		print $object->getNomUrl(1);
 		print '</td>';
 
+		// Label
 		print '<td>';
 		if (! empty($obj->label))
 		{
@@ -365,6 +370,11 @@ if ($num > 0)
 		}
 		print '</td>';
 
+		// Priority
+		print '<td class="right">';
+		print $object->priority;
+		print '</td>';
+
 		print '<td>';
 		if ($obj->jobtype=='method')
 		{
@@ -445,7 +455,7 @@ if ($num > 0)
 		}
 		if ($user->rights->cron->execute)
 		{
-		    if (!empty($obj->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=execute".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."</a>";
+		    if (!empty($obj->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=execute&save_lastsearch_values=1".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."</a>";
 		    else print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"playdisabled")."</a>";
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"playdisabled")."</a>";

From 520884c17622834cef3a77743728343e70724dda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 20:04:29 +0100
Subject: [PATCH 242/386] Look and feel v7

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 9cdc59968a7..6323987705e 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -48,8 +48,8 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.status';
-if (! $sortorder) $sortorder='ASC';
+if (! $sortfield) $sortfield='t.status,t.priority';
+if (! $sortorder) $sortorder='DESC,ASC';
 
 $status=GETPOST('status','int');
 if ($status == '') $status=-2;
@@ -245,7 +245,8 @@ if ($action == 'delete')
 }
 if ($action == 'execute')
 {
-    print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status.'&securitykey='.$securitykey, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
+	var_dump($param);
+    print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status.'&securitykey='.$securitykey.'&restore_lastsearch_values=1', $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
 }
 
 
@@ -324,7 +325,7 @@ print_liste_field_titre("CronDtLastLaunch",$_SERVER["PHP_SELF"],"t.datelastrun",
 print_liste_field_titre("CronLastResult",$_SERVER["PHP_SELF"],"t.lastresult","",$param,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre("CronLastOutput",$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronDtNextLaunch",$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status,t.priority","",$param,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre('');
 print "</tr>\n";
 
@@ -347,6 +348,7 @@ if ($num > 0)
 		$object->id = $obj->rowid;
 		$object->ref = $obj->rowid;
 		$object->label = $obj->label;
+		$object->status = $obj->status;
 		$object->priority = $obj->priority;
 
 		print '<tr class="oddeven">';
@@ -437,9 +439,7 @@ if ($num > 0)
 
 		// Status
 		print '<td align="center">';
-		if ($obj->status == 1) print $langs->trans("Enabled");
-		elseif ($obj->status == 2) print $langs->trans("Archived");
-		else print $langs->trans("Disabled");
+		print $object->getLibStatut(3);
 		print '</td>';
 
 		print '<td align="right" class="nowrap">';

From aff4e2a9ce9a72fe8d41db927b1e2d76741a5973 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 20:16:20 +0100
Subject: [PATCH 243/386] Fix sort and filter kept after a job is ran

---
 htdocs/cron/list.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 6323987705e..f3db35737e4 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -138,7 +138,15 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     		$action='';
     	}
 
-    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-2&restore_lastsearch_values=1');		// Make a redirect to avoid to run twice the job when using back
+    	$param='&status='.$status;
+    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+    	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    	if ($search_label)	  $param.='&search_label='.$search_label;
+    	if ($optioncss != '') $param.='&optioncss='.$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;
     }
 }
@@ -241,12 +249,11 @@ $stringcurrentdate = $langs->trans("CurrentHour").': '.dol_print_date(dol_now(),
 
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
+	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.$param,$langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
 }
 if ($action == 'execute')
 {
-	var_dump($param);
-    print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status.'&securitykey='.$securitykey.'&restore_lastsearch_values=1', $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
+	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
 }
 
 
@@ -455,7 +462,7 @@ if ($num > 0)
 		}
 		if ($user->rights->cron->execute)
 		{
-		    if (!empty($obj->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=execute&save_lastsearch_values=1".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."</a>";
+		    if (!empty($obj->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=execute".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."</a>";
 		    else print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"playdisabled")."</a>";
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"playdisabled")."</a>";

From f3c9d38f8217d89c80dbcfb6335ce17810a83a95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 20:23:55 +0100
Subject: [PATCH 244/386] FIX invoice creation fails when next date not defined

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

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 7a08cc6c97e..f45a0a46ede 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1006,7 +1006,7 @@ class FactureRec extends CommonInvoice
 
 			    $facture->type = self::TYPE_STANDARD;
 			    $facture->brouillon = 1;
-			    $facture->date = $facturerec->date_when;	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
+			    $facture->date = (empty($facturerec->date_when)?$now:$facturerec->date_when);	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
 			    $facture->socid = $facturerec->socid;
 
 			    $invoiceidgenerated = $facture->create($user);

From bbef8b0ce681a222b9d833d554478abf065ef259 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 21:33:17 +0100
Subject: [PATCH 245/386] Memory optimization

---
 htdocs/contrat/class/contrat.class.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 02868eb369c..f1b0c5cdfb9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1835,7 +1835,6 @@ class Contrat extends CommonObject
 		}
 		if ($mode == 4 || $mode == 6 || $mode == 7)
 		{
-			$line=new ContratLigne($this->db);
 			$text='';
 			if ($mode == 4)
 			{
@@ -1846,13 +1845,13 @@ class Contrat extends CommonObject
 				$text.='</span>';
 			}
 			$text.=($mode == 7?'<div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.$line->LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.$line->LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.$line->LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.$line->LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
+			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
 			$text.=($mode == 7?'</div>':'');
 			return $text;
 		}
@@ -2544,7 +2543,7 @@ class ContratLigne extends CommonObjectLine
 	 *  @param	string	$moreatt	More attribute
 	 *  @return string      		Libelle
 	 */
-	function LibStatut($statut,$mode,$expired=-1,$moreatt='')
+	static function LibStatut($statut,$mode,$expired=-1,$moreatt='')
 	{
 		global $langs;
 		$langs->load("contracts");

From 575fc9f90dc22d3fb61cf9ff9478823d2085aae4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 22:06:21 +0100
Subject: [PATCH 246/386] NEW add hook moreHtmlStatus to complete to status on
 banners

---
 htdocs/core/class/hookmanager.class.php | 1 +
 htdocs/core/class/html.form.class.php   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 1a19e313e08..8b8ae3651df 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -154,6 +154,7 @@ class HookManager
 			    'getIdProfUrl',
 			    'getDirList',
 				'moveUploadedFile',
+				'moreHtmlStatus',
 			    'pdf_build_address',
 				'pdf_writelinedesc',
 			    'pdf_getlinenum',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ba0ea7a37c2..df26e44e080 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6285,6 +6285,11 @@ class Form
 		{
 			$ret.='</ul></div>';
 		}
+
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('moreHtmlStatus',$parameters, $object);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) $morehtmlstatus.=$hookmanager->resPrint;
+		else $morehtmlstatus=$hookmanager->resPrint;
 		if ($morehtmlstatus) $ret.='<div class="statusref">'.$morehtmlstatus.'</div>';
 
 		// Left part of banner

From c8e6a8c0148831149d688d1ad9658ba5d8a4b560 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2018 22:17:42 +0100
Subject: [PATCH 247/386] Fix look and feel v7

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

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 1ad4612d879..6c812b90c12 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -107,7 +107,7 @@ if ($socid > 0)
 	print '<input type="hidden" name="action" value="setremise">';
     print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), 0, 'company');
+	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');
 
     dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
 
@@ -125,7 +125,7 @@ if ($socid > 0)
 	print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
 
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
 
 	// New value
@@ -197,7 +197,7 @@ if ($socid > 0)
 		else
 		{
 		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}		
+		}
 		$db->free($resql);
 		print "</table>";
 	}

From 75735835647559fe1e29792030af0731f5275a3c Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Wed, 28 Feb 2018 11:24:00 +0100
Subject: [PATCH 248/386] Wrong var name

---
 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 27b70e1b8cf..5ff1b133d20 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1272,7 +1272,7 @@ if ($action == 'create')
 						print '<td align="center">';
 						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty=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.'">';
 						}

From 5ef00d200fe83f98e57b7fd9fb990c7af75878fc Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 28 Feb 2018 12:26:05 +0000
Subject: [PATCH 249/386] Added idprof1 check to country PT

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f5c0f004794..9cf14b4bc9d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2876,6 +2876,29 @@ class Societe extends CommonObject
 			return -4;
 		}
 
+		//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')
+		{
+			$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;
+			}
+			else {
+				return -1;
+			}
+
+			//Wrong format
+			return 0;
+		}
+
 		return $ok;
 	}
 

From 9eb922826880c03a3632ab49059c7ebb60bdd7f4 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 28 Feb 2018 12:51:29 +0000
Subject: [PATCH 250/386] Added idprof url for country PT

---
 htdocs/societe/class/societe.class.php | 35 ++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9cf14b4bc9d..9aa872fb064 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2920,20 +2920,35 @@ class Societe extends CommonObject
 		$hookmanager->initHooks(array('idprofurl'));
 		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
 		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+		if (empty($reshook)) {
+			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+				return '';
+			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
-			//if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+				$url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+			}
+			/*
+			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
+				$url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
+			}
+			*/
+			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+			}
+			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			}
+			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
+				$url='http://www.nif.pt/'.$thirdparty->idprof1.'/';
+			}
 
-			if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+			if ($url) {
+				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+			}
 		}
-		else
-		{
+		else {
 			return $hookmanager->resPrint;
 		}
 

From e2c7585ae76ee0b5c122b5750850618b131be6b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 14:36:22 +0100
Subject: [PATCH 251/386] NEW Support alternative aliases of page name in
 website

---
 htdocs/core/lib/website.lib.php               | 93 +++++++++++++++----
 .../install/mysql/migration/7.0.0-8.0.0.sql   |  1 +
 .../install/mysql/tables/llx_website_page.sql |  1 +
 htdocs/langs/en_US/website.lang               |  2 +
 htdocs/website/class/website.class.php        | 12 +--
 htdocs/website/class/websitepage.class.php    | 29 ++++--
 htdocs/website/index.php                      | 86 +++++++++--------
 7 files changed, 152 insertions(+), 72 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index b4c542edf9c..82e9a98d43f 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -165,47 +165,70 @@ function dolWebsiteSaveContent($content)
 
 
 /**
- * Make a redirect to another container
+ * Make a redirect to another container.
  *
- * @param 	string	$containeralias		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
+ * @param 	string	$containerref		Ref of container to redirect to (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php').
+ * @param 	string	$containeraliasalt	Ref of alternative aliases to redirect to.
+ * @param 	int		$containerid		Id of container.
  * @return  void
  */
-function redirectToContainer($containeralias)
+function redirectToContainer($containerref, $containeraliasalt='',$containerid=0)
 {
 	global $db, $website;
 
 	$newurl = '';
 
+	// We make redirect using the alternative alias, we must find the real $containerref
+	if ($containeraliasalt)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+		$tmpwebsitepage=new WebsitePage($db);
+		$result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
+		if ($result > 0)
+		{
+			$containerref = $tmpwebsitepage->pageurl;
+		}
+		else
+		{
+			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
+			exit;
+		}
+	}
+
 	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
 	{
 		// Check new container exists
-		$tmpwebsitepage=new WebsitePage($db);
-		$result = $tmpwebsitepage->fetch(0, $website->id, $containeralias);
-		unset($tmpwebsitepage);
+		if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
+		{
+			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+			$tmpwebsitepage=new WebsitePage($db);
+			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
+			unset($tmpwebsitepage);
+		}
 		if ($result > 0)
 		{
 			$currenturi = $_SERVER["REQUEST_URI"];
 			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
 			{
-				if ($regtmp[0] == $containeralias)
+				if ($regtmp[0] == $containerref)
 				{
-					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containeralias."' in web site '".$website->ref."'";
+					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
 				}
 				else
 				{
-					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containeralias, $currenturi);
+					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
 			}
 			else
 			{
-				$newurl = $currenturi.'&pageref='.urlencode($containeralias);
+				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
 	}
 	else								// When page called from virtual host server
 	{
-		$newurl = '/'.$containeralias.'.php';
+		$newurl = '/'.$containerref.'.php';
 	}
 
 	if ($newurl)
@@ -215,7 +238,7 @@ function redirectToContainer($containeralias)
 	}
 	else
 	{
-		print "Error, page contains a redirect to the alias page '".$containeralias."' that does not exists in web site '".$website->ref."'";
+		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
 	}
 }
@@ -225,10 +248,10 @@ function redirectToContainer($containeralias)
  * Clean an HTML page to report only content, so we can include it into another page.
  * It outputs content of file sanitized from html and body part.
  *
- * @param 	string	$containeralias		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
+ * @param 	string	$containerref		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
  * @return  void
  */
-function includeContainer($containeralias)
+function includeContainer($containerref)
 {
 	global $conf, $db, $langs, $mysoc, $user, $website;
 	global $includehtmlcontentopened;
@@ -236,9 +259,9 @@ function includeContainer($containeralias)
 
 	$MAXLEVEL=20;
 
-	if (! preg_match('/\.php$/i', $containeralias)) $containeralias.='.php';
+	if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
 
-	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containeralias;
+	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
 	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
 	$includehtmlcontentopened++;
@@ -261,7 +284,7 @@ function includeContainer($containeralias)
 
 	if (! $res)
 	{
-		print 'ERROR: FAILED TO INCLUDE PAGE '.$containeralias.".\n";
+		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref.".\n";
 	}
 
 	$includehtmlcontentopened--;
@@ -550,6 +573,42 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 }
 
 
+/**
+ * Save content of the index.php page
+ *
+ * @param	string		$pathofwebsite			Path of website root
+ * @param	string		$fileindex				Full path of file index.php
+ * @param	string		$filetpl				File tpl to index.php page redirect to
+ * @return	boolean								True if OK
+ */
+function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl)
+{
+	global $conf;
+
+	$result=0;
+
+	dol_mkdir($pathofwebsite);
+	dol_delete_file($fileindex);
+
+	$indexcontent = '<?php'."\n";
+	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+	$indexcontent.= '$websitekey=basename(dirname(__FILE__));'."\n";
+	$indexcontent.= "if (! defined('USEDOLIBARRSERVER')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
+	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	$indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+	$indexcontent.= "}\n";
+	$indexcontent.= "include_once './".basename($filetpl)."'\n";
+	$indexcontent.= '// END PHP ?>'."\n";
+	$result = file_put_contents($fileindex, $indexcontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+
+	return $result;
+}
+
+
 /**
  * Save content of a page on disk
  *
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 79148c6887d..2acaae0aadb 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
@@ -58,4 +58,5 @@ insert into llx_c_type_container (code,label,module,active) values ('other',
 
 ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_expensereport;
 
+ALTER TABLE llx_website_page ADD COLUMN aliasalt varchar(255) after pageurl;
 
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page.sql
index 5393177a3bb..7cb9705bcba 100644
--- a/htdocs/install/mysql/tables/llx_website_page.sql
+++ b/htdocs/install/mysql/tables/llx_website_page.sql
@@ -22,6 +22,7 @@ CREATE TABLE llx_website_page
 	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
 	fk_website    integer NOT NULL,
 	pageurl       varchar(255) NOT NULL,
+	aliasalt      varchar(255),
 	title         varchar(255),						
 	description   varchar(255),						
 	keywords      varchar(255),
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index a4c7d9e0211..2da76863d41 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -6,6 +6,7 @@ ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its page
 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_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)
@@ -36,6 +37,7 @@ SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+YouCanAlsoTestWithPHPS=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>
 CheckVirtualHostPerms=Check also that virtual host has <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read permission
 WritePerm=Write permission
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 432851b4bd4..3574c95e470 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -612,17 +612,11 @@ class Website extends CommonObject
 
 		    if (! $error)
 		    {
-		        dol_delete_file($fileindex);
-
 		    	$filetpl=$pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
 
-		    	$indexcontent = '<?php'."\n";
-		        $indexcontent.= '// File generated to provide a shortcut to the Home Page - DO NOT MODIFY - It is just an include.'."\n";
-		        $indexcontent.= "include_once './".basename($filetpl)."'\n";
-		        $indexcontent.= '?>'."\n";
-		        $result = file_put_contents($fileindex, $indexcontent);
-		        if (! empty($conf->global->MAIN_UMASK))
-		            @chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+		    	// Generate the index.php page to be the home page
+		    	//-------------------------------------------------
+		    	$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl);
 		    }
 		}
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index f4848c70c91..c0b6aaa7ab9 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -53,6 +53,7 @@ class WebsitePage extends CommonObject
 
 	public $fk_website;
 	public $pageurl;
+	public $aliasalt;
 	public $type_container;
 	public $title;
 	public $description;
@@ -71,8 +72,9 @@ class WebsitePage extends CommonObject
      */
 	public $fields=array(
 	    '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'=>'Alias of page'),
-		'type_container' =>array('type'=>'varchar(16)',  'label'=>'Type',             'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'index'=>0, 'position'=>11, 'comment'=>'Type of container'),
+		'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),
 	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description',      'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1),
 	    'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords',         'enabled'=>1, 'visible'=>1,  'position'=>45,  'searchall'=>0),
@@ -115,6 +117,7 @@ class WebsitePage extends CommonObject
 	{
 		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
 		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
+		if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).',';	// content in database must be ',xxx,...,yyy,'
 
 		return $this->createCommon($user, $notrigger);
 	}
@@ -122,13 +125,14 @@ class WebsitePage extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id           Id object. If this is 0, the value into $page will be used. If not found of $page not defined, the default page of website_id will be used or the first page found if not set.
-	 * @param string $website_id   Web site id (page name must also be filled if this parameter is used)
-	 * @param string $page         Page name (website id must also be filled if this parameter is used)
+	 * @param int		$id         	Id object. If this is 0, the value into $page will be used. If not found of $page not defined, the default page of website_id will be used or the first page found if not set.
+	 * @param string	$website_id 	Web site id (page name must also be filled if this parameter is used)
+	 * @param string	$page       	Page name (website id must also be filled if this parameter is used)
+	 * @param string	$aliasalt		Alternative alias to search page (slow)
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $website_id = null, $page = null)
+	public function fetch($id, $website_id = null, $page = null, $aliasalt = null)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -137,6 +141,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_website,";
 		$sql .= ' t.type_container,';
 		$sql .= " t.pageurl,";
+		$sql .= " t.aliasalt,";
 		$sql .= " t.title,";
 		$sql .= " t.description,";
 		$sql .= " t.keywords,";
@@ -159,7 +164,8 @@ class WebsitePage extends CommonObject
 		{
 			if (null !== $website_id) {
 			    $sql .= " AND t.fk_website = '" . $this->db->escape($website_id) . "'";
-			    if ($page) $sql .= " AND t.pageurl = '" . $this->db->escape($page) . "'";
+			    if ($page)		$sql .= " AND t.pageurl = '" . $this->db->escape($page) . "'";
+			    if ($aliasalt)	$sql .= " AND t.aliasalt LIKE '%," . $this->db->escape($aliasalt) . ",%'";
 			}
 		}
         $sql .= $this->db->plimit(1);
@@ -175,6 +181,7 @@ class WebsitePage extends CommonObject
 				$this->fk_website = $obj->fk_website;
 				$this->type_container = $obj->type_container;
 				$this->pageurl = $obj->pageurl;
+				$this->aliasalt = preg_replace('/,+$/', '', preg_replace('/^,+/', '', $obj->aliasalt));
 				$this->title = $obj->title;
 				$this->description = $obj->description;
 				$this->keywords = $obj->keywords;
@@ -225,6 +232,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_website,";
 		$sql .= " t.type_container,";
 		$sql .= " t.pageurl,";
+		$sql .= " t.aliasalt,";
 		$sql .= " t.title,";
 		$sql .= " t.description,";
 		$sql .= " t.keywords,";
@@ -272,6 +280,7 @@ class WebsitePage extends CommonObject
 				$record->fk_website = $obj->fk_website;
 				$record->type_container = $obj->type_container;
 				$record->pageurl = $obj->pageurl;
+				$record->aliasalt = preg_replace('/,+$/', '', preg_replace('/^,+/', '', $obj->aliasalt));
 				$record->title = $obj->title;
 				$record->description = $obj->description;
 				$record->keywords = $obj->keywords;
@@ -306,6 +315,10 @@ class WebsitePage extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
+		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
+		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
+		if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).',';	// content in database must be ',xxx,...,yyy,'
+
 		return $this->updateCommon($user, $notrigger);
 	}
 
@@ -371,6 +384,7 @@ class WebsitePage extends CommonObject
 		// Clear fields
 		$object->ref = $newref;
 		$object->pageurl = $newref;
+		$object->aliasalt = '';
 		$object->title = $langs->trans("CopyOf").' '.$object->title;
 		if (! empty($newlang)) $object->lang=$newlang;
 		if ($istranslation) $object->fk_page = $fromid;
@@ -510,6 +524,7 @@ class WebsitePage extends CommonObject
 		$this->fk_website = '';
 		$this->type_container = 'page';
 		$this->pageurl = 'specimen';
+		$this->aliasalt = 'specimenalt';
 		$this->title = 'My Page';
 		$this->description = 'This is my page';
 		$this->keywords = 'keyword1, keyword2';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 084ef28c2d0..6cd9705ae21 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -35,9 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
-$langs->load("admin");
-$langs->load("other");
-$langs->load("website");
+$langs->loadLangs(array("admin","other","website"));
 
 if (! $user->admin) accessforbidden();
 
@@ -60,18 +58,18 @@ $type_container=GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
 $section_dir = GETPOST('section_dir', 'alpha');
 $file_manager = GETPOST('file_manager', 'alpha');
 
-if (GETPOST('delete')) { $action='delete'; }
-if (GETPOST('preview')) $action='preview';
-if (GETPOST('createsite')) { $action='createsite'; }
-if (GETPOST('createcontainer')) { $action='createcontainer'; }
-if (GETPOST('editcss')) { $action='editcss'; }
-if (GETPOST('editmenu')) { $action='editmenu'; }
-if (GETPOST('setashome')) { $action='setashome'; }
-if (GETPOST('editmeta')) { $action='editmeta'; }
-if (GETPOST('editsource')) { $action='editsource'; }
-if (GETPOST('editcontent')) { $action='editcontent'; }
-if (GETPOST('createfromclone')) { $action='createfromclone'; }
-if (GETPOST('createpagefromclone')) { $action='createpagefromclone'; }
+if (GETPOST('delete','alpha')) { $action='delete'; }
+if (GETPOST('preview','alpha')) $action='preview';
+if (GETPOST('createsite','alpha')) { $action='createsite'; }
+if (GETPOST('createcontainer','alpha')) { $action='createcontainer'; }
+if (GETPOST('editcss','alpha')) { $action='editcss'; }
+if (GETPOST('editmenu','alpha')) { $action='editmenu'; }
+if (GETPOST('setashome','alpha')) { $action='setashome'; }
+if (GETPOST('editmeta','alpha')) { $action='editmeta'; }
+if (GETPOST('editsource','alpha')) { $action='editsource'; }
+if (GETPOST('editcontent','alpha')) { $action='editcontent'; }
+if (GETPOST('createfromclone','alpha')) { $action='createfromclone'; }
+if (GETPOST('createpagefromclone','alpha')) { $action='createpagefromclone'; }
 if (empty($action) && $file_manager) $action='file_manager';
 
 // Load variable for pagination
@@ -331,6 +329,9 @@ if ($action == 'addcontainer')
 	   				$objectpage->pageurl=$tmpdomain.'-home';
 	   			}
 
+	   			$objectpage->aliasalt = '';
+	   			if (preg_match('/^(\d+)\-/', basename($pageurl), $reg)) $objectpage->aliasalt = $reg[0];
+
 				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
 				{
 					$objectpage->title = $regtmp[1];
@@ -542,8 +543,9 @@ if ($action == 'addcontainer')
 	else
 	{
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER','alpha');
-		$objectpage->title = GETPOST('WEBSITE_TITLE','alpha');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME','alpha');
+		$objectpage->aliasalt = GETPOST('WEBSITE_ALIASALT','alpha');
+		$objectpage->title = GETPOST('WEBSITE_TITLE','alpha');
 		$objectpage->description = GETPOST('WEBSITE_DESCRIPTION','alpha');
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS','alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG','aZ09');
@@ -914,16 +916,7 @@ if ($action == 'setashome')
 
 		// Generate the index.php page to be the home page
 		//-------------------------------------------------
-		dol_mkdir($pathofwebsite);
-		dol_delete_file($fileindex);
-
-		$indexcontent = '<?php'."\n";
-		$indexcontent.= '// File generated to provide a shortcut to the Home Page - DO NOT MODIFY - It is just an include.'."\n";
-		$indexcontent.= "include_once './".basename($filetpl)."'\n";
-		$indexcontent.= '?>'."\n";
-		$result = file_put_contents($fileindex, $indexcontent);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl);
 
 		if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
 		else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
@@ -967,6 +960,7 @@ if ($action == 'updatemeta')
 
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
+		$objectpage->aliasalt = GETPOST('WEBSITE_ALIASALT', 'alpha');
 		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alpha');
 		$objectpage->description = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
@@ -1273,7 +1267,7 @@ $moreheadcss='';
 $moreheadjs='';
 
 $arrayofjs[]='includes/jquery/plugins/blockUI/jquery.blockUI.js';
-$arrayofjs[]='core/js/blockUI.js';	// Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
+$arrayofjs[]='core/js/blockUI.js';	// Used by ecm/tpl/enabledfiletreeajax.tpl.php
 if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 
 $moreheadjs.='<script type="text/javascript">'."\n";
@@ -1438,6 +1432,9 @@ if (count($object->records) > 0)
 		//print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
 		$htmltext =$langs->trans("SetHereVirtualHost", $dataroot);
 		$htmltext.='<br>';
+		$htmltext.='<br>';
+		$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $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);
 		print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
@@ -2000,7 +1997,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	if ($action != 'createcontainer')
 	{
-		print '<tr><td class="titlefield fieldrequired">';
+		print '<tr><td class="titlefield">';
 		print $langs->trans('IDOfPage');
 		print '</td><td>';
 		print $pageid;
@@ -2022,6 +2019,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 		$type_container=$objectpage->type_container;
 		$pageurl=$objectpage->pageurl;
+		$pagealiasalt=$objectpage->aliasalt;
 		$pagetitle=$objectpage->title;
 		$pagedescription=$objectpage->description;
 		$pagekeywords=$objectpage->keywords;
@@ -2029,29 +2027,33 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pagehtmlheader=$objectpage->htmlheader;
 	}
 	if (GETPOST('WEBSITE_PAGENAME','alpha'))    $pageurl=GETPOST('WEBSITE_PAGENAME','alpha');
+	if (GETPOST('WEBSITE_ALIASALT','alpha'))    $pagealiasalt=GETPOST('WEBSITE_ALIASALT','alpha');
 	if (GETPOST('WEBSITE_TITLE','alpha'))       $pagetitle=GETPOST('WEBSITE_TITLE','alpha');
 	if (GETPOST('WEBSITE_DESCRIPTION','alpha')) $pagedescription=GETPOST('WEBSITE_DESCRIPTION','alpha');
 	if (GETPOST('WEBSITE_KEYWORDS','alpha'))    $pagekeywords=GETPOST('WEBSITE_KEYWORDS','alpha');
 	if (GETPOST('WEBSITE_LANG','aZ09'))         $pagelang=GETPOST('WEBSITE_LANG','aZ09');
 	if (GETPOST('htmlheader','none'))			$pagehtmlheader=GETPOST('htmlheader','none');
 
+	print '<tr><td class="titlefieldcreate fieldrequired">';
+	print $langs->trans('WEBSITE_PAGENAME');
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
+	print '</td></tr>';
+
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
 	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER')?GETPOST('WEBSITE_TYPE_CONTAINER'):'page'));
 	print '</td></tr>';
 
-	print '<tr><td class="titlefield fieldrequired">';
-	print $langs->trans('WEBSITE_PAGE_EXAMPLE');
-	print '</td><td>';
-	print $formwebsite->selectSampleOfContainer('sample', (GETPOST('sample')?GETPOST('sample'):'corporatehomepage'));
-	print '</td></tr>';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">';
-	print $langs->trans('WEBSITE_PAGENAME');
-	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
-	print '</td></tr>';
+	if ($action == 'createcontainer')
+	{
+		print '<tr><td class="titlefield fieldrequired">';
+		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
+		print '</td><td>';
+		print $formwebsite->selectSampleOfContainer('sample', (GETPOST('sample')?GETPOST('sample'):'corporatehomepage'));
+		print '</td></tr>';
+	}
 
 	print '<tr><td class="fieldrequired">';
 	print $langs->trans('WEBSITE_TITLE');
@@ -2077,6 +2079,12 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print $formadmin->select_language($pagelang?$pagelang:$langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
 	print '</td></tr>';
 
+	print '<tr><td class="titlefieldcreate">';
+	print $langs->trans('WEBSITE_ALIASALT');
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
+	print '</td></tr>';
+
 	print '<tr><td class="tdhtmlheader tdtop">';
 	$htmlhelp=$langs->trans("EditTheWebSiteForACommonHeader").'<br><br>';
 

From 0c4bf2340fdd2e92e6a23dd15eb6f3fcef764539 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 15:22:58 +0100
Subject: [PATCH 252/386] Fix missing primary key

---
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql | 3 +++
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 7 +++++++
 2 files changed, 10 insertions(+)

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 190e0dcf05f..e3e78d4a338 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
@@ -697,3 +697,6 @@ create table llx_facture_rec_extrafields
 
 
 ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (fk_object);
+
+-- VMYSQL4.1 ALTER TABLE llx_product_association ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY;
+
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 2acaae0aadb..34711051d8e 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
@@ -27,6 +27,13 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+
+-- Forgot in 7.0
+
+-- VMYSQL4.1 ALTER TABLE llx_product_association ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY;
+
+
+
 -- For 8.0
 
 ALTER TABLE llx_product_fournisseur_price DROP COLUMN unitcharges;

From 5ef7bee030ba0b50ccefdefcd4bb851b5d8f0533 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 15:27:21 +0100
Subject: [PATCH 253/386] Use combo for selection of categories into virtual
 product edition

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

diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 79120aa1191..317e142ab46 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -511,7 +511,8 @@ if ($id > 0 || ! empty($ref))
 			{
 				require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 				print '<div class="inline-block">'.$langs->trans("CategoryFilter").': ';
-				print $form->select_all_categories(Categorie::TYPE_PRODUCT, $parent).' &nbsp; </div>';
+				print $form->select_all_categories(Categorie::TYPE_PRODUCT, $parent, 'parent').' &nbsp; </div>';
+				print ajax_combobox('parent');
 			}
 			print '<div class="inline-block">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Search").'">';

From 3c903675f2b3caa30aabdd921a59492f87790527 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 15:29:52 +0100
Subject: [PATCH 254/386] Fix colspan

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

diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 317e142ab46..3dc10ec8f32 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -473,7 +473,7 @@ if ($id > 0 || ! empty($ref))
 			}
 			else
 			{
-				$colspan=6;
+				$colspan=8;
 				if (! empty($conf->stock->enabled)) $colspan++;
 
 				print '<tr class="impair">';

From 97f7de9d3a24fa9bdb87c11b34754983dceb3e22 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 28 Feb 2018 14:36:49 +0000
Subject: [PATCH 255/386] Fixed GB check url

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9aa872fb064..48c35c7143e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2929,11 +2929,9 @@ class Societe extends CommonObject
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
 				$url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
 			}
-			/*
 			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-				$url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
+				$url='https://beta.companieshouse.gov.uk/company/'.$thirdparty->idprof1;
 			}
-			*/
 			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
 				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
 			}
@@ -2941,7 +2939,7 @@ class Societe extends CommonObject
 				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-				$url='http://www.nif.pt/'.$thirdparty->idprof1.'/';
+				$url='http://www.nif.pt/'.$thirdparty->idprof1;
 			}
 
 			if ($url) {

From 09385574955c56268a1830164f8b87a8046fbd26 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 28 Feb 2018 15:55:24 +0000
Subject: [PATCH 256/386] Added profid validation dictionnary tables

---
 .../mysql/data/llx_c_profid_validate.sql      | 31 +++++++++++++++++++
 .../tables/llx_c_profid_validate.key.sql      | 21 +++++++++++++
 .../mysql/tables/llx_c_profid_validate.sql    | 29 +++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 htdocs/install/mysql/data/llx_c_profid_validate.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_profid_validate.sql

diff --git a/htdocs/install/mysql/data/llx_c_profid_validate.sql b/htdocs/install/mysql/data/llx_c_profid_validate.sql
new file mode 100644
index 00000000000..f9a92ff27e8
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_profid_validate.sql
@@ -0,0 +1,31 @@
+-- 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@capnetworks.com>
+-- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2011 	   Juanjo Menent        <jmenent@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/>.
+
+--
+-- ProfId Validation URL (country code - profid number - validation url)
+--
+
+INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'FR', 1, 'http://www.societe.com/cgi-bin/search?champs=', '', 1);
+INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'GB', 1, 'https://beta.companieshouse.gov.uk/company/', '', 1);
+INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'ES', 1, 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/', '', 1);
+INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'IN', 1, 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber=', ';&searchBy=TIN&backPage=searchByTin_Inter.jsp', 1);
+INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'PT', 1, 'http://www.nif.pt/', '', 1);
diff --git a/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql b/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
new file mode 100644
index 00000000000..0aac3c7a3e8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
@@ -0,0 +1,21 @@
+-- ========================================================================
+-- Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2018 Rui Strecht         <rui.strecht@aliartalentos.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/>.
+--
+-- ========================================================================
+
+
+ALTER TABLE llx_c_profid_validate ADD CONSTRAINT uk_profid_validate_fieldnumber_country UNIQUE (country_code, profid_field_number);
diff --git a/htdocs/install/mysql/tables/llx_c_profid_validate.sql b/htdocs/install/mysql/tables/llx_c_profid_validate.sql
new file mode 100644
index 00000000000..8ee14c03e5f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_profid_validate.sql
@@ -0,0 +1,29 @@
+-- ========================================================================
+-- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2018 Rui Strecht         <rui.strecht@aliartalentos.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/>.
+--
+-- ========================================================================
+
+create table llx_c_profid_validate
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  country_code          varchar(2) NOT NULL,
+  profid_field_number   int(1) DEFAULT 1 NOT NULL,
+  validation_url_prefix varchar(255) DEFAULT NOT NULL,
+  validation_url_suffix varchar(255) DEFAULT NULL,
+  active                tinyint DEFAULT 1 NOT NULL
+)ENGINE=innodb;
+

From 3b268b143635366ce8cdbc0324938fa9ca2c2be5 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 28 Feb 2018 16:27:56 +0000
Subject: [PATCH 257/386] Revert "Added profid validation dictionnary tables"

This reverts commit 09385574955c56268a1830164f8b87a8046fbd26.
---
 .../mysql/data/llx_c_profid_validate.sql      | 31 -------------------
 .../tables/llx_c_profid_validate.key.sql      | 21 -------------
 .../mysql/tables/llx_c_profid_validate.sql    | 29 -----------------
 3 files changed, 81 deletions(-)
 delete mode 100644 htdocs/install/mysql/data/llx_c_profid_validate.sql
 delete mode 100644 htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
 delete mode 100644 htdocs/install/mysql/tables/llx_c_profid_validate.sql

diff --git a/htdocs/install/mysql/data/llx_c_profid_validate.sql b/htdocs/install/mysql/data/llx_c_profid_validate.sql
deleted file mode 100644
index f9a92ff27e8..00000000000
--- a/htdocs/install/mysql/data/llx_c_profid_validate.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- 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@capnetworks.com>
--- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2011 	   Juanjo Menent        <jmenent@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/>.
-
---
--- ProfId Validation URL (country code - profid number - validation url)
---
-
-INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'FR', 1, 'http://www.societe.com/cgi-bin/search?champs=', '', 1);
-INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'GB', 1, 'https://beta.companieshouse.gov.uk/company/', '', 1);
-INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'ES', 1, 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/', '', 1);
-INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'IN', 1, 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber=', ';&searchBy=TIN&backPage=searchByTin_Inter.jsp', 1);
-INSERT INTO llx_c_profid_validate ( country_code, profid_field_number, validation_url_prefix, validation_url_suffix, active ) VALUES ( 'PT', 1, 'http://www.nif.pt/', '', 1);
diff --git a/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql b/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
deleted file mode 100644
index 0aac3c7a3e8..00000000000
--- a/htdocs/install/mysql/tables/llx_c_profid_validate.key.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- ========================================================================
--- Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2018 Rui Strecht         <rui.strecht@aliartalentos.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/>.
---
--- ========================================================================
-
-
-ALTER TABLE llx_c_profid_validate ADD CONSTRAINT uk_profid_validate_fieldnumber_country UNIQUE (country_code, profid_field_number);
diff --git a/htdocs/install/mysql/tables/llx_c_profid_validate.sql b/htdocs/install/mysql/tables/llx_c_profid_validate.sql
deleted file mode 100644
index 8ee14c03e5f..00000000000
--- a/htdocs/install/mysql/tables/llx_c_profid_validate.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- ========================================================================
--- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
--- Copyright (C) 2018 Rui Strecht         <rui.strecht@aliartalentos.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/>.
---
--- ========================================================================
-
-create table llx_c_profid_validate
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  country_code          varchar(2) NOT NULL,
-  profid_field_number   int(1) DEFAULT 1 NOT NULL,
-  validation_url_prefix varchar(255) DEFAULT NOT NULL,
-  validation_url_suffix varchar(255) DEFAULT NULL,
-  active                tinyint DEFAULT 1 NOT NULL
-)ENGINE=innodb;
-

From de9f1aab0fff62970dcff068afd7c3fe970bd0e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 19:09:05 +0100
Subject: [PATCH 258/386] NEW Can set the reply-to into email sent

---
 htdocs/core/class/CMailFile.class.php | 32 ++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index e19892e9a58..4a9a49c1484 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -109,13 +109,16 @@ class CMailFile
 	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
 	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
 	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
+	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
 	 */
-	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendcontext='standard')
+	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendcontext='standard',$replyto='')
 	{
 		global $conf, $dolibarr_main_data_root;
 
 		$this->sendcontext = $sendcontext;
 
+		if (empty($replyto)) $replyto=$from;
+
 		// Define this->sendmode
 		$this->sendmode = '';
 		if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
@@ -234,7 +237,7 @@ class CMailFile
 			// Define smtp_headers
 			$this->subject = $subject;
 			$this->addr_from = $from;
-			$this->reply_to = $from;         // Set this property after constructor if you want to use another value
+			$this->reply_to = $replyto;
 			$this->errors_to = $errors_to;
 			$this->addr_to = $to;
 			$this->addr_cc = $addr_cc;
@@ -293,7 +296,7 @@ class CMailFile
 			$smtps->setTO($this->getValidAddress($to,0,1));
 			$smtps->setFrom($this->getValidAddress($from,0,1));
 			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($from,0,1));   // Set property with this->smtps->setReplyTo after constructor if you want to use another value than the From
+			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
 
 			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
 
@@ -348,7 +351,7 @@ class CMailFile
 			$this->phpmailer->Subject($this->encodetorfc2822($subject));
 			$this->phpmailer->setTO($this->getValidAddress($to,0,1));
 			$this->phpmailer->SetFrom($this->getValidAddress($from,0,1));
-			$this->phpmailer->SetReplyTo($this->getValidAddress($from,0,1));   // Set property with this->phpmailer->setReplyTo after constructor if you want to use another value than the From
+			$this->phpmailer->SetReplyTo($this->getValidAddress($replyto,0,1));
 			// TODO Add trackid into smtp header
 			// TODO if (! empty($moreinheader)) ...
 
@@ -418,7 +421,7 @@ class CMailFile
 			// Set the To addresses with an associative array
 			if (! empty($to)) $this->message->setTo($this->getArrayAddress($to));
 
-			if (! empty($from)) $this->message->SetReplyTo($this->getArrayAddress($from));
+			if (! empty($replyto)) $this->message->SetReplyTo($this->getArrayAddress($replyto));
 
 			$this->message->setCharSet($conf->file->character_set_client);
 
@@ -563,7 +566,7 @@ class CMailFile
 				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
 				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
-			
+
 			if(!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) {
 				$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
 				$this->addr_cc = '';
@@ -590,13 +593,22 @@ class CMailFile
 				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
 				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
 
+				$res=true;
+				if ($res && ! $this->subject)
+				{
+					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+					$res=false;
+				}
 				$dest=$this->getValidAddress($this->addr_to,2);
-				if (! $dest)
+				if ($res && ! $dest)
 				{
 					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+					$res=false;
 				}
-				else
+
+				if ($res)
 				{
 					$additionnalparam = '';	// By default
 					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
@@ -689,14 +701,14 @@ class CMailFile
 
 				$res=true;
 				$from=$this->smtps->getFrom('org');
-				if (! $from)
+				if ($res && ! $from)
 				{
 					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res=false;
 				}
 				$dest=$this->smtps->getTo();
-				if (! $dest)
+				if ($res && ! $dest)
 				{
 					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);

From c2420aa5d91fc6480d810d1a1414b79e3a994e2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 19:20:02 +0100
Subject: [PATCH 259/386] Fix import alternative alias

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 6cd9705ae21..f141c6cf417 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -330,7 +330,7 @@ if ($action == 'addcontainer')
 	   			}
 
 	   			$objectpage->aliasalt = '';
-	   			if (preg_match('/^(\d+)\-/', basename($pageurl), $reg)) $objectpage->aliasalt = $reg[0];
+	   			if (preg_match('/^(\d+)\-/', basename($urltograb), $reg)) $objectpage->aliasalt = $reg[1];
 
 				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
 				{

From 82a9d1797f67e6f921294ad2b59b5e00a8507115 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 19:36:04 +0100
Subject: [PATCH 260/386] css

---
 htdocs/cron/list.php            | 6 +++---
 htdocs/theme/eldy/style.css.php | 2 +-
 htdocs/theme/md/style.css.php   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index f3db35737e4..a73ba1bdd55 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -313,8 +313,8 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="center">';
 print $form->selectarray('status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $status, 1);
 print '</td><td class="liste_titre" align="right">';
-print '<input class="liste_titre" type="image" 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")).'">';
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
@@ -449,7 +449,7 @@ if ($num > 0)
 		print $object->getLibStatut(3);
 		print '</td>';
 
-		print '<td align="right" class="nowrap">';
+		print '<td align="right" class="nowraponall">';
 		if ($user->rights->cron->create)
 		{
 			print "<a href=\"".DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."&backtourl=".urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:''))."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'),'edit')."</a> &nbsp;";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3472a710e7a..2b216b58cf2 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -598,7 +598,7 @@ textarea.centpercent {
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
-.nowraponall {
+.nowraponall {	/* no wrap on all devices */
 	white-space: nowrap;
 }
 .wordwrap {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 397a3c9ff3a..2883d1c2226 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -596,7 +596,7 @@ textarea.centpercent {
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
-.nowraponall {
+.nowraponall {	/* no wrap on all devices */
 	white-space: nowrap;
 }
 .wordwrap {

From 7d42ceab20f48473ef1e4b4a8657d36d6d83c3f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 19:50:40 +0100
Subject: [PATCH 261/386] Use normalized substitution key

---
 htdocs/langs/en_US/agenda.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 116fc189732..c7278554192 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -97,7 +97,7 @@ AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy

From f545d2a134c7f3424d1746d12be72b9ad9befd08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Feb 2018 20:06:28 +0100
Subject: [PATCH 262/386] NEW Can add filter actiontype and notactiontype on
 event ical export

---
 htdocs/admin/agenda_xcal.php                  |  5 +++--
 htdocs/comm/action/class/actioncomm.class.php |  6 ++++--
 htdocs/langs/en_US/agenda.lang                |  1 +
 htdocs/public/agenda/agendaexport.php         | 19 +++++++++++--------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 68561d4390b..ac19eb24c03 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -173,11 +173,12 @@ $message.='<br>';
 $message.='<br>';
 print $message;
 
-$message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
+$message =$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptionsNotAdmin",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
+$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptionsNotAutoEvent",'systemauto','systemauto').'<br>';
 
 print info_admin($message);
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 5f094856e1c..ed0950826b8 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1329,7 +1329,7 @@ class ActionComm extends CommonObject
      *		@param	string		$type			'event' or 'journal'
      *		@param	int			$cachedelay		Do not rebuild file if date older than cachedelay seconds
      *		@param	string		$filename		Force filename
-     *		@param	array		$filters		Array of filters
+     *		@param	array		$filters		Array of filters. Exemple array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...)
      *		@return int     					<0 if error, nb of events in new file if ok
      */
     function build_exportfile($format,$type,$cachedelay,$filename,$filters)
@@ -1410,7 +1410,9 @@ class ActionComm extends CommonObject
                 if ($key == 'idfrom')       $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
                 if ($key == 'idto')         $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
                 if ($key == 'project')      $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
-    	        // We must filter on assignement table
+                if ($key == 'actiontype')    $sql.=" AND c.type = '".$this->db->escape($value)."'";
+                if ($key == 'notactiontype') $sql.=" AND c.type <> '".$this->db->escape($value)."'";
+                // We must filter on assignement table
 				if ($key == 'logint')       $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
                 if ($key == 'logina')
                 {
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index c7278554192..0c70a160204 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -98,6 +98,7 @@ AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
 AgendaShowBirthdayEvents=Show birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 81a67204fdb..c8f7f05ff23 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -69,14 +69,16 @@ if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
 if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
 
 $filters=array();
-if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
-if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
-if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
-if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
-if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
-if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
-if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
-if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
+if (GETPOST("year",'int')) 	         $filters['year']=GETPOST("year",'int');
+if (GETPOST("id",'int'))             $filters['id']=GETPOST("id",'int');
+if (GETPOST("idfrom",'int'))         $filters['idfrom']=GETPOST("idfrom",'int');
+if (GETPOST("idto",'int'))           $filters['idto']=GETPOST("idto",'int');
+if (GETPOST("project",'apha'))       $filters['project']=GETPOST("project",'apha');
+if (GETPOST("logina",'apha'))        $filters['logina']=GETPOST("logina",'apha');
+if (GETPOST("logint",'apha'))        $filters['logint']=GETPOST("logint",'apha');
+if (GETPOST("notactiontype",'apha')) $filters['notactiontype']=GETPOST("notactiontype",'apha');
+if (GETPOST("actiontype",'apha'))    $filters['actiontype']=GETPOST("actiontype",'apha');
+if (GETPOST("notolderthan",'int'))   $filters['notolderthan']=GETPOST("notolderthan","int");
 else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 
 // Check config
@@ -116,6 +118,7 @@ foreach ($filters as $key => $value)
     if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
+	if ($key == 'notactiontype')   $filename.='-notactiontype'.$value;
 }
 // Add extension
 if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }

From 6f29a574cf8ba4bdc9e9f5a75c1a8a01e9db6950 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 02:37:18 +0100
Subject: [PATCH 263/386] CSS

---
 htdocs/comm/card.php                      |  4 +-
 htdocs/contrat/card.php                   |  6 +-
 htdocs/core/lib/product.lib.php           |  2 +-
 htdocs/core/tpl/objectline_create.tpl.php | 16 +++--
 htdocs/theme/eldy/style.css.php           | 82 ++++++++++++++---------
 htdocs/theme/md/style.css.php             | 14 ++--
 6 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index aab95264a57..4c675b2ca50 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -550,7 +550,7 @@ if ($object->id > 0)
 	}
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
+	print '<div class="underbanner clearboth"></div>';
 
 	$boxstat = '';
 
@@ -559,7 +559,7 @@ if ($object->id > 0)
 
 	// Lien recap
 	$boxstat.='<div class="box">';
-	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 
 	if (! empty($conf->propal->enabled))
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 59688aab1a3..4600baf56ed 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1527,10 +1527,10 @@ else
 		// Title line for service
 		$cursorline=1;
 		print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
-        	while ($cursorline <= $nbofservices)
+		while ($cursorline <= $nbofservices)
 		{
 			print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
-            		print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+			print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
@@ -1875,7 +1875,7 @@ else
 			// Area with status and activation info of line
 			if ($object->statut > 0)
 			{
-				print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
+				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
 
 				print '<tr '.$bcnd[$var].'>';
 				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 5542dfcf1b5..8d40f11d472 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -311,7 +311,7 @@ function show_stats_for_company($product,$socid)
 	$nblines = 0;
 
 	print '<tr class="liste_titre">';
-	print '<td align="left" class="tdtop" width="25%">'.$langs->trans("Referers").'</td>';
+	print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
 	print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
 	print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
 	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d26a31b3cd2..4174bb37382 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -131,7 +131,7 @@ if ($nolinesbefore) {
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 	$coldisplay=2;
 	?>
-	<td class="nobottom linecolnum" align="center" width="5">
+	<td class="nobottom linecolnum" align="center" width="5"></td>
 	<?php
 }
 else {
@@ -142,7 +142,7 @@ else {
 	<td class="nobottom linecoldescription minwidth500imp">
 
 	<?php
-	
+
 	$freelines = false;
 	if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
 	{
@@ -153,7 +153,7 @@ else {
 			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
 			else $forceall=0;
 		}
-	
+
 		// Free line
 		echo '<span class="prod_entry_mode_free">';
 		// Show radio free line
@@ -180,9 +180,9 @@ else {
 				echo ' ';
 			}
 		}
-	
+
 		echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
-	
+
 		echo '</span>';
 	}
 
@@ -408,6 +408,10 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 {
 	$colspan = 6;
 
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	{
+		$colspan++;
+	}
 	if ($this->situation_cycle_ref) {
 		$colspan++;
 	}
@@ -595,7 +599,7 @@ jQuery(document).ready(function() {
 		setforpredef();
 		jQuery('#trlinefordates').show();
 	});
-	
+
 	<?php
 	if(!$freelines) { ?>
 		$("#prod_entry_mode_predef").click();
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2b216b58cf2..1229f6595c1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -38,7 +38,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 // Colors
 $colorbackhmenu1='80,90,120';      // topmenu
 $colorbackvmenu1='248,248,248';      // vmenu
-$colortopbordertitle1='120,120,120';    // top border of title
+$colortopbordertitle1='200,200,200';    // top border of title
 $colorbacktitle1='230,230,233';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
@@ -102,7 +102,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:0);
-$borderwith=2;
+$borderwidth=1;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -468,9 +468,6 @@ input[name=price], input[name=weight], input[name=volume], input[name=surface],
 input[name=surface] { margin-right: 4px; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
-.trextrafieldseparator td {
-    border-bottom: 2px solid rgb(120,120,120) !important;
-}
 input#onlinepaymenturl, input#directdownloadlink {
 	opacity: 0.7;
 }
@@ -1404,8 +1401,13 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwith ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	/* border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>); */
+	border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>);
 }
+.trextrafieldseparator td {
+    border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
+}
+
 .tdhrthin {
 	margin: 0;
 	padding-bottom: 0 !important;
@@ -2256,7 +2258,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 
 	border-right: 1px solid #AAA !important;
 	border-left: 1px solid #AAA !important;
-	border-top: 2px solid rgb(<?php echo $colortopbordertitle1; ?>) !important;
+	/* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */
+	border-top: <?php echo 2; ?>px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
 }
 a.tab:hover
 {
@@ -2476,21 +2479,21 @@ td.border, div.tagtable div div.border {
 .noborderbottom {
     border-bottom: none !important;
 }
-.ficheaddleft table.noborder {
+/*.ficheaddleft table.noborder {
 	margin: 0px 0px 0px 0px;
-}
+}*/
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 
 	border-collapse: separate !important;
 	border-spacing: 0px;
 
-	border-top-width: <?php echo $borderwith ?>px;
+	border-top-width: <?php echo $borderwidth ?>px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-top-style: solid;
 
 	border-bottom-width: 1px;
-	border-bottom-color: #BBB;
+	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-bottom-style: solid;
 
 	margin: 0px 0px 5px 0px;
@@ -2510,13 +2513,19 @@ table.paddingtopbottomonly tr td {
 	background: rgb(<?php echo $colorbacktitle1; ?>) !important;
 }
 tr.liste_titre_filter td.liste_titre {
-    border-bottom: 1px solid #ddd;
+/*    border-bottom: 1px solid #ddd; */
 }
 .liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
 {
-    /*border-top-width: 1px;
+    border-top-width: 1px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
-    border-top-style: solid;*/
+    border-top-style: solid;
+}
+/*.liste_titre_create td.nobottom, tr#trlinefordates td {
+    background-color: rgb(<?php echo $colorbacktitle1; ?>) !important;
+}*/
+tr#trlinefordates td {
+    border-bottom: 0px !important;
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
@@ -2531,7 +2540,7 @@ table.liste tr, table.noborder tr, div.noborder form {
 table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.noborder tr.box_titre td {
 	padding: 7px 8px 7px 8px;			/* t r b l */
 }
-table.liste td, table.noborder td, div.noborder form div {
+table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
 	padding: 7px 8px 7px 8px;			/* t r b l */
 	line-height: 1.2em;
 }
@@ -2806,7 +2815,7 @@ div.liste_titre {
 	padding-bottom: 2px;
 }
 div.liste_titre_bydiv {
-	border-top-width: <?php echo $borderwith ?>px;
+	border-top-width: <?php echo $borderwidth ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
 
@@ -2831,7 +2840,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 {
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
-    border-bottom: 1px solid #ddd;
+/*    border-bottom: 1px solid #ddd; */
 
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>;
@@ -2839,10 +2848,11 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 }
 tr.liste_titre th, tr.liste_titre td, th.liste_titre
 {
-	border-bottom: 1px solid #888;
+	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 tr.liste_titre:first-child th, tr:first-child th.liste_titre {
-    border-bottom: 1px solid #ddd ! important;
+/*    border-bottom: 1px solid #ddd ! important; */
+	border-bottom: unset;
 }
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
 {
@@ -2855,7 +2865,7 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
 	text-shadow: none !important;
 }
 tr.liste_titre_topborder td {
-	border-top-width: <?php echo $borderwith; ?>px;
+	border-top-width: <?php echo $borderwidth; ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
 }
@@ -2870,7 +2880,8 @@ tr.liste_titre_topborder td {
 	background: transparent;
 }
 tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
-    border-bottom: 1px solid #ddd;
+    /* border-bottom: 1px solid #ddd; */
+    border-bottom: unset;
 }
 
 
@@ -2904,16 +2915,22 @@ form.liste_total div {
 tr.liste_sub_total, tr.liste_sub_total td {
 	border-bottom: 1px solid #aaa;
 }
-
+/* to avoid too much border on contract card */
 .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
 	background: #FFF;
 }
 .tableforservicepart1 tbody tr td, .tableforservicepart2 tbody tr td {
 	border-bottom: none;
 }
+table.tableforservicepart1:first-of-type tr:first-of-type td {
+    border-top: 1px solid #888;
+}
+table.tableforservicepart1 tr td {
+    border-top: 0px;
+}
 
 .paymenttable, .margintable {
-	border-top-width: <?php echo $borderwith ?>px !important;
+	border-top-width: <?php echo $borderwidth ?>px !important;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
 	border-top-style: solid !important;
 	margin: 0px 0px 0px 0px !important;
@@ -2935,13 +2952,14 @@ div.tabBar .noborder {
 }
 
 #tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
-	border-bottom: 1px solid #AAA !important;
+	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
 
 
 /* Prepare to remove class pair - impair */
 
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
+.border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre) {
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -2952,7 +2970,9 @@ div.tabBar .noborder {
 	border-bottom: 1px solid #ddd;
 }
 
-.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
+.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
+.border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre)
+{
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
@@ -2965,10 +2985,6 @@ div.tabBar .noborder {
 
 ul.noborder li:nth-child(even):not(.liste_titre) {
 	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
 }
 
 
@@ -3111,7 +3127,7 @@ a.valignmiddle.dashboardlineindicator {
 .box {
     padding-right: 0px;
     padding-left: 0px;
-    padding-bottom: 12px;
+    padding-bottom: 25px;
 }
 
 tr.box_titre {
@@ -3451,6 +3467,10 @@ div.ui-tooltip {
 /* Calendar                                                                       */
 /* ============================================================================== */
 
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active {
+    border: unset;
+}
+
 img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
 
 .ui-datepicker-trigger {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2883d1c2226..e88200f0130 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -103,7 +103,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
-$borderwith=2;
+$borderwidth=2;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -1413,7 +1413,7 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: <?php echo $borderwidth; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 .tdhrthin {
 	margin: 0;
@@ -2524,7 +2524,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-collapse: separate !important;
 	border-spacing: 0px;
 
-	border-top-width: <?php echo $borderwith ?>px;
+	border-top-width: <?php echo $borderwidth ?>px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-top-style: solid;
 
@@ -2585,7 +2585,7 @@ tr.liste_titre_filter td.liste_titre {
 table.liste th, table.noborder th, table.noborder tr.liste_titre td {
 	padding: 8px 6px 8px 6px;			/* t r b l */
 }
-table.noborder td, div.noborder form, div.noborder form div {
+table.noborder td, div.noborder form, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
 	padding: 4px 6px 4px 6px;			/* t r b l */
 }
 
@@ -2884,7 +2884,7 @@ div.liste_titre {
 	border-top-style: solid;
 }
 div.liste_titre_bydiv {
-	border-top-width: <?php echo $borderwith ?>px;
+	border-top-width: <?php echo $borderwidth ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
 
@@ -2927,7 +2927,7 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
 	text-shadow: none !important;
 }
 tr.liste_titre_topborder td {
-	border-top-width: <?php echo $borderwith; ?>px;
+	border-top-width: <?php echo $borderwidth; ?>px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
 }
@@ -2987,7 +2987,7 @@ tr.liste_sub_total, tr.liste_sub_total td {
 }
 
 .paymenttable, .margintable {
-	border-top-width: <?php echo $borderwith ?>px !important;
+	border-top-width: <?php echo $borderwidth ?>px !important;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
 	border-top-style: solid !important;
 	margin: 0px 0px 0px 0px !important;

From c190ec5a2c8de88d669bcd5e72d0bc9bdecdd8d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 02:49:44 +0100
Subject: [PATCH 264/386] Fix ref not visible in payment link

---
 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 95c366dff0d..42106c1cb13 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1089,7 +1089,7 @@ class Paiement 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 && $withpicto != 2) $result.= $this->ref;
+		if ($withpicto && $withpicto != 2) $result.= ($this->ref?$this->ref:$this->id);
 		$result .= $linkend;
 
 		return $result;

From f7fe8ce141f105d67618ab30e39c579f5ddd7c0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 02:53:47 +0100
Subject: [PATCH 265/386] Fix min decimal on amount in payment page

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 3ec17c2521d..6179fb9ac22 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -236,7 +236,7 @@ print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$objec
 print '</td></tr>';
 
 // Amount
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant,'',$langs,0,0,-1,$conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount,'',$langs,0,-1,-1,$conf->currency).'</td></tr>';
 
 // Note
 print '<tr><td class="tdtop">'.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->facture->paiement).'</td><td colspan="3">';

From 24ffce0be5393216186470e168db83be8371ec9b Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Thu, 1 Mar 2018 11:20:42 +0100
Subject: [PATCH 266/386] FIX: supplier credit notes: accounting display in
 purchases journal

---
 htdocs/accountancy/journal/purchasesjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index ec21937c8ff..698b121ea7c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -878,7 +878,7 @@ if (empty($action) || $action == 'view') {
 				else print $accountoshow;
 				print '</td>';
 				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-				print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
+				print '<td align="right">'. ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
 			//}
@@ -972,7 +972,7 @@ if (empty($action) || $action == 'view') {
 					print "<td>";
 					print '</td>';
 					print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)</td>";
-					print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
+					print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 					print "</tr>";
 				}

From 158ef79e70598d1bba59f0770cc0aa26ec5b094c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 11:51:13 +0100
Subject: [PATCH 267/386] FIX Look and feel v7

---
 .../cheque/class/remisecheque.class.php       | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 3458e6bc82a..528b01477a6 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -979,25 +979,56 @@ class RemiseCheque extends CommonObject
 	}
 
 	/**
-	 *    	Return clicable name (with picto eventually)
+	 *	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
-	 *		@return	string					Chaine avec URL
+	 *	@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
+	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$result='';
-        $label = $langs->trans("ShowCheckReceipt").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$label = '<u>'.$langs->trans("ShowCheckReceipt").'</u>';
+		$label.= '<br>';
+		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $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';
+        }
+
+        $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.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.$this->ref.$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;
 	}

From 2368cb615ff5fbdc32335f613e4f4dd2e31d41d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 11:51:25 +0100
Subject: [PATCH 268/386] Look and feel v8

---
 .../compta/facture/invoicetemplate_list.php   |  4 ++-
 htdocs/core/class/html.formfile.class.php     |  2 +-
 htdocs/core/modules/modPaypal.class.php       |  2 +-
 htdocs/core/modules/modStripe.class.php       |  2 +-
 htdocs/core/tpl/notes.tpl.php                 |  4 +--
 htdocs/langs/en_US/paypal.lang                |  3 +-
 htdocs/langs/en_US/stripe.lang                |  3 +-
 htdocs/theme/eldy/style.css.php               | 28 +++++++++++++++----
 htdocs/theme/md/style.css.php                 |  3 ++
 9 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 0966807facd..6cd80d8dff6 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -599,8 +599,10 @@ if ($resql)
 			if (! empty($arrayfields['f.date_when']['checked']))
 			{
 			   print '<td align="center">';
+			   print '<div class="nowraponall">';
 			   print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 			   if ($objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
+			   print '</div>';
 			   print '</td>';
 			   if (! $i) $totalarray['nbfield']++;
 			}
@@ -636,7 +638,7 @@ if ($resql)
 				}
 				else
 				{
-					print $langs->trans("DateIsNotEnough");
+					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
 			}
 			else
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b139483b610..aebe9005ed0 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -744,7 +744,7 @@ class FormFile
 
 					if ($delallowed || $printer || $morepicto)
 					{
-						$out.= '<td align="right">';
+						$out.= '<td class="right nowraponall">';
 						if ($delallowed)
 						{
 							$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 3ea0535bd4f..6214d0abb59 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -114,7 +114,7 @@ class modPaypal extends DolibarrModules
         'url'=>'/paypal/importpayments.php',
         'langs'=>'paypal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
         'position'=>501,
-        'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',  // 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.
+        'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // 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->banque->consolidate',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
         'target'=>'',
         'user'=>2
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 46af17cee55..fa9abbec0e5 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -100,7 +100,7 @@ class modStripe extends DolibarrModules
 	        'url'=>'/stripe/importpayments.php',
 	        'langs'=>'stripe',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 	        'position'=>500,
-	        'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',  // 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.
+	        'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // 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->banque->consolidate',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 	        'target'=>'',
 	        'user'=>2
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index f22b25c88a5..5cee06b5dae 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -78,7 +78,7 @@ print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border centpercent">'."\n";
 if ($module != 'product') {
 	// No public note yet on products
-	print '<div class="tagtr table-border-row">'."\n";
+	print '<div class="tagtr pair table-border-row">'."\n";
 	print '<div class="tagtd tdtop 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";
@@ -88,7 +88,7 @@ if ($module != 'product') {
 	print '</div>'."\n";
 }
 if (empty($user->societe_id)) {
-	print '<div class="tagtr table-border-row">'."\n";
+	print '<div class="tagtr '.($module != 'product'?'impair':'pair').' table-border-row">'."\n";
 	print '<div class="tagtd tdtop 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";
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index ae41f4df314..e1db55d5668 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -29,4 +29,5 @@ ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
\ No newline at end of file
+PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import Paypal payments
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index cb49994ea14..ff6b4a58608 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -37,4 +37,5 @@ STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
\ No newline at end of file
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
\ No newline at end of file
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1229f6595c1..60eaf6d5471 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2256,8 +2256,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	background: rgb(<?php echo $colorbacktabcard1; ?>) !important;
 	margin: 0 0.2em 0 0.2em !important;
 
-	border-right: 1px solid #AAA !important;
-	border-left: 1px solid #AAA !important;
+	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 rgb(<?php echo $colorbackhmenu1 ?>) !important;
 }
@@ -2476,7 +2476,7 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-.noborderbottom {
+.noborderbottom, .noborderbottom tr:last-of-type td {
     border-bottom: none !important;
 }
 /*.ficheaddleft table.noborder {
@@ -2491,6 +2491,9 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-top-width: <?php echo $borderwidth ?>px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-top-style: solid;
+	/* border-top-width: 2px;
+	border-top-color: rgb(<?php echo $colorbackhmenu1 ?>);
+	border-top-style: solid; */
 
 	border-bottom-width: 1px;
 	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
@@ -2499,7 +2502,12 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	margin: 0px 0px 5px 0px;
 }
 div.tabBar div.ficheaddleft table.noborder:last-of-type {
-    border-bottom: 1px solid #aaa;
+    border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+}
+div.tabBar table.border>tbody>tr:last-of-type>td {
+	border-bottom-width: 1px;
+	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom-style: solid;
 }
 div.tabBar div.ficheaddleft table.noborder {
     border-bottom: none;
@@ -2529,7 +2537,7 @@ tr#trlinefordates td {
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
-    border-top-width: 2px;
+    border-top-width: 1px;
     border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
     border-top-style: solid;
 }
@@ -2543,6 +2551,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
 table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
 	padding: 7px 8px 7px 8px;			/* t r b l */
 	line-height: 1.2em;
+	height: 22px;
 }
 div.liste_titre_bydiv .divsearchfield {
 	padding: 2px 1px 2px 7px;			/* t r b l */
@@ -2939,6 +2948,9 @@ table.tableforservicepart1 tr td {
 {
 	padding-left: 2px;
 }
+.paymenttable, .margintable tr td {
+	height: 22px;
+}
 
 /* Disable shadows */
 .noshadow {
@@ -3106,6 +3118,12 @@ span.dashboardlineko {
 .boxtable {
     margin-bottom: 8px !important;
     border-bottom-width: 1px;
+
+    border-top: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	/* border-top: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
+}
+table.noborder.boxtable tr td {
+    height: unset;
 }
 .boxtablenobottom {
     border-bottom-width: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e88200f0130..745cddfdb6e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2996,6 +2996,9 @@ tr.liste_sub_total, tr.liste_sub_total td {
 {
 	padding-left: 2px;
 }
+.paymenttable, .margintable tr td {
+	height: 22px;
+}
 
 /* Disable shadows */
 .noshadow {

From e07177fec2367c56ad60ee2980993625d81b05dd Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Thu, 1 Mar 2018 12:31:33 +0100
Subject: [PATCH 269/386] FIX: supplier relativ discounts: pre-fill newlines
 with qty/discount

---
 htdocs/core/class/html.form.class.php     |  4 ++++
 htdocs/core/tpl/objectline_create.tpl.php | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8648787bedf..16f72b2d837 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2482,6 +2482,10 @@ class Form
 				$opt = '<option value="'.$outkey.'"';
 				if ($selected && $selected == $objp->idprodfournprice) $opt.= ' selected';
 				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-pbqpercent="'.$objp->remise_percent.'"';
+				}
 				$opt.= '>';
 
 				$objRef = $objp->ref;
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 37989e92f08..501e3db3d6c 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -729,10 +729,11 @@ jQuery(document).ready(function() {
         ?>
 
         /* To process customer price per quantity */
-        var pbq = $('option:selected', this).attr('data-pbq');
-        var pbqqty = $('option:selected', this).attr('data-pbqqty');
-        var pbqpercent = $('option:selected', this).attr('data-pbqpercent');
-        if (jQuery('#idprod').val() > 0 && typeof pbq !== "undefined")
+        var pbq = parseInt($('option:selected', this).attr('data-pbq'));
+        var pbqqty = parseFloat($('option:selected', this).attr('data-pbqqty'));
+        var pbqpercent = parseFloat($('option:selected', this).attr('data-pbqpercent'));
+
+        if ((jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val()) && typeof pbq !== "undefined")
         {
             console.log("We choose a price by quanty price_by_qty id = "+pbq+" price_by_qty qty = "+pbqqty+" price_by_qty percent = "+pbqpercent);
             jQuery("#pbq").val(pbq);
@@ -786,7 +787,6 @@ function setforfree() {
 	jQuery("#tva_tx").show();
 	jQuery("#buying_price").val('').show();
 	jQuery("#fournprice_predef").hide();
-	jQuery("#title_fourn_ref").show();
 	jQuery("#title_vat").show();
 	jQuery("#title_up_ht").show();
 	jQuery("#title_up_ht_currency").show();
@@ -810,7 +810,6 @@ function setforpredef() {
 	jQuery("#fourn_ref").hide();
 	jQuery("#tva_tx").hide();
 	jQuery("#buying_price").show();
-	jQuery("#title_fourn_ref").hide();
 	jQuery("#title_vat").hide();
 	jQuery("#title_up_ht").hide();
 	jQuery("#title_up_ht_currency").hide();

From c43bcd4d2a01289c38c6f2c04fe465b780dd7659 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 12:53:40 +0100
Subject: [PATCH 270/386] Fix look and feel v7

---
 htdocs/cron/list.php | 172 ++++++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 74 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a73ba1bdd55..5c045b56243 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -29,9 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
 
-$langs->load("admin");
-$langs->load("cron");
-$langs->load("bills");
+$langs->loadLangs(array("admin","cron","bills"));
 
 if (!$user->rights->cron->read) accessforbidden();
 
@@ -51,8 +49,8 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='t.status,t.priority';
 if (! $sortorder) $sortorder='DESC,ASC';
 
-$status=GETPOST('status','int');
-if ($status == '') $status=-2;
+$search_status=GETPOST('search_status','int')?GETPOST('search_status','int'):GETPOST('status','int');
+if ($search_status == '') $search_status=-2;
 
 //Search criteria
 $search_label=GETPOST("search_label",'alpha');
@@ -75,80 +73,93 @@ $object = new Cronjob($db);
  * Actions
  */
 
-// Do we 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_label='';
-	$status=-1;
-}
+if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
-$filter=array();
-if (!empty($search_label))
-{
-	$filter['t.label']=$search_label;
-}
+$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');
 
-// Delete jobs
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete)
+if (empty($reshook))
 {
-	//Delete cron task
-	$object = new Cronjob($db);
-	$object->id=$id;
-	$result = $object->delete($user);
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, '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_label='';
+		$search_status=-1;
 	}
-}
 
-// 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);
+	$filter=array();
+	if (!empty($search_label))
+	{
+		$filter['t.label']=$search_label;
+	}
 
-        $now = dol_now();   // Date we start
+	// Delete jobs
+	if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete)
+	{
+		//Delete cron task
+		$object = new Cronjob($db);
+		$object->id=$id;
+		$result = $object->delete($user);
 
-        $resrunjob = $object->run_jobs($user->login);   // Return -1 if KO, 1 if OK
-    	if ($resrunjob < 0) {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
+		if ($result < 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='';
-    	}
+	// 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);
 
-    	$param='&status='.$status;
-    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-    	if ($search_label)	  $param.='&search_label='.$search_label;
-    	if ($optioncss != '') $param.='&optioncss='.$optioncss;
-    	// Add $param from extra fields
-    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	        $now = dol_now();   // Date we start
 
-    	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;
-    }
+	        $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='';
+	    	}
+
+	    	$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;
+	    }
+	}
 }
 
 
@@ -196,8 +207,8 @@ $sql.= " t.libname,";
 $sql.= " t.test";
 $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
 $sql.= " WHERE 1 = 1";
-if ($status >= 0 && $status < 2) $sql.= " AND t.status = ".(empty($status)?'0':'1');
-if ($status == 2) $sql.= " AND t.status = 2";
+if ($search_status >= 0 && $search_status < 2) $sql.= " AND t.status = ".(empty($search_status)?'0':'1');
+if ($search_status == 2) $sql.= " AND t.status = 2";
 //Manage filter
 if (is_array($filter) && count($filter)>0) {
 	foreach($filter as $key => $value) {
@@ -235,7 +246,7 @@ if (! $result) dol_print_error($db);
 
 $num = $db->num_rows($result);
 
-$param='&status='.$status;
+$param='&search_status='.$search_status;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($search_label)	  $param.='&search_label='.$search_label;
@@ -256,15 +267,28 @@ if ($action == 'execute')
 	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
 }
 
+// List of mass actions available
+$arrayofmassactions =  array(
+//'presend'=>$langs->trans("SendByMail"),
+//'builddoc'=>$langs->trans("PDFMerge"),
+	'enable'=>$langs->trans("Enable"),
+	'disable'=>$langs->trans("Disable"),
+);
+if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n";
-print '<input type="hidden" name="status" value="'.$status.'" >';
+
+print '<form method="POST" id="searchFormList" 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="'.$_SESSION['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.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'" >';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 // Line with explanation and button new job
@@ -311,7 +335,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" align="center">';
-print $form->selectarray('status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $status, 1);
+print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $search_status, 1);
 print '</td><td class="liste_titre" align="right">';
 $searchpicto=$form->showFilterButtons();
 print $searchpicto;

From 733ca8af7db4957a170713b4f97f447551009bfe Mon Sep 17 00:00:00 2001
From: All3kcis <contact@all-3kcis.fr>
Date: Thu, 1 Mar 2018 14:23:19 +0100
Subject: [PATCH 271/386] Use correct values of eatby and sellby on batchs
 expeditions

Use new table "product_lot" to getting eatby and sellby date
---
 htdocs/expedition/class/expeditionbatch.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index a4b3b17a98a..8599617e318 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -59,14 +59,15 @@ class ExpeditionLineBatch extends CommonObject
 	function fetchFromStock($id_stockdluo)
 	{
         $sql = "SELECT";
-		$sql.= " t.sellby,";
-		$sql.= " t.eatby,";
-		$sql.= " t.batch,";
-		$sql.= " e.fk_entrepot";
+	$sql.= " pl.sellby,";
+	$sql.= " pl.eatby,";
+	$sql.= " pl.batch,";
+	$sql.= " ps.fk_entrepot";
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as t inner join ";
-        $sql.= MAIN_DB_PREFIX."product_stock as e on t.fk_product_stock=e.rowid ";
-        $sql.= " WHERE t.rowid = ".(int) $id_stockdluo;
+        $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+        $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
+        $sql.= ' JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
+	$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);

From 0f237e4d5c9e96fa5170b6d73b6d25b9769e064f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 15:24:50 +0100
Subject: [PATCH 272/386] NEW Add mass action enable/disable on cron job list

---
 htdocs/comm/propal/list.php              |  2 +-
 htdocs/core/class/commonobject.class.php |  1 +
 htdocs/cron/class/cronjob.class.php      |  5 ++
 htdocs/cron/list.php                     | 61 +++++++++++++++++++++---
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index a47625e100b..89f49ada093 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -462,7 +462,7 @@ 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);
+	$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5235e59ef34..3c23ba0f8ac 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3057,6 +3057,7 @@ abstract class CommonObject
 
 		$fieldstatus="fk_statut";
 		if ($elementTable == 'mailing') $fieldstatus="statut";
+		if ($elementTable == 'cronjob') $fieldstatus="status";
 		if ($elementTable == 'user') $fieldstatus="statut";
 		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
 		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 1debc47e776..be5ffbe965d 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -63,6 +63,11 @@ class Cronjob extends CommonObject
 	public $libname;
 	public $test;					// A test condition to know if job is visible/qualified
 
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
+	const STATUS_ARCHIVED = 2;
+
+
     /**
      *  Constructor
      *
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 5c045b56243..f6a695d4a39 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -34,10 +34,13 @@ $langs->loadLangs(array("admin","cron","bills"));
 if (!$user->rights->cron->read) accessforbidden();
 
 $action=GETPOST('action','alpha');
+$massaction = GETPOST('massaction','alpha');											// The bulk action (combo box choice into lists)
 $confirm=GETPOST('confirm','alpha');
-$id=GETPOST('id','int');
+$toselect   = GETPOST('toselect', 'array');												// Array of ids of elements selected into a list
 $contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'cronjoblist';   // To manage different context of search
 
+$id=GETPOST('id','int');
+
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -90,6 +93,13 @@ if (empty($reshook))
 	{
 		$search_label='';
 		$search_status=-1;
+		$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
 	}
 
 	$filter=array();
@@ -160,6 +170,35 @@ if (empty($reshook))
 	    	exit;
 	    }
 	}
+
+	// Mass actions
+	$objectclass='CronJob';
+	$objectlabel='CronJob';
+	$permtoread = $user->rights->cron->read;
+	$permtocreate = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write;
+	$permtodelete = $user->rights->cron->delete;
+	$uploaddir = $conf->cron->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	if ($permtocreate)
+	{
+		$tmpcron = new Cronjob($db);
+		foreach($toselect as $id)
+		{
+			$result = $tmpcron->fetch($id);
+			if ($result)
+			{
+				$result = 0;
+				if ($massaction == 'disable') $result = $tmpcron->setStatut(Cronjob::STATUS_DISABLED);
+				elseif ($massaction == 'enable') $result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
+				else dol_print_error($db, 'Bad value for massaction');
+				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
+			}
+			else
+			{
+				$error++;
+			}
+		}
+	}
 }
 
 
@@ -246,16 +285,17 @@ if (! $result) dol_print_error($db);
 
 $num = $db->num_rows($result);
 
-$param='&search_status='.$search_status;
+$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_status)   $param.='&search_status='.$search_status;
 if ($search_label)	  $param.='&search_label='.$search_label;
 if ($optioncss != '') $param.='&optioncss='.$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")));
-
 $stringcurrentdate = $langs->trans("CurrentHour").': '.dol_print_date(dol_now(), 'dayhour');
 
 if ($action == 'delete')
@@ -301,7 +341,7 @@ else
     $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
 }
 
-print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit);
+print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit);
 
 
 print $langs->trans('CronInfo').'<br>';
@@ -312,8 +352,9 @@ print info_admin($text);
 print '<br>';
 
 $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">';
@@ -357,7 +398,7 @@ print_liste_field_titre("CronLastResult",$_SERVER["PHP_SELF"],"t.lastresult","",
 print_liste_field_titre("CronLastOutput",$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder);
 print_liste_field_titre("CronDtNextLaunch",$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status,t.priority","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre('');
+print_liste_field_titre($selectedfields,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
@@ -491,6 +532,12 @@ if ($num > 0)
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"playdisabled")."</a>";
 		}
+		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 ' &nbsp; <input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		}
 		print '</td>';
 
 		print '</tr>';

From 132ee2c7885e73a076ede503616bbb3202497d6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 16:48:12 +0100
Subject: [PATCH 273/386] CSS

---
 htdocs/contrat/list.php                    | 4 ++--
 htdocs/core/class/html.formother.class.php | 5 +++--
 htdocs/theme/eldy/style.css.php            | 4 ++++
 htdocs/theme/md/style.css.php              | 4 ++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index babc31f7702..94118d415bf 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -487,13 +487,13 @@ if ($resql)
 	if (! empty($arrayfields['c.date_contrat']['checked']))
 	{
 		// Date contract
-		print '<td class="liste_titre center">';
+		print '<td class="liste_titre center nowraponall">';
 		//print $langs->trans('Month').': ';
 		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.'">';
 		//print '&nbsp;'.$langs->trans('Year').': ';
 		$syear = $year;
-		$formother->select_year($syear,'year',1, 20, 5);
+		print $formother->selectyear($syear,'year',1, 20, 5, 0, 0, '', 'widthauto');
 		print '</td>';
 	}
 	// Extra fields
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 3339b2b054e..de87e6c2e39 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -881,9 +881,10 @@ class FormOther
      *  @param	int		$offset			Offset
      *  @param	int		$invert			Invert
      *  @param	string	$option			Option
+     *  @param	string	$morecss		More css
      *  @return	string
      */
-    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='')
+    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='')
     {
         $out='';
 
@@ -892,7 +893,7 @@ class FormOther
         $min_year = $currentyear-$min_year;
         if(empty($selected) && empty($useempty)) $selected = $currentyear;
 
-        $out.= '<select class="flat" placeholder="aa" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
+        $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
         if($useempty)
         {
         	$selected_html='';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 60eaf6d5471..b9cceadc5c0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -864,7 +864,9 @@ select.selectarrowonleft option {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {
+	.width25  { width: 25px; }
     .width50  { width: 50px; }
+    .width75  { width: 75px; }
     .width100 { width: 100px; }
     .width200 { width: 200px; }
     .minwidth100 { min-width: 100px; }
@@ -880,8 +882,10 @@ select.selectarrowonleft option {
     .minwidth400imp { min-width: 400px !important; }
     .minwidth500imp { min-width: 500px !important; }
 }
+.widthauto { width: auto; }
 .width25  { width: 25px; }
 .width50  { width: 50px; }
+.width75  { width: 75px; }
 .width100 { width: 100px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 745cddfdb6e..9c424340c12 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -864,7 +864,9 @@ select.selectarrowonleft option {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {
+	.width25  { width: 25px; }
     .width50  { width: 50px; }
+    .width75  { width: 75px; }
     .width100 { width: 100px; }
     .width200 { width: 200px; }
 	.minwidth100 { min-width: 100px; }
@@ -880,8 +882,10 @@ select.selectarrowonleft option {
 	.minwidth400imp { min-width: 400px !important; }
 	.minwidth500imp { min-width: 500px !important; }
 }
+.widthauto { width: auto; }
 .width25  { width: 25px; }
 .width50  { width: 50px; }
+.width75  { width: 75px; }
 .width100 { width: 100px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }

From f36308fa0aaf2283469be49634cdb5cb80c9fb2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 17:20:37 +0100
Subject: [PATCH 274/386] FIX nohover broken on boxes

---
 htdocs/core/boxes/box_graph_invoices_permonth.php          | 6 ++----
 htdocs/core/boxes/box_graph_invoices_supplier_permonth.php | 4 ++--
 htdocs/core/boxes/box_graph_orders_permonth.php            | 4 ++--
 htdocs/core/boxes/box_graph_orders_supplier_permonth.php   | 4 ++--
 htdocs/core/boxes/box_graph_product_distribution.php       | 2 +-
 htdocs/core/boxes/box_graph_propales_permonth.php          | 4 ++--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 8b5bfbc817d..4c95d446f8a 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -246,13 +246,11 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
-				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"', 'maxlength'=>500, 'text' => $mesg);
 			}
 
 		}
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 436343a56dc..efd7de41e5a 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -245,11 +245,11 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
-				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 7e60e00a2fc..699f2db902b 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -244,11 +244,11 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
-				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 6f8ebf39001..f49f38c1228 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -243,11 +243,11 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
-				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index bac56d8006b..69a09e8aad2 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -386,7 +386,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow.=$px3->show();
 				$stringtoshow.='</div></div>';
 			}
-			$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+			$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 		}
 		else
 		{
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 690df3d41fa..50e3cbe9bf8 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -245,11 +245,11 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
-				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}

From 35d6c754d247341bbfffe57546c1b2d787455717 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 17:40:30 +0100
Subject: [PATCH 275/386] CSS

---
 htdocs/theme/eldy/style.css.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b9cceadc5c0..1b46929924c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3021,10 +3021,12 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
-    /* border: 1px solid #CCC; */
     text-align: center;
-    border-radius: 2px;
-    background: #eee;
+
+    background: #f8f8f8;
+    border: 1px solid #eee;
+    box-shadow: 1px 1px 6px #bbb;
+    border-radius: 0px;
 }
 .boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
@@ -3046,6 +3048,11 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 
 @media only screen and (max-width: 767px)
 {
+	.boxstats, .boxstats130 {
+	    border: 1px solid #ddd;
+    	box-shadow: none;
+    	text-align: <?php echo $left; ?>
+    }
 	.thumbstat {
 		flex: 1 1 110px;
 	}

From 0a27855141e1332624251b032149813869924c89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 18:21:47 +0100
Subject: [PATCH 276/386] CSS

---
 htdocs/contrat/card.php         | 2 +-
 htdocs/theme/eldy/style.css.php | 8 ++++++++
 htdocs/theme/md/style.css.php   | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4600baf56ed..a2d189c9790 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1926,7 +1926,7 @@ else
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($objp->date_fin_reelle, 'day');
 				}
-				if (! empty($objp->comment)) print "<br>".$objp->comment;
+				if (! empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
 				print '</td>';
 
 				print '<td align="center">&nbsp;</td>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1b46929924c..f8ccade235e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2203,6 +2203,9 @@ div.tabBarWithBottom {
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
 }
+.tableforservicepart1 .tdhrthin {
+	height: unset;
+}
 
 div.popuptabset {
 	padding: 6px;
@@ -3021,6 +3024,8 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     text-align: center;
 
     background: #f8f8f8;
@@ -3051,6 +3056,9 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	.boxstats, .boxstats130 {
 	    border: 1px solid #ddd;
     	box-shadow: none;
+    	background: #ddd;
+    }
+    .boxstats130 {
     	text-align: <?php echo $left; ?>
     }
 	.thumbstat {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9c424340c12..9d5fe28b1e9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2198,6 +2198,9 @@ div.tabBarWithBottom {
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
 }
+.tableforservicepart1 .tdhrthin {
+	height: unset;
+}
 
 /* ============================================================================== */
 /* Boutons actions                                                                */

From a3350d12d8c19d771c74d9b1065a156bad87853a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Mar 2018 23:51:06 +0100
Subject: [PATCH 277/386] css

---
 htdocs/comm/card.php                   |  2 +-
 htdocs/comm/propal/card.php            |  4 +--
 htdocs/core/tpl/contacts.tpl.php       |  3 +-
 htdocs/fourn/card.php                  |  4 ++-
 htdocs/product/stock/massstockmove.php | 10 +++---
 htdocs/theme/eldy/style.css.php        | 47 ++++++++++++++++++++------
 htdocs/theme/md/style.css.php          | 12 ++++---
 7 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4c675b2ca50..fb8154e76ba 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -559,7 +559,7 @@ if ($object->id > 0)
 
 	// Lien recap
 	$boxstat.='<div class="box">';
-	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom" width="100%">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 
 	if (! empty($conf->propal->enabled))
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9194ec62c49..148f24a7fb5 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1921,7 +1921,7 @@ if ($action == 'create')
 		print '</form>';
 	} else {
 		if ($object->date) {
-			print dol_print_date($object->date, 'daytext');
+			print dol_print_date($object->date, 'day');
 		} else {
 			print '&nbsp;';
 		}
@@ -1947,7 +1947,7 @@ if ($action == 'create')
 		print '</form>';
 	} else {
 		if (! empty($object->fin_validite)) {
-			print dol_print_date($object->fin_validite, 'daytext');
+			print dol_print_date($object->fin_validite, 'day');
 			if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
 				print img_warning($langs->trans("Late"));
 		} else {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index aa392489987..c700f4d6984 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -60,8 +60,9 @@ $userstatic=new User($db);
 ?>
 
 <!-- BEGIN PHP TEMPLATE CONTACTS -->
+<div class="underbanner clearboth"></div>
 <div class="div-table-responsive">
-<div class="tagtable centpercent noborder allwidth">
+<div class="tagtable centpercent noborder nobordertop allwidth">
 
 <?php
 if ($permission) {
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index c6f0c8bb446..cd94b9b0cda 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -314,9 +314,11 @@ if ($object->id > 0)
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
+	print '<div class="underbanner clearboth"></div>';
+
 	// Lien recap
 	$boxstat.='<div class="box">';
-	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 
 	if ($conf->supplier_proposal->enabled)
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index e6a2b59e700..caea260118f 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -332,7 +332,7 @@ $titletoadd=$langs->trans("Select");
 $buttonrecord=$langs->trans("RecordMovement");
 $titletoaddnoent=$langs->transnoentitiesnoconv("Select");
 $buttonrecordnoent=$langs->transnoentitiesnoconv("RecordMovement");
-print $langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'<br>';
+print '<span class="opacitymedium">'.$langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'</span><br>';
 print '<br>'."\n";
 
 $var=true;
@@ -445,14 +445,14 @@ print '<input type="hidden" name="token" value="' .$_SESSION['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=(isset($_POST["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 '<table class="border" width="100%">';
+print '<table class="noborder" width="100%">';
 	print '<tr>';
-	print '<td class="titlefield">'.$langs->trans("InventoryCode").'</td>';
+	print '<td class="titlefield fieldrequired">'.$langs->trans("InventoryCode").'</td>';
 	print '<td>';
-	print '<input type="text" name="codemove" size="10" value="'.dol_escape_htmltag($codemove).'">';
+	print '<input type="text" name="codemove" size="15" value="'.dol_escape_htmltag($codemove).'">';
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f8ccade235e..dfe54cfa17d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -39,7 +39,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 $colorbackhmenu1='80,90,120';      // topmenu
 $colorbackvmenu1='248,248,248';      // vmenu
 $colortopbordertitle1='200,200,200';    // top border of title
-$colorbacktitle1='230,230,233';      // title of tables,list
+$colorbacktitle1='220,220,223';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -768,13 +768,16 @@ select.flat.selectlimit {
 .amountpaymentcomplete {
 	color: #008800;
 	font-weight: bold;
+	font-size: 1.4em;
 }
 .amountremaintopay {
 	color: #880000;
 	font-weight: bold;
+	font-size: 1.4em;
 }
 .amountremaintopayback {
 	font-weight: bold;
+	font-size: 1.4em;
 }
 .savingdocmask {
 	margin-top: 6px;
@@ -1053,6 +1056,13 @@ select.selectarrowonleft option {
 	div.statusrefbis {
     	padding-right: 3px !important;
    	}
+	/* TODO
+	div.statusref {
+    	padding-top: 0px !important;
+    	padding-left: 0px !important;
+    	border: none !important;
+   	}
+	*/
 
    	input.buttonpayment {
 		min-width: 300px;
@@ -1345,7 +1355,7 @@ div.attachareaformuserfileecm {
 div.arearef {
 	padding-top: 2px;
 	margin-bottom: 10px;
-	padding-bottom: 7px;
+	padding-bottom: 10px;
 }
 div.arearefnobottom {
 	padding-top: 2px;
@@ -1360,6 +1370,12 @@ div.divphotoref {
 div.paginationref {
 	padding-bottom: 10px;
 }
+/* TODO
+div.statusref {
+   	padding: 10px;
+   	border: 1px solid #bbb;
+   	border-radius: 6px;
+} */
 div.statusref {
 	float: right;
 	padding-left: 12px;
@@ -1405,11 +1421,12 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	/* border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>); */
-	border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>);
+	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	/* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>); */
 }
 .trextrafieldseparator td {
-    border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
+    /* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
+    border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
 }
 
 .tdhrthin {
@@ -2447,6 +2464,10 @@ table.borderplus {
 .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
 	height: 22px;
 }
+tr.liste_titre.box_titre td table td {
+    height: 22px;
+}
+
 div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
 	vertical-align: middle;
 }
@@ -2483,6 +2504,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
+.nobordertop, .nobordertop tr:first-of-type td {
+    border-top: none !important;
+}
 .noborderbottom, .noborderbottom tr:last-of-type td {
     border-bottom: none !important;
 }
@@ -2794,7 +2818,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-td.evenodd, tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td, #trlinefordates td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -2946,9 +2970,10 @@ table.tableforservicepart1 tr td {
 }
 
 .paymenttable, .margintable {
-	border-top-width: <?php echo $borderwidth ?>px !important;
+	/*border-top-width: <?php echo $borderwidth ?>px !important;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
-	border-top-style: solid !important;
+	border-top-style: solid !important;*/
+	border-top: none !important;
 	margin: 0px 0px 0px 0px !important;
 }
 .paymenttable tr td:first-child, .margintable tr td:first-child
@@ -3144,6 +3169,9 @@ span.dashboardlineko {
 table.noborder.boxtable tr td {
     height: unset;
 }
+.boxtablenotop {
+    border-top-width: 0 !important;
+}
 .boxtablenobottom {
     border-bottom-width: 0 !important;
 }
@@ -3190,9 +3218,6 @@ img.boxhandle, img.boxclose {
 	padding-left: 5px;
 }
 
-.noborderbottom {
-	border-bottom: none !important;
-}
 .formboxfilter {
 	vertical-align: middle;
 	margin-bottom: 6px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9d5fe28b1e9..23ec6a98428 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2509,7 +2509,10 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-.noborderbottom {
+.nobordertop, .nobordertop tr:first-of-type td {
+    border-top: none !important;
+}
+.noborderbottom, .noborderbottom tr:last-of-type td {
     border-bottom: none !important;
 }
 .ficheaddleft table.noborder {
@@ -3153,6 +3156,9 @@ span.dashboardlineko {
     margin-bottom: 8px !important;
     border-bottom-width: 1px;
 }
+.boxtablenotop {
+    /* border-top-width: 0 !important; */
+}
 .boxtablenobottom {
     /* border-bottom-width: 0 !important; */
 }
@@ -3201,10 +3207,6 @@ img.boxhandle, img.boxclose {
 	padding-left: 5px;
 }
 
-.noborderbottom {
-	border-bottom: none !important;
-}
-
 .formboxfilter {
 	vertical-align: middle;
 	margin-bottom: 6px;

From 191a1e9350f82ebb1997f0259f22fd96cbfd2ecc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 11:18:29 +0100
Subject: [PATCH 278/386] Fix css

---
 htdocs/comm/mailing/card.php              | 14 +++++++----
 htdocs/comm/mailing/cibles.php            |  2 +-
 htdocs/core/class/html.formmail.class.php |  2 +-
 htdocs/theme/eldy/style.css.php           | 29 +++++++++++++++++++----
 htdocs/theme/md/style.css.php             | 22 ++++++++++++++---
 5 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index db19e943b4b..a8bbb05fb84 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -967,7 +967,7 @@ else
 			 * Boutons d'action
 			 */
 
-			if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft', 'valid','delete','sendall','clone')))
+			if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft','valid','delete','sendall','clone','test')))
 			{
 				print "\n\n<div class=\"tabsAction\">\n";
 
@@ -1071,7 +1071,9 @@ else
 			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			    print load_fiche_titre($langs->trans("TestMailing"));
 
-				// Create l'objet formulaire mail
+			    dol_fiche_head(null, '', '', -1);
+
+			    // Create l'objet formulaire mail
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
@@ -1099,6 +1101,10 @@ else
 				print $formmail->get_form();
 
 				print '<br>';
+
+				dol_fiche_end();
+
+				print dol_set_focus('#sendto');
 			}
 
 
@@ -1114,7 +1120,7 @@ else
 
 			dol_fiche_head('', '', '', -1);
 
-			print '<table class="border" width="100%">';
+			print '<table class="bordernooddeven" width="100%">';
 
 			// Subject
 			print '<tr><td class="titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
@@ -1260,7 +1266,7 @@ else
 
 			dol_fiche_head(null, '', '', -1);
 
-			print '<table class="border" width="100%">';
+			print '<table class="bordernooddeven" width="100%">';
 
 			// Subject
 			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat quatrevingtpercent" type="text" name="sujet" value="'.$object->sujet.'"></td></tr>';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 57af9f5c601..48949881659 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -260,7 +260,7 @@ if ($object->fetch($id) >= 0)
 		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''), 'title_generic');
 
 		//print '<table class="noborder" width="100%">';
-		print '<div class="tagtable centpercent liste_titre_bydiv" id="tablelines">';
+		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
 
 		//print '<tr class="liste_titre">';
 		print '<div class="tagtr liste_titre">';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4a04a04885a..8aa7f0ce54e 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -406,7 +406,7 @@ class FormMail extends Form
 
 
 
-			$out.= '<table class="border" width="100%" style="border-top: 1px solid #BBB;">'."\n";
+			$out.= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
 
 			// Substitution array
 			if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dfe54cfa17d..d902b41dab5 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2213,10 +2213,18 @@ div.tabBar div.titre {
 	padding-top: 20px;
 }
 
+/* tabBar used for creation/update/send forms */
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa;
 }
+div.tabBarWithBottom tr {
+	background: unset !important;
+}
+div.tabBarWithBottom table.border>tbody>tr:last-of-type>td {
+	border-bottom: none !important;
+}
+
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
 }
@@ -2454,17 +2462,17 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 }
 
 
-table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
+table.border, table.bordernooddeven, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
 	border-collapse: collapse !important;
 	padding: 1px 2px 1px 3px;			/* t r b l */
 }
 table.borderplus {
 	border: 1px solid #BBB;
 }
-.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
+.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
 	height: 22px;
 }
-tr.liste_titre.box_titre td table td {
+tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
     height: 22px;
 }
 
@@ -2478,7 +2486,7 @@ div .tdtop {
 	padding-bottom: 0px;
 }
 
-table.border td, div.border div div.tagtd {
+table.border td, table.bordernooddeven td, div.border div div.tagtd {
 	padding: 5px 2px 5px 2px;
 	border-collapse: collapse;
 }
@@ -2510,6 +2518,14 @@ td.border, div.tagtable div div.border {
 .noborderbottom, .noborderbottom tr:last-of-type td {
     border-bottom: none !important;
 }
+.bordertop {
+	border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+}
+.borderbottom {
+	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+}
+
+
 /*.ficheaddleft table.noborder {
 	margin: 0px 0px 0px 0px;
 }*/
@@ -3529,7 +3545,10 @@ div.ui-tooltip {
 /* Calendar                                                                       */
 /* ============================================================================== */
 
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active {
+.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
+.ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
+html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
+{
     border: unset;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 23ec6a98428..514f4d0a542 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2473,7 +2473,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 }
 
 
-table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
+table.border, table.bordernooddeven, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
 	border: 1px solid #f4f4f4;
 	border-collapse: collapse !important;
 	padding: 1px 2px 1px 3px;			/* t r b l */
@@ -2481,10 +2481,12 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
 table.borderplus {
 	border: 1px solid #BBB;
 }
-
-.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
+.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
 	height: 22px;
 }
+tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
+    height: 22px;
+}
 
 table.border td, div.border div div.tagtd {
 	padding: 2px 2px 2px 2px;
@@ -2515,6 +2517,13 @@ td.border, div.tagtable div div.border {
 .noborderbottom, .noborderbottom tr:last-of-type td {
     border-bottom: none !important;
 }
+.bordertop {
+	border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+}
+.borderbottom {
+	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+}
+
 .ficheaddleft table.noborder {
 	margin: 0px 0px 0px 0px;
 }
@@ -3509,6 +3518,13 @@ div.ui-tooltip {
 /* Calendar                                                                       */
 /* ============================================================================== */
 
+.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
+.ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
+html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
+{
+    border: unset;
+}
+
 img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
 
 .ui-datepicker-trigger {

From 471aca5180bc45306d5b7faf6828d523469926af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 11:41:46 +0100
Subject: [PATCH 279/386] CSS

---
 htdocs/theme/eldy/style.css.php | 3 ++-
 htdocs/theme/md/style.css.php   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d902b41dab5..3cfa1bf01e6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3064,7 +3064,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 .boxstats, .boxstats130 {
     display: inline-block;
-    margin: 3px;
+    margin: 8px;
     margin-top: 5px;
     margin-bottom: 5px;
     text-align: center;
@@ -3095,6 +3095,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 @media only screen and (max-width: 767px)
 {
 	.boxstats, .boxstats130 {
+		margin: 3px;
 	    border: 1px solid #ddd;
     	box-shadow: none;
     	background: #ddd;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 514f4d0a542..de12d09b121 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3081,7 +3081,7 @@ div .tdtop {
 }
 .boxstats, .boxstats130 {
     display: inline-block;
-    margin: 3px;
+    margin: 8px;
     /* border: 1px solid #CCC; */
     text-align: center;
     border-radius: 2px;
@@ -3104,6 +3104,12 @@ div .tdtop {
 }
 @media only screen and (max-width: 767px)
 {
+	.boxstats, .boxstats130 {
+		margin: 3px;
+	    border: 1px solid #ddd;
+    	box-shadow: none;
+    	background: #ddd;
+    }
 	.thumbstat {
 		flex: 1 1 110px;
 	}

From 2e6a2b59a032875a493100375537c4eb65a4c2f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 13:44:17 +0100
Subject: [PATCH 280/386] Trans

---
 htdocs/langs/en_US/other.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index c4cb693716d..d90bfb35032 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -216,6 +216,7 @@ 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 Dolibarr password has been received
 NewKeyIs=This is your new keys to login

From dfdb5b27b0c8446e2fb48c5188d0029a99207716 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 14:46:00 +0100
Subject: [PATCH 281/386] Fix include master

---
 .../modulebuilder/template/scripts/myobject.php   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
index a8c280193ea..c2be67451cb 100755
--- a/htdocs/modulebuilder/template/scripts/myobject.php
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -42,12 +42,17 @@ $error=0;
 @set_time_limit(0);							// No timeout for this script
 define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
-// Include and load Dolibarr environment variables
+// Load Dolibarr environment
 $res=0;
-if (! $res && file_exists($path."master.inc.php")) $res=@include($path."master.inc.php");
-if (! $res && file_exists($path."../master.inc.php")) $res=@include($path."../master.inc.php");
-if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
-if (! $res && file_exists($path."../../../master.inc.php")) $res=@include($path."../../../master.inc.php");
+// Try master.inc.php into web root detected using web root caluclated 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))."/master.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/master.inc.php");
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/master.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/master.inc.php");
+// Try master.inc.php using relative path
+if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
+if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
+if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
 if (! $res) die("Include of master fails");
 // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
 // $user is created but empty.

From 451d943927f0625a742ae99e353ed5956ad3a0d0 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 2 Mar 2018 16:48:25 +0100
Subject: [PATCH 282/386] NEW: supplier credit notes: factorized discount block
 (+ correct translations for supplier discounts)

---
 htdocs/comm/propal/card.php              |  42 +++------
 htdocs/commande/card.php                 |  43 +++-------
 htdocs/compta/facture/card.php           | 101 +++-------------------
 htdocs/compta/facture/prelevement.php    |  60 ++-----------
 htdocs/core/class/html.form.class.php    |  17 ++--
 htdocs/core/tpl/object_discounts.tpl.php | 104 +++++++++++++++++++++++
 htdocs/expedition/shipment.php           |  28 ++----
 htdocs/fourn/commande/card.php           |  52 +++---------
 htdocs/fourn/facture/card.php            |  99 ++-------------------
 htdocs/langs/en_US/companies.lang        |   4 +
 htdocs/supplier_proposal/card.php        |  51 +++--------
 11 files changed, 203 insertions(+), 398 deletions(-)
 create mode 100644 htdocs/core/tpl/object_discounts.tpl.php

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index a09485e0a9a..1b685825a13 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1458,17 +1458,13 @@ if ($action == 'create')
 
 		// Ligne info remises tiers
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+
 		$absolute_discount = $soc->getAvailableDiscounts();
-		print '. ';
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 1, -1, -1, $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
+
+		$thirdparty = $soc;
+		$discount_type = 0;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 		print '</td></tr>';
 	}
 
@@ -1884,29 +1880,17 @@ if ($action == 'create')
 	}
 
 	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-	if ($soc->remise_percent)
-		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-	else
-		print $langs->trans("CompanyHasNoRelativeDiscount");
-	print '. ';
+
 	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
 	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
 	$absolute_discount = price2num($absolute_discount, 'MT');
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-	if ($absolute_discount) {
-		if ($object->statut > Propal::STATUS_DRAFT) {
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 0, 0, -1, $conf->currency));
-		} else {
-			// Remise dispo de type non avoir
-			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1);
-		}
-	}
-	if ($absolute_creditnote) {
-		print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote, 0, $langs, 0, 0, -1, $conf->currency)) . '. ';
-	}
-	if (! $absolute_discount && ! $absolute_creditnote)
-		print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+
+	$thirdparty = $soc;
+	$discount_type = 0;
+	$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 	print '</td></tr>';
 
 	// Date of proposal
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index dabd44ae448..cf70d422130 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1558,17 +1558,14 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Ligne info remises tiers
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
+
 		$absolute_discount = $soc->getAvailableDiscounts();
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
+
+		$thirdparty = $soc;
+		$discount_type = 0;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 	// Date
@@ -2052,29 +2049,17 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
 		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
+
 		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
 		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-		if ($absolute_discount) {
-			if ($object->statut > Commande::STATUS_DRAFT) {
-				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-			} else {
-				// Remise dispo de type remise fixe (not credit note)
-				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1);
-			}
-		}
-		if ($absolute_creditnote) {
-			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-		}
-		if (! $absolute_discount && ! $absolute_creditnote)
-			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+
+		$thirdparty = $soc;
+		$discount_type = 0;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 
 		// Date
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5062bc88f99..4ee9658c456 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2699,19 +2699,12 @@ if ($action == 'create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
-		print '. ';
-		print '<br>';
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
-		print '.';
+
+		$thirdparty = $soc;
+		$discount_type = 0;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 
@@ -3363,84 +3356,14 @@ else if ($id > 0 || ! empty($ref))
 	print '</td></tr>';
 
 	// Relative and absolute discounts
-	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-	$viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
-
 	print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
-	print '</td><td>';
-	if ($soc->remise_percent)
-		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-	else
-		print $langs->trans("CompanyHasNoRelativeDiscount");
-		// print ' ('.$addrelativediscount.')';
 
-	// Is there is commercial discount or down payment available ?
-	if ($absolute_discount > 0) {
-		print '. ';
-		if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
-			if ($object->statut == 0) {
-				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-				print '. ';
-			} else {
-				if ($object->statut < 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
-					$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-					print '<br>' . $text . '.<br>';
-				} else {
-					$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-					$text2 = $langs->trans("AbsoluteDiscountUse");
-					print $form->textwithpicto($text, $text2);
-				}
-			}
-		} else {
-			// Discount available of type fixed amount (not credit note)
-			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')');
-		}
-	} else {
-		if ($absolute_creditnote > 0) 		// If not, link will be added later
-		{
-			if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT)
-				print ' (' . $addabsolutediscount . ')<br>';
-			else
-				print '. ';
-		} else
-			print '. ';
-	}
-	// Is there credit notes availables ?
-	if ($absolute_creditnote > 0)
-	{
-		// If validated, we show link "add credit note to payment"
-		if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE) {
-			if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) {
-				$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
-				print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
-			} else {
-				print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
-			}
-		} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
-			// There is credit notes discounts available
-			if (! $absolute_discount) print '<br>';
-			// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, $resteapayer);
-			$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, 0, $more); // We allow credit note even if amount is higher
-		}
-	}
-	if (! $absolute_discount && ! $absolute_creditnote) {
-		print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT)
-			print ' (' . $addabsolutediscount . ')<br>';
-		else
-			print '. ';
-	}
-	// if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
-	// {
-	// if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
-	// print ' &nbsp; - &nbsp; ';
-	// print $addabsolutediscount;
-	// print ' &nbsp; - &nbsp; '.$addcreditnote; // We disbale link to credit note
-	// }
+	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
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 01f2ff6aa27..e665eaf77d1 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -261,59 +261,13 @@ if ($object->id > 0)
 
 	// Discounts
 	print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
-	if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
-	else print $langs->trans("CompanyHasNoRelativeDiscount");
-	print '. ';
-	if ($absolute_discount > 0)
-	{
-		if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-		{
-			if ($object->statut == Facture::STATUS_DRAFT)
-			{
-				print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)).'. ';
-			}
-			else
-			{
-				if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-				{
-					$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-					print '<br>'.$text.'.<br>';
-				}
-				else
-				{
-					$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-					$text2=$langs->trans("AbsoluteDiscountUse");
-					print $form->textwithpicto($text,$text2);
-				}
-			}
-		}
-		else
-		{
-			// Remise dispo de type non avoir
-			print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$object->thirdparty->id,$absolute_discount,$filterabsolutediscount,$resteapayer,'',1);
-		}
-	}
-	if ($absolute_creditnote > 0)
-	{
-		// If validated, we show link "add credit note to payment"
-		if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_CREDIT_NOTE)
-		{
-			if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT)
-			{
-				$text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency));
-				print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
-			}
-			else print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'.';
-		}
-		else
-		{
-			// Remise dispo de type avoir
-			if (! $absolute_discount) print '<br>';
-			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id_for_payment',$object->thirdparty->id,$absolute_creditnote,$filtercreditnote,$resteapayer,'',1);
-		}
-	}
-	if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
+
+	$thirdparty = $object->thirdparty;
+	$discount_type = 0;
+	$backtopage = urlencode($_SERVER["PHP_SELF"] . '?facid=' . $object->id);
+	$cannotApplyDiscount = 1;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 	print '</td></tr>';
 
 	// Date invoice
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 16f72b2d837..a98729ac055 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4239,26 +4239,27 @@ class Form
 			if(! empty($discount_type)) {
 				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
-					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice
+					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
 				else
 				{
-					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
-					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
+					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
 			} else {
 				if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 				{
-					if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));    // If we want deposit to be substracted to payments only and not to total of final invoice
-					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice
+					else $translationKey = 'CompanyHasCreditNote';
 				}
 				else
 				{
-					if (! $filter || $filter=="fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency));
-					else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency));
+					if (! $filter || $filter=="fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
+					else $translationKey = 'CompanyHasCreditNote';
 				}
 			}
+			print $langs->trans($translationKey,price($amount,0,$langs,0,0,-1,$conf->currency));
 			if (empty($hidelist)) print ': ';
 			print '</div>';
 			if (empty($hidelist))
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
new file mode 100644
index 00000000000..e8accdc4d26
--- /dev/null
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -0,0 +1,104 @@
+<?php
+/* Copyright (C) 2018		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/>.
+ *
+ * Needs the following variables defined:
+ * $object					Proposal, order, invoice (including supplier versions)
+ * $thirdparty				Thirdparty of object
+ * $absolute_discount		Amount of fixed discounts available
+ * $absolute_creditnote		Amount of credit notes available
+ * $discount_type			0 => Customer discounts, 1 => Supplier discounts
+ * $cannotApplyDiscount		Set it to prevent form to apply discount
+ * $backtopage				URL to come back to from discount modification pages
+ */
+
+$classname = get_class($object);
+$isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier'));
+$isNewObject = empty($object->id) && empty($object->rowid);
+
+// Relative and absolute discounts
+$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("EditRelativeDiscount") . '</a>';
+$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+$viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
+
+$fixedDiscount = $thirdparty->remise_percent;
+
+if(! empty($discount_type)) {
+	$fixedDiscount = $thirdparty->remise_supplier_percent;
+}
+
+$translationKey = ! empty($discount_type) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
+if ($fixedDiscount > 0)
+	print $langs->trans($translationKey, $fixedDiscount).'.';
+else
+	print $langs->trans($translationKey).'.';
+if($isNewObject) print ' ('.$addrelativediscount.')';
+
+// Is there is commercial discount or down payment available ?
+if ($absolute_discount > 0) {
+
+	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut > $classname::STATUS_DRAFT || $object->type == $classname::TYPE_CREDIT_NOTE || $object->type == $classname::TYPE_DEPOSIT) {
+		$translationKey = ! empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
+		$text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency)).'.';
+
+		if ($isInvoice && ! $isNewObject && $object->statut > $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
+			$text = $form->textwithpicto($text, $langs->trans('AbsoluteDiscountUse'));
+		}
+		
+		if ($isNewObject) {
+			$text.= ' ('.$addabsolutediscount.')';
+		}
+
+		print '<br>'.$text;
+	} else {
+		// Discount available of type fixed amount (not credit note)
+		$more = '(' . $addabsolutediscount . ')';
+		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
+	}
+}
+
+// Is there credit notes availables ?
+if ($absolute_creditnote > 0) {
+	
+	// If validated, we show link "add credit note to payment"
+	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut != $classname::STATUS_VALIDATED || $object->type == $classname::TYPE_CREDIT_NOTE) {
+		$translationKey = ! empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
+		$text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
+
+		if ($isInvoice && ! $isNewObject && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_DEPOSIT) {
+			$text = $form->textwithpicto($text, $langs->trans('CreditNoteDepositUse'));
+		}
+		
+		if ($absolute_discount <= 0 || $isNewObject) {
+			$text.= '('.$addabsolutediscount.')';
+		}
+
+		print '<br>'.$text;
+	} 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 . ')' : '';
+		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $thirdparty->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, $discount_type); // We allow credit note even if amount is higher
+	}
+}
+
+if($absolute_discount <= 0 && $absolute_creditnote <= 0) {
+	$translationKey = ! empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
+	print '<br>'.$langs->trans($translationKey).'.';
+
+	if ($isInvoice && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
+		print ' (' . $addabsolutediscount . ')';
+	}
+}
+
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index f16ee1eac48..a9bb706c4d8 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -340,31 +340,17 @@ if ($id > 0 || ! empty($ref))
 	    }
 
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
+
 		$absolute_discount=$soc->getAvailableDiscounts('',$filterabsolutediscount);
 		$absolute_creditnote=$soc->getAvailableDiscounts('',$filtercreditnote);
 		$absolute_discount=price2num($absolute_discount,'MT');
 		$absolute_creditnote=price2num($absolute_creditnote,'MT');
-		if ($absolute_discount)
-		{
-			if ($object->statut > Commande::STATUS_DRAFT)
-			{
-				print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-			}
-			else
-			{
-				// Remise dispo de type non avoir
-				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filterabsolutediscount, 0, '', 1);
-			}
-		}
-		if ($absolute_creditnote)
-		{
-			print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. ';
-		}
-		if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
+
+		$thirdparty = $soc;
+		$discount_type = 0;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		$cannotApplyDiscount = 1;
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 		print '</td></tr>';
 
 		// Date
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0026bfe8fe7..c7487f4cc51 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1483,22 +1483,14 @@ if ($action=='create')
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
-		if ($societe->remise_supplier_percent)
-			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_supplier_percent . '</a>');
-		else
-			print $langs->trans("HasNoRelativeDiscountFromSupplier");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
-		print '. ';
-		print '<br>';
 
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
-		print '.';
+		$thirdparty = $societe;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 
@@ -1892,37 +1884,19 @@ elseif (! empty($object->id))
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
-	
-		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-	
-		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-
-		if ($societe->remise_supplier_percent)
-			print $langs->trans("HasRelativeDiscountFromSupplier", $societe->remise_supplier_percent);
-		else
-			print $langs->trans("HasNoRelativeDiscountFromSupplier");
-		print '. ';
 
 		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-		if ($absolute_discount) {
-			if ($object->statut > CommandeFournisseur::STATUS_DRAFT) {
-				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-			} else {
-				// Remise dispo de type remise fixe (not credit note)
-				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
-			}
-		}
-		if ($absolute_creditnote) {
-			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-		}
-		if (! $absolute_discount && ! $absolute_creditnote)
-			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+
+		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+
+		$thirdparty = $societe;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 9f2610d093b..14909a1fc2e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1920,20 +1920,11 @@ if ($action == 'create')
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 
-		if ($societe->remise_supplier_percent)
-			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $societe->remise_supplier_percent . '</a>');
-		else
-			print $langs->trans("HasNoRelativeDiscountFromSupplier");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
-		print '. ';
-		print '<br>';
+		$thirdparty = $societe;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $societe->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
-		print '.';
 		print '</td></tr>';
 	}
 
@@ -2421,89 +2412,15 @@ else
         print '</td></tr>';
 
         if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
-        
 	        // Relative and absolute discounts
-	        $addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-	        $addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-	        $addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $societe->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-	        $viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $societe->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
-			
 			print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
 			print '</td><td>';
 
-			if ($societe->remise_supplier_percent)
-				print $langs->trans("HasRelativeDiscountFromSupplier", $societe->remise_supplier_percent);
-			else
-				print $langs->trans("HasNoRelativeDiscountFromSupplier");
-			// print ' ('.$addrelativediscount.')';
+			$thirdparty = $societe;
+			$discount_type = 1;
+			$backtopage = urlencode($_SERVER["PHP_SELF"] . '?facid=' . $object->id);
+			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
-	
-			// Is there is commercial discount or down payment available ?
-			if ($absolute_discount > 0) {
-				print '. ';
-				if ($object->statut > 0 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-					if ($object->statut == 0) {
-						print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-						print '. ';
-					} else {
-						if ($object->statut < 1 || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-							print '<br>' . $text . '.<br>';
-						} else {
-							$text = $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-							$text2 = $langs->trans("AbsoluteDiscountUse");
-							print $form->textwithpicto($text, $text2);
-						}
-					}
-				} else {
-					// Discount available of type fixed amount (not credit note)
-					print '<br>';
-					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $societe->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')', 0, 1);
-				}
-			} else {
-				if ($absolute_creditnote > 0) 		// If not, link will be added later
-				{
-					if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
-						print ' (' . $addabsolutediscount . ')<br>';
-					else
-						print '. ';
-				}
-				else
-					print '. ';
-			}
-			// Is there credit notes availables ?
-			if ($absolute_creditnote > 0)
-			{
-				// If validated, we show link "add credit note to payment"
-				if ($object->statut != FactureFournisseur::STATUS_VALIDATED || $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
-					if ($object->statut == 0 && $object->type != FactureFournisseur::TYPE_DEPOSIT) {
-						$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
-						print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
-					} else {
-						print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
-					}
-				} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
-					// There is credit notes discounts available
-					if (! $absolute_discount) print '<br>';
-					// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, $resteapayer, '', 0, 1);
-					$more=' ('.$addcreditnote. (($addcreditnote && $viewabsolutediscount) ? ' - ' : '') . $viewabsolutediscount . ')';
-					$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $societe->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, 1); // We allow credit note even if amount is higher
-				}
-			}
-			if (! $absolute_discount && ! $absolute_creditnote) {
-				print $langs->trans("CompanyHasNoAbsoluteDiscount");
-				if ($object->statut == FactureFournisseur::STATUS_DRAFT && $object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT)
-					print ' (' . $addabsolutediscount . ')<br>';
-				else
-					print '. ';
-			}
-			// if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
-			// {
-			// if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
-			// print ' &nbsp; - &nbsp; ';
-			// print $addabsolutediscount;
-			// print ' &nbsp; - &nbsp; '.$addcreditnote; // We disbale link to credit note
-			// }
 			print '</td></tr>';
         }
 
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index aab3ee183da..5a6d2d1fc52 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -273,6 +273,10 @@ HasNoRelativeDiscountFromSupplier=You have no default relative discount from thi
 CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 75575bf087b..4e4611d4fd5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1055,22 +1055,13 @@ if ($action == 'create')
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';		
 
-		if ($soc->remise_supplier_percent)
-			print $langs->trans("HasRelativeDiscountFromSupplier", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_supplier_percent . '</a>');
-		else
-			print $langs->trans("HasNoRelativeDiscountFromSupplier");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditRelativeDiscount") . ')</a>';
-		print '. ';
-		print '<br>';
-
 		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);
 
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . price($absolute_discount) . '</a>', $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print ' <a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">(' . $langs->trans("EditGlobalDiscounts") . ')</a>';
-		print '.';
+		$thirdparty = $soc;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 
@@ -1423,37 +1414,19 @@ if ($action == 'create')
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
-	
-		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-	
-		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
 
-		if ($soc->remise_supplier_percent)
-			print $langs->trans("HasRelativeDiscountFromSupplier", $soc->remise_supplier_percent);
-		else
-			print $langs->trans("HasNoRelativeDiscountFromSupplier");
-		print '. ';
+		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
 
 		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-		if ($absolute_discount) {
-			if ($object->statut > SupplierProposal::STATUS_DRAFT) {
-				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-			} else {
-				// Remise dispo de type remise fixe (not credit note)
-				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, 0, '', 1, 1);
-			}
-		}
-		if ($absolute_creditnote) {
-			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-		}
-		if (! $absolute_discount && ! $absolute_creditnote)
-			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+
+		$thirdparty = $soc;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
 		print '</td></tr>';
 	}
 

From 63eecb46a96d750b681c04dba2433d7e156ebb54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 17:32:54 +0100
Subject: [PATCH 283/386] Fix missing hook init

---
 htdocs/contrat/contact.php  |  7 ++++++-
 htdocs/contrat/document.php |  4 ++++
 htdocs/contrat/info.php     | 11 +++++++++++
 htdocs/contrat/note.php     |  4 ++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 64050c3512d..1b81d9d13f6 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -49,8 +49,13 @@ $result=restrictedArea($user,'contrat',$id);
 
 $object = new Contrat($db);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('contractcard','globalcard'));
 
-// Add new contact
+
+/*
+ * Actions
+ */
 
 if ($action == 'addcontact' && $user->rights->contrat->creer)
 {
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 32fcd5a64bd..4bc2747a829 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -77,10 +77,14 @@ if ($object->id > 0)
 $upload_dir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart='contract';
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('contractcard','globalcard'));
+
 
 /*
  * Actions
  */
+
 include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
 
 
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 10f31ac1612..b6c92eac27e 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -41,6 +41,17 @@ $ref		= GETPOST('ref','alpha');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contrat', $id, '');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('contractcard','globalcard'));
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
 
 /*
  * View
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 9a6d28dd4c9..ab76d9aaec3 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -49,6 +49,10 @@ $object->fetch($id,$ref);
 
 $permissionnote=$user->rights->contrat->creer;	// Used by the include of actions_setnotes.inc.php
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('contractcard','globalcard'));
+
+
 
 /*
  * Actions

From bf36f008977eccb183d69efbf6be11dbc4fae975 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 17:48:58 +0100
Subject: [PATCH 284/386] Update html.formfile.class.php

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b7b94e7e644..bd9571fee3b 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -851,9 +851,16 @@ class FormFile
 		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
 		// Get object entity
-		preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir).'$/', $filedir, $regs);
-		$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : $conf->entity);
-
+		if (empty($conf->multicompany->enabled))
+		{
+			$entity = $conf->entity;
+		}
+		else
+		{
+			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir).'$/', $filedir, $regs);
+			$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : $conf->entity);
+		}
+		
 		$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
 
 		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)

From 48b578b9f2faf0ddc84a2a15b5f774e2a673d959 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 17:51:21 +0100
Subject: [PATCH 285/386] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 90747f0675b..fb90498cf4c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4495,7 +4495,7 @@ abstract class CommonObject
 			{
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:'');
+			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
 		}
 		else
 		{

From 45418769b196b2c97420357a75fc382f30e3e15f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Mar 2018 18:11:03 +0100
Subject: [PATCH 286/386] Update expeditionbatch.class.php

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

diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 8599617e318..d94baee2a43 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -59,14 +59,14 @@ class ExpeditionLineBatch extends CommonObject
 	function fetchFromStock($id_stockdluo)
 	{
         $sql = "SELECT";
+	$sql.= " pb.batch,";
 	$sql.= " pl.sellby,";
 	$sql.= " pl.eatby,";
-	$sql.= " pl.batch,";
 	$sql.= " ps.fk_entrepot";
 
         $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
         $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
-        $sql.= ' JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
 	$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

From fecdff809862b696507ced95a6176c9cdd8c6d4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Mar 2018 03:17:45 +0100
Subject: [PATCH 287/386] CSS

---
 htdocs/theme/eldy/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3cfa1bf01e6..c34f867348a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3081,7 +3081,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 .boxstats {
     padding: 3px;
-    width: 104px;
+    width: 121px;
 }
 .boxstats130 {
     width: 158px;

From d6b782e5efcc798ff65edd896bb33835c351eae2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Mar 2018 11:22:15 +0100
Subject: [PATCH 288/386] FIX Infinite loop on deletion of temp file when there
 is symbolic links

---
 htdocs/admin/tools/purge.php      | 2 +-
 htdocs/core/class/utils.class.php | 2 +-
 htdocs/core/lib/files.lib.php     | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index bc328e951d4..f415ed1692c 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -86,7 +86,7 @@ if (! empty($conf->syslog->enabled))
 	$filelogparam=$filelog;
 	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
 	{
-	   $filelogparam ='<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
+	   $filelogparam ='<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
 	   $filelogparam.=basename($filelog);
 	   $filelogparam.='">'.$filelog.'</a>';
 	}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 4502eb03240..7d5f742a779 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -67,7 +67,7 @@ class Utils
 			// Delete temporary files
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root,"directories",1,'^temp$','','','',2);
+				$filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', '', '', 2, 0, '', 1);	// Do not follow symlinks
 				if ($choice == 'tempfilesold')
 				{
 					$now = dol_now();
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 529f58dbbf1..5fa1eef045c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -52,10 +52,11 @@ function dol_basename($pathfile)
  *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  *  @param	int			$nohook			Disable all hooks
  *  @param	string		$relativename	For recursive purpose only. Must be "" at first call.
+ *  @param	string		$donotfollowsymlinks	Do not follow symbolic links
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="")
+function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="", $donotfollowsymlinks=0)
 {
 	global $db, $hookmanager;
 	global $object;
@@ -159,7 +160,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 						// if we're in a directory and we want recursive behavior, call this function again
 						if ($recursive)
 						{
-							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file));
+							if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
+							{
+								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
+								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
+							}
 						}
 					}
 					else if (! $isdir && (($types == "files") || ($types == "all")))

From 01b0336e9bfef0038de0ed7eb9741ef492f69296 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Mar 2018 12:10:27 +0100
Subject: [PATCH 289/386] Fix tooltip on delete button

---
 htdocs/langs/en_US/projects.lang |  1 +
 htdocs/projet/tasks/task.php     |  2 +-
 htdocs/theme/eldy/style.css.php  | 15 +++++++--------
 htdocs/theme/md/style.css.php    |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 5f71b230537..a064d032083 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -100,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
 ChildOfProjectTask=Child of project/task
 ChildOfTask=Child of task
+TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 85a6461fbfb..b70c09cb2bd 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -586,7 +586,7 @@ if ($id > 0 || ! empty($ref))
 				    }
 				    else
 				    {
-				        print '<a class="butActionRefused" href="#" title="'.$langs->trans("ProjecHasChild").'">'.$langs->trans('Delete').'</a>';
+				        print '<a class="butActionRefused" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				    }
 				}
 				else
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c34f867348a..311012c4b04 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3079,15 +3079,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	overflow: hidden;
     text-overflow: ellipsis;
 }
-.boxstats {
-    padding: 3px;
-    width: 121px;
-}
 .boxstats130 {
     width: 158px;
     height: 48px;
     padding: 3px
 }
+.boxstats {
+    padding: 3px;
+    width: 121px;
+}
 .boxstatscontent {
 	padding: 3px;
 }
@@ -3096,9 +3096,8 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 {
 	.boxstats, .boxstats130 {
 		margin: 3px;
-	    border: 1px solid #ddd;
-    	box-shadow: none;
-    	background: #ddd;
+	    border: 1px solid #ccc;
+    	box-shadow: 1px 1px 5px #bbb;
     }
     .boxstats130 {
     	text-align: <?php echo $left; ?>
@@ -3117,7 +3116,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     	width: 148px;
     }
     .boxstats {
-        width: 100px;
+        width: 111px;
     }
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index de12d09b121..94dc4235641 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1208,7 +1208,7 @@ div.fiche {
 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'22':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
@@ -2739,7 +2739,7 @@ div.pagination li span:focus {
     color: #000;
     background-color: #eee;
     border-color: #ddd;
-  	padding-top: 8px;
+  	/* padding-top: 8px; */
 }
 div.pagination li .active a,
 div.pagination li .active span,

From 7b9aee4af092efb1fdd46c831b7eee471caa1c5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 01:21:56 +0100
Subject: [PATCH 290/386] CSS

---
 htdocs/theme/eldy/style.css.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 311012c4b04..41477d929bf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -833,20 +833,24 @@ div.fiche>div.tabBar>form>div.div-table-responsive {
     flex-flow: row wrap;
     justify-content: flex-start;
 }
-.thumbstat {
+/*.thumbstat {
 	flex: 1 1 116px;
-}
+}*/
 .thumbstat150 {
 	flex: 1 1 170px;
 }
 .thumbstat, .thumbstat150 {
-    /* flex-grow: 1; */
-    /* flex-shrink: 1; */
-    /* flex-basis: 140px; */
+    /*
+    flex-shrink: 1;
+    flex-basis: 140px;
 	display: inline;
     width: 100%;
     justify-content: flex-start;
     align-self: flex-start;
+    */
+    flex-grow: 1;
+    flex-shrink: 0;
+    min-width: 150px;
 }
 
 select.selectarrowonleft {
@@ -3097,7 +3101,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	.boxstats, .boxstats130 {
 		margin: 3px;
 	    border: 1px solid #ccc;
-    	box-shadow: 1px 1px 5px #bbb;
+    	box-shadow: none;
     }
     .boxstats130 {
     	text-align: <?php echo $left; ?>

From 5839cedb4cee60ef9abe6860872d5a37bed499b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 10:47:35 +0100
Subject: [PATCH 291/386] CSS

---
 htdocs/index.php                | 28 +++++++++++++--------------
 htdocs/theme/eldy/style.css.php | 34 +++++++++++++++++++++------------
 htdocs/theme/md/style.css.php   |  6 +++---
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 3eb1aa2285a..29e716d31ad 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -339,14 +339,14 @@ if (empty($user->societe_id))
 	    }
     }
 
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
 
     $boxstat.='</td></tr>';
     $boxstat.='</table>';
@@ -583,12 +583,12 @@ if (! empty($valid_dashboardlines))
         $boxwork .="\n";
     }
 
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
     $boxwork .='</td></tr>';
 }
 else
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 41477d929bf..d438a8c9d57 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -833,21 +833,13 @@ div.fiche>div.tabBar>form>div.div-table-responsive {
     flex-flow: row wrap;
     justify-content: flex-start;
 }
-/*.thumbstat {
-	flex: 1 1 116px;
-}*/
+.thumbstat {
+    min-width: 150px;
+}
 .thumbstat150 {
-	flex: 1 1 170px;
+    min-width: 170px;
 }
 .thumbstat, .thumbstat150 {
-    /*
-    flex-shrink: 1;
-    flex-basis: 140px;
-	display: inline;
-    width: 100%;
-    justify-content: flex-start;
-    align-self: flex-start;
-    */
     flex-grow: 1;
     flex-shrink: 0;
     min-width: 150px;
@@ -3095,6 +3087,20 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .boxstatscontent {
 	padding: 3px;
 }
+.boxstatsempty {
+    width: 121px;
+    padding-left: 3px;
+    padding-right: 3px;
+    margin-left: 8px;
+    margin-right: 8px;
+}
+.boxstats150empty {
+    width: 158px;
+    padding-left: 3px;
+    padding-right: 3px;
+    margin-left: 8px;
+    margin-right: 8px;
+}
 
 @media only screen and (max-width: 767px)
 {
@@ -3122,6 +3128,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     .boxstats {
         width: 111px;
     }
+    .boxstatsempty {
+    	width: 111px;
+	}
+
 }
 
 .boxstats:hover {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 94dc4235641..5b4040b0501 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -153,7 +153,7 @@ 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'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
 }
 
-//if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
+if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
 
 
 // Set text color to black or white
@@ -3184,8 +3184,8 @@ span.dashboardlineko {
 	text-align: center;
 }
 .boxworkingboard .tdboxstats {
-	padding-left: 0px !important;
-	padding-right: 0px !important;
+	padding-left: 1px !important;
+	padding-right: 1px !important;
 }
 a.valignmiddle.dashboardlineindicator {
     line-height: 30px;

From 6338328c900df5e46d05e732d5a703c463f94b52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 11:09:53 +0100
Subject: [PATCH 292/386] Fix scrutinizer errors

---
 .../boxes/box_graph_invoices_permonth.php     |  2 +
 .../core/class/commondocgenerator.class.php   |  2 +-
 htdocs/core/class/commonobject.class.php      |  3 +-
 htdocs/core/class/extrafields.class.php       |  1 +
 htdocs/core/class/html.formactions.class.php  |  1 +
 htdocs/core/class/html.formwebsite.class.php  |  7 ++-
 htdocs/core/lib/admin.lib.php                 |  5 ++-
 htdocs/core/lib/website.lib.php               |  1 +
 htdocs/societe/class/societe.class.php        | 45 +++++++++----------
 htdocs/website/class/website.class.php        |  2 +-
 10 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 4c95d446f8a..d665d70da56 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -91,6 +91,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 		if ($user->rights->facture->lire)
 		{
+			$mesg = '';
+
 			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f5a16aa540b..a4ea3a70447 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -319,7 +319,7 @@ abstract class CommonDocGenerator
 
     	foreach($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
     		else $newval = $val;
     		$array_other['__['.$key.']__'] = $newval;
     	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c7335298bdd..fe4eaffc177 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4691,7 +4691,8 @@ abstract class CommonObject
 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
-			   				$algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));
+			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])
+			   				$algo=reset($tmparrays);
 			   				if ($algo != '')
 			   				{
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4477a4812da..861848e6924 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -235,6 +235,7 @@ class ExtraFields
 				$lengthdb='11';
 			} elseif ($type=='html') {
 				$typedb='text';
+				$lengthdb=$length;
 			} elseif($type=='password') {
 				$typedb='varchar';
 				$lengthdb='128';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 2d66661c839..f254fe44b9d 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -194,6 +194,7 @@ class FormActions
             $projectid = $object->fk_project;
             if ($typeelement == 'project') $projectid = $object->id;
 
+            $buttontoaddnewevent='';
 			if (! empty($conf->agenda->enabled))
 			{
 				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index e7cd6d447a0..86e0f48c65f 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -164,7 +164,7 @@ class FormWebsite
      *
      *  @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  int		$useempty          	1=Add an empty value in list
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
@@ -177,9 +177,9 @@ class FormWebsite
     	$arrayofsamples=array('corporatehome'=>'CorporateHomePage', 'empty'=>'EmptyPage');
 
     	$out = '';
-
     	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-    	if ($useempty == 1 || ($useempty == 2 && $num > 1))
+
+    	if ($useempty == 1 || $useempty == 2)
     	{
     		$out .= '<option value="-1">&nbsp;</option>';
     	}
@@ -196,7 +196,6 @@ class FormWebsite
     		}
     		$out .= $langs->trans($val);
     		$out .= '</option>';
-    		$i++;
     	}
     	$out .= "</select>";
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index fcc3098c730..0f219a032cc 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1288,9 +1288,10 @@ function complete_elementList_with_modules(&$elementList)
 
                             $modules[$i] = $objMod;
                             $filename[$i]= $modName;
-                            $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
+                            $orders[$i]  = $objMod->family."_".$j;   // Sort on family then module number
+                            $dirmod[$i] = $dir;
                             //print "x".$modName." ".$orders[$i]."\n<br>";
-                            $dirmod[$i] = $dirroot;
+
                             if (! empty($objMod->module_parts['contactelement']))
                             {
                             	$elementList[$objMod->name] = $langs->trans($objMod->name);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 82e9a98d43f..50716c27aca 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -177,6 +177,7 @@ function redirectToContainer($containerref, $containeraliasalt='',$containerid=0
 	global $db, $website;
 
 	$newurl = '';
+	$result=0;
 
 	// We make redirect using the alternative alias, we must find the real $containerref
 	if ($containeraliasalt)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 48c35c7143e..db614ed833e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1169,7 +1169,7 @@ class Societe extends CommonObject
 		$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.nom_alias = '".$this->db->escape($nom_alias)."'";
+		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
 		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
 		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
 		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
@@ -2833,10 +2833,10 @@ class Societe extends CommonObject
 
 			//Check NIF
 			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;
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+				return 1;
+				else
+				return -1;
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
@@ -2846,31 +2846,31 @@ class Societe extends CommonObject
 
 			//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))
-			return 1;
-			else
-			return -1;
+				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+				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))
-			return 2;
-			else
-			return -2;
+				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+				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))
-			return 3;
-			else
-			return -3;
+				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+				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))
-			return 3;
-			else
-			return -3;
+				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;
 
 			//Can not be verified
 			return -4;
@@ -2894,9 +2894,6 @@ class Societe extends CommonObject
 			else {
 				return -1;
 			}
-
-			//Wrong format
-			return 0;
 		}
 
 		return $ok;
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 3574c95e470..5a46425cb66 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -616,7 +616,7 @@ class Website extends CommonObject
 
 		    	// Generate the index.php page to be the home page
 		    	//-------------------------------------------------
-		    	$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl);
+		    	$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl);
 		    }
 		}
 

From 82fd84fb484fc4ee23bfb3437a5cced5b8e988d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 11:22:43 +0100
Subject: [PATCH 293/386] Fix scrutinizer errors

---
 htdocs/compta/facture/fiche-rec.php           |  2 +-
 .../compta/localtax/class/localtax.class.php  | 30 +++++++++----------
 htdocs/core/class/commonobject.class.php      |  6 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index e1b5af4e88d..8d955f1141d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1189,7 +1189,7 @@ if ($action == 'create')
 			$disableedit=1;
 			$disablemove=1;
 			$disableremove=1;
-			$ret = $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
+			$object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
 		}
 
 		print "</table>\n";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 570942590c2..79a88d11c4d 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -132,7 +132,7 @@ class Localtax extends CommonObject
      *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
      *	@return		int						<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update(User $user, $notrigger=0)
     {
     	global $conf, $langs;
 
@@ -149,8 +149,8 @@ class Localtax extends CommonObject
 		$this->db->begin();
 
 		// Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
-        $sql.= " localtaxtype=".$this->ltt.",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
+		$sql.= " localtaxtype=".$this->ltt.",";
 		$sql.= " tms='".$this->db->idate($this->tms)."',";
 		$sql.= " datep='".$this->db->idate($this->datep)."',";
 		$sql.= " datev='".$this->db->idate($this->datev)."',";
@@ -160,7 +160,7 @@ class Localtax extends CommonObject
 		$sql.= " fk_bank=".$this->fk_bank.",";
 		$sql.= " fk_user_creat=".$this->fk_user_creat.",";
 		$sql.= " fk_user_modif=".$this->fk_user_modif;
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -255,12 +255,12 @@ class Localtax extends CommonObject
     }
 
 
- 	/**
- 	 *	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
+	 */
 	function delete($user)
 	{
 		// Call trigger
@@ -285,11 +285,11 @@ class Localtax 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
 	 */
 	function initAsSpecimen()
 	{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fe4eaffc177..4179863400c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2739,7 +2739,7 @@ abstract class CommonObject
 	 *	@param  string	$targettype		Object target type (if not defined, elemennt name of object)
 	 *	@param  string	$clause			'OR' or 'AND' clause used when both source id and target id are provided
 	 *  @param	int		$alsosametype	0=Return only links to object that differs from source. 1=Include also link to objects of same type.
-	 *	@return	void
+	 *	@return	int						<0 if KO, >0 if OK
 	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
 	 */
 	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1)
@@ -2920,10 +2920,12 @@ abstract class CommonObject
 					}
 				}
 			}
+			return 1;
 		}
 		else
 		{
 			dol_print_error($this->db);
+			return -1;
 		}
 	}
 
@@ -3582,7 +3584,7 @@ abstract class CommonObject
 	 *	Return HTML table for object lines
 	 *	TODO Move this into an output class file (htmlline.class.php)
 	 *	If lines are into a template, title must also be into a template
-	 *	But for the moment we don't know if it'st possible as we keep a method available on overloaded objects.
+	 *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
 	 *
 	 *	@param	string		$action				Action code
 	 *	@param  string		$seller            	Object of seller third party

From e574ec4bf14507f0b09781d70d44246dde69379e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 11:28:01 +0100
Subject: [PATCH 294/386] Fix backward compatibility

---
 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 4179863400c..378898e0607 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4520,6 +4520,7 @@ abstract class CommonObject
 		}
 		else
 		{
+			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
 

From 9355c5a8d79eb6ec14c07b82eafc20e531b192ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 11:31:57 +0100
Subject: [PATCH 295/386] Fix scrutinizer

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 378898e0607..7e565e0222f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4694,7 +4694,7 @@ abstract class CommonObject
 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
-			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])
+			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
 			   				$algo=reset($tmparrays);
 			   				if ($algo != '')
 			   				{

From d8b2d1f8c283e5b1f05bed2bfbec50a7ff204614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 12:11:28 +0100
Subject: [PATCH 296/386] Add example of test credit card

---
 htdocs/langs/en_US/main.lang         | 1 +
 htdocs/langs/en_US/stripe.lang       | 3 ++-
 htdocs/public/payment/newpayment.php | 2 +-
 htdocs/public/stripe/newpayment.php  | 2 +-
 htdocs/stripe/admin/stripe.php       | 2 ++
 htdocs/theme/eldy/style.css.php      | 7 ++++---
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 0fd9fe52b3e..67dce721afe 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -707,6 +707,7 @@ WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only l
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
+ValidatePayment=Validate payment
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index ff6b4a58608..2b5823c28fb 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -38,4 +38,5 @@ STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
\ No newline at end of file
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
\ No newline at end of file
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 74ffcfd120a..dc9bbad1188 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1442,7 +1442,7 @@ if (preg_match('/^dopayment/',$action))
 	    <div id="card-errors" role="alert"></div>
 	    </div>
 	    <br>
-	    <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
+	    <button class="button" id="buttontopay">'.$langs->trans("ValidatePayment").'</button>
 	    <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
 	    </td></tr></tbody></table>
 
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 36cd64b4f01..ff1b03187c1 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -1168,7 +1168,7 @@ if (preg_match('/^dopayment/',$action))
     <div id="card-errors" role="alert"></div>
     </div>
     <br>
-    <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
+    <button class="button" id="buttontopay">'.$langs->trans("ValidatePayment").'</button>
     <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
     </td></tr></tbody></table>
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index c658e19fa20..5762c54a698 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -253,6 +253,8 @@ $token='';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242', '4000000000000101', '4000000000000069', '4000000000000341'));
+
 if (! empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d438a8c9d57..bfd1b75ac91 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -356,23 +356,24 @@ input.buttonpayment {
 	line-height: 24px;
 	padding: 8px;
 	background: none;
-	padding-left: 30px;
+	padding-left: 38px;
 	text-align: <?php echo $left; ?>;
 	border: 1px solid #ddd;
 	background-color: #eee;
 	white-space: normal;
+	box-shadow: 1px 1px 8px #bbb;
 }
 input.buttonpaymentcb {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
 	background-size: 26px;
 	background-repeat: no-repeat;
-	background-position: 2px 11px;
+	background-position: 5px 11px;
 }
 input.buttonpaymentcheque {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
 	background-size: 24px;
 	background-repeat: no-repeat;
-	background-position: 2px 8px;
+	background-position: 5px 8px;
 }
 input.buttonpaymentpaypal {
 	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);

From 864edce66595e6715e44b742c6311084c70d9732 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2018 19:39:46 +0100
Subject: [PATCH 297/386] NEW Accept anonmymous events (no user assigned) NEW
 Online payment now record the payment on invoices

---
 htdocs/admin/agenda_extsites.php              |   2 +
 htdocs/blockedlog/class/blockedlog.class.php  |   3 +-
 htdocs/comm/action/class/actioncomm.class.php |   2 +-
 htdocs/compta/paiement.php                    |   4 +-
 .../compta/paiement/class/paiement.class.php  |   3 +-
 .../paiement/{avalider.php => tovalidate.php} |   4 +-
 htdocs/core/class/html.form.class.php         |   3 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/langs/en_US/main.lang                  |   1 +
 htdocs/langs/en_US/paypal.lang                |   3 +-
 htdocs/paybox/admin/paybox.php                |  11 +
 htdocs/paypal/admin/paypal.php                |   9 +
 htdocs/paypal/lib/paypal.lib.php              | 114 ++++++--
 htdocs/public/payment/newpayment.php          |  19 +-
 htdocs/public/payment/paymentok.php           | 274 +++++++++++++++---
 htdocs/public/paypal/newpayment.php           |   2 +-
 htdocs/stripe/admin/stripe.php                |  12 +-
 17 files changed, 382 insertions(+), 86 deletions(-)
 rename htdocs/compta/paiement/{avalider.php => tovalidate.php} (96%)

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index dc995a4f88b..4c1b49d75e6 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -48,9 +48,11 @@ $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 // List of aviable colors
 $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5');
 
+
 /*
  * Actions
  */
+
 if ($actionsave)
 {
     $db->begin();
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 3dc3ade52e5..3d41aba340a 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -667,11 +667,12 @@ class BlockedLog
 			return -2;
 		}
 
-		if (empty($this->action) || empty($this->fk_user) || empty($this->user_fullname)) {
+		if (empty($this->action)) {
 			$this->error=$langs->trans("BadParameterWhenCallingCreateOfBlockedLog");
 			dol_syslog($this->error, LOG_WARNING);
 			return -3;
 		}
+		if (empty($this->fk_user)) $this->user_fullname='(Anonymous)';
 
 		$this->date_creation = dol_now();
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index ed0950826b8..f0bb9f92e22 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -212,7 +212,7 @@ class ActionComm extends CommonObject
         $now=dol_now();
 
         // Check parameters
-        if (empty($this->userownerid))
+        if (! isset($this->userownerid) || $this->userownerid === '')	// $this->userownerid may be 0 (anonymous event) of > 0
         {
             dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
         	$this->errors[]='ErrorPropertyUserowneridNotDefined';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 11751fe258b..4f17a4444f5 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -88,11 +88,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
+	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
 	    $error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
 	    $paiement_id = 0;
 	    $totalpayment = 0;
 		$multicurrency_totalpayment = 0;
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 42106c1cb13..4d23637dfe7 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -209,9 +209,10 @@ class Paiement extends CommonObject
 			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			$mtotal = $totalamount;
 		}
+		$note = ($this->note_public?$this->note_public:$this->note);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
-		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
+		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($note)."', ".$user->id.")";
 
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/tovalidate.php
similarity index 96%
rename from htdocs/compta/paiement/avalider.php
rename to htdocs/compta/paiement/tovalidate.php
index beb2fb77ecd..7e16b525233 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -17,9 +17,9 @@
  */
 
 /**
- * 	\file       htdocs/compta/paiement/avalider.php
+ * 	\file       htdocs/compta/paiement/tovalidate.php
  * 	\ingroup    compta
- * 	\brief      Page liste des paiements a valider des factures clients
+ * 	\brief      Page list payment to validate. Visible in menu when option BILL_ADD_PAYMENT_VALIDATION is on.
  */
 
 require '../../main.inc.php';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index df26e44e080..7b74fc05850 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3421,7 +3421,8 @@ class Form
 			}
 			else
 			{
-				print $langs->trans("NoActiveBankAccountDefined");
+				if ($statut == 0) print $langs->trans("NoActiveBankAccountDefined");
+				else print $langs->trans("NoBankAccountFound");
 			}
 		}
 		else {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1237b72f826..000c228ef8e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -818,7 +818,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 				{
-					$newmenu->add("/compta/paiement/avalider.php?leftmenu=customers_bills_tovalid",$langs->trans("MenuToValid"),2,$user->rights->facture->lire,'',$mainmenu,'customer_bills_tovalid');
+					$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');
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 67dce721afe..1e6f9478313 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -708,6 +708,7 @@ CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
 ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index e1db55d5668..aec7404924b 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -30,4 +30,5 @@ ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
\ No newline at end of file
+PaypalImportPayment=Import Paypal payments
+PostActionAfterPayment=Post actions after payments
\ No newline at end of file
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 79a6a62ad2a..1db6c1906a3 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -55,6 +55,8 @@ if ($action == 'setvalue' && $user->admin)
 	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",GETPOST('PAYBOX_PBX_IDENTIFIANT','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, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS",GETPOST('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS','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);
 	if (! $result > 0) $error++;
@@ -183,6 +185,15 @@ print '<br>'.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
 
+if (! empty($conf->banque->enabled))
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '</td></tr>';
+}
+
+
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 711f898901c..23bf26d375f 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -55,6 +55,8 @@ if ($action == 'setvalue' && $user->admin)
     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);
@@ -210,6 +212,13 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
+if (! empty($conf->banque->enabled))
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '</td></tr>';
+}
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index ecdd2f4fc3e..dc2e95c44da 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -192,7 +192,7 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
  * @param  	string	$returnURL			Url to use if payment is OK
  * @param   string	$cancelURL			Url to use if payment is KO
  * @param   string	$tag				Full tag
- * @return	void
+ * @return	string						No return (a redirect is done) if OK, or Error message if KO
  */
 function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$returnURL,$cancelURL,$tag)
 {
@@ -272,11 +272,20 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
         $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
         $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
-        echo $langs->trans('SetExpressCheckoutAPICallFailed') . "<br>\n";
-        echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-        echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-        echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-        echo $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;
     }
 
 }
@@ -300,6 +309,7 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
  *      phoneNum:           the phoneNum  entered on the merchant's site
  *      email:              the buyer email
  *      desc:               Product description
+ * See https://developer.paypal.com/docs/classic/api/merchant/SetExpressCheckout_API_Operation_NVP/
  *
  * @param 	double 			$paymentAmount		Payment amount
  * @param 	string 			$currencyCodeType	Currency
@@ -307,8 +317,8 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
  * @param 	string 			$returnURL			Return Url
  * @param 	string 			$cancelURL			Cancel Url
  * @param 	string 			$tag				Full tag
- * @param 	string 			$solutionType		Type
- * @param 	string 			$landingPage		Landing page
+ * @param 	string 			$solutionType		Type ('Mark' or 'Sole')
+ * @param 	string 			$landingPage		Landing page ('Login' or 'Billing')
  * @param	string			$shipToName			Ship to name
  * @param	string			$shipToStreet		Ship to street
  * @param	string			$shipToCity			Ship to city
@@ -327,38 +337,86 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
 
     //declaring of global variables
-    global $conf, $langs;
+    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 . "&AMT=". urlencode($paymentAmount);                // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr . "&PAYMENTACTION=" . urlencode($paymentType);       // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
+    $nvpstr = $nvpstr . "&VERSION=98.0";
     $nvpstr = $nvpstr . "&RETURNURL=" . urlencode($returnURL);
     $nvpstr = $nvpstr . "&CANCELURL=" . urlencode($cancelURL);
-    $nvpstr = $nvpstr . "&CURRENCYCODE=" . urlencode($currencyCodeType);    // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
-    $nvpstr = $nvpstr . "&ADDROVERRIDE=1";
-    //$nvpstr = $nvpstr . "&ALLOWNOTE=0";
-    $nvpstr = $nvpstr . "&SHIPTONAME=" . urlencode($shipToName);            // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
-    $nvpstr = $nvpstr . "&SHIPTOSTREET=" . urlencode($shipToStreet);        //
-    $nvpstr = $nvpstr . "&SHIPTOSTREET2=" . urlencode($shipToStreet2);
-    $nvpstr = $nvpstr . "&SHIPTOCITY=" . urlencode($shipToCity);
-    $nvpstr = $nvpstr . "&SHIPTOSTATE=" . urlencode($shipToState);
-    $nvpstr = $nvpstr . "&SHIPTOCOUNTRYCODE=" . urlencode($shipToCountryCode);
-    $nvpstr = $nvpstr . "&SHIPTOZIP=" . urlencode($shipToZip);
-    $nvpstr = $nvpstr . "&PHONENUM=" . urlencode($phoneNum);
+    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);
-    //$nvpstr = $nvpstr . "&CUSTOMERSERVICENUMBER=" . urlencode($tag);    // Hotline phone number
-    $nvpstr = $nvpstr . "&INVNUM=" . urlencode($tag);
-    if (! empty($email)) $nvpstr = $nvpstr . "&EMAIL=" . urlencode($email);
-    if (! empty($desc))  $nvpstr = $nvpstr . "&DESC=" . urlencode($desc);        // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
+    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 = '';
+	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."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
+
+    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
+
+	    $urllogo=$urlwithroot."/viewimage.php?modulepart=mycompany&file=".$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;
-    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR '];  // Payer ip
+    $_SESSION["PaymentType"] = $paymentType;			// 'Mark', 'Sole'
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];   // Payer ip
 
     //'---------------------------------------------------------------------------------------------------------------
     //' Make the API call to PayPal
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index dc9bbad1188..350a73d3571 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -264,6 +264,7 @@ else if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$param
  * Actions
  */
 
+// Action dopayment is called after choosing the payment mode
 if ($action == 'dopayment')
 {
 	if ($paymentmethod == 'paypal')
@@ -310,6 +311,7 @@ if ($action == 'dopayment')
 			dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+			// All those fields may be empty when making a payment for a free amount for example
 			dol_syslog("shipToName: $shipToName", LOG_DEBUG);
 			dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
 			dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
@@ -327,9 +329,10 @@ if ($action == 'dopayment')
 			//$_SESSION["FinalPaymentAmt"]=$PAYPAL_API_PRICE;
 
 			// A redirect is added if API call successfull
-			print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+			$mesg = print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
 
-			exit;
+			// If we are here, it means the Paypal redirect was not done, so we show error message
+			$action = '';
 		}
 	}
 
@@ -379,10 +382,12 @@ if ($action == 'dopayment')
 // Called when choosing Stripe mode, after the 'dopayment'
 if ($action == 'charge')
 {
+	$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)) $amount=$amount * 100;
+	if (! in_array($currency, $arrayzerounitcurrency)) $amountstripe=$amountstripe * 100;
 
 	dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
@@ -411,7 +416,7 @@ if ($action == 'charge')
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 		$charge = \Stripe\Charge::create(array(
 		'customer' => $customer->id,
-		'amount'   => price2num($amount, 'MU'),
+		'amount'   => price2num($amountstripe, 'MU'),
 		'currency' => $currency,
 		'description' => 'Stripe payment: '.$FULLTAG,
 		'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name),
@@ -850,7 +855,7 @@ if ($source == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentAmount");
 	if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($object->paye))
@@ -1432,7 +1437,7 @@ if (preg_match('/^dopayment/',$action))
 
 	    <div class="form-row left">
 	    <label for="card-element">
-	    Credit or debit card
+	    '.$langs->trans("CreditOrDebitCard").'
 	    </label>
 	    <div id="card-element">
 	    <!-- a Stripe Element will be inserted here. -->
@@ -1442,7 +1447,7 @@ if (preg_match('/^dopayment/',$action))
 	    <div id="card-errors" role="alert"></div>
 	    </div>
 	    <br>
-	    <button class="button" id="buttontopay">'.$langs->trans("ValidatePayment").'</button>
+	    <button class="butAction" id="buttontopay">'.$langs->trans("ValidatePayment").'</button>
 	    <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
 	    </td></tr></tbody></table>
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d74305890df..7e5413e6509 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -44,13 +44,7 @@ if (! empty($conf->paypal->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("paybox");
-$langs->load("paypal");
+$langs->loadLangs(array("main","other","dict","bills","companies","paybox","paypal"));
 
 // Clean parameters
 if (! empty($conf->paypal->enabled))
@@ -130,6 +124,8 @@ $object = new stdClass();   // For triggers
  * View
  */
 
+$now = dol_now();
+
 dol_syslog("Callback url when a payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_payment');
 
 $tracepost = "";
@@ -183,7 +179,7 @@ if ($urllogo)
 
 if (! empty($conf->paypal->enabled))
 {
-	if ($paymentmethod == 'paypal')
+	if ($paymentmethod == 'paypal')							// We call this page only if payment is ok on payment system
 	{
 		if ($PAYPALTOKEN)
 		{
@@ -251,28 +247,187 @@ if (! empty($conf->paypal->enabled))
 
 if (! empty($conf->paybox->enabled))
 {
-	if ($paymentmethod == 'paybox') $ispaymentok = true;	// We call this page only if payment is ok
+	if ($paymentmethod == 'paybox') $ispaymentok = true;	// We call this page only if payment is ok on payment system
 }
 
 if (! empty($conf->stripe->enabled))
 {
-	if ($paymentmethod == 'stripe') $ispaymentok = true;	// We call this page only if payment is ok
+	if ($paymentmethod == 'stripe') $ispaymentok = true;	// We call this page only if payment is ok on payment system
 }
 
 
+// If data not provided from back url, search them into the session env
+if (empty($ipaddress))       $ipaddress       = $_SESSION['ipaddress'];
+if (empty($TRANSACTIONID))   $TRANSACTIONID   = $_SESSION['TRANSACTIONID'];
+if (empty($FinalPaymentAmt)) $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+if (empty($paymentType))     $paymentType     = $_SESSION["paymentType"];
+
+$fulltag            = $FULLTAG;
+$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+
+
+// Make complementary actions
+$ispostactionok = 0;
+$postactionmessages = array();
+if ($ispaymentok)
+{
+	if (in_array('MEM', array_keys($tmptag)))
+	{
+		// Record subscription
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$member = new Adherent($db);
+		$result = $member->fetch(0, $tmptag['MEM']);
+		if ($result)
+		{
+			if (empty($paymentType)) $paymentType = 'CB';
+			$paymentTypeId      = dol_getIdFromCode($db, $paymentType,'c_paiement','code','id',1);
+
+			if (! empty($FinalPaymentAmt) && $paymentTypeId > 0)
+			{
+
+
+			}
+			else
+			{
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'];
+				$ispostactionok = -1;
+			}
+		}
+		else
+		{
+			$postactionmessages[] = 'Member for subscription payed '.$tmptag['MEM'].' was not found';
+			$ispostactionok = -1;
+		}
+	}
+	elseif (in_array('INV', array_keys($tmptag)))
+	{
+		// Record payment
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$invoice = new Facture($db);
+		$result = $invoice->fetch(0, $tmptag['INV']);
+		if ($result)
+		{
+			$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') $paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'paypal') $paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'stripe') $paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			if (empty($paymentTypeId))
+			{
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) $paymentType = 'CB';
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType   = $_SESSION['currencyCodeType'];
+
+			if (! empty($FinalPaymentAmt) && $paymentTypeId > 0)
+			{
+				// Creation of payment line
+				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+				$paiement = new Paiement($db);
+				$paiement->datepaye     = $now;
+				if ($currencyCodeType == $conf->currency)
+				{
+					$paiement->amounts      = array($invoice->id => $FinalPaymentAmt);   // Array with all payments dispatching with invoice id
+				}
+				else
+				{
+					$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt);   // Array with all payments dispatching
+
+					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+					$ispostactionok = -1;
+					$error++;	// Not yet supported
+				}
+				$paiement->paiementid   = $paymentTypeId;
+				$paiement->num_paiement = '';
+				$paiement->note_public  = 'Online payment using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID;
+
+				if (! $error)
+				{
+					$paiement_id = $paiement->create($user, 1);    // This include closing invoices and regenerating documents
+					if ($paiement_id < 0)
+					{
+						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+						$ispostactionok = -1;
+						$error++;
+					}
+					else
+					{
+						$postactionmessages[] = 'Payment created';
+						$ispostactionok=1;
+					}
+				}
+
+				if (! $error && ! empty($conf->banque->enabled))
+				{
+					$bankaccountid = 0;
+					if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+					if ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+					if ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+
+					if ($bankaccountid > 0)
+					{
+						$label='(CustomerInvoicePayment)';
+						if ($invoice->type == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)';  // Refund of a credit note
+						$result=$paiement->addPaymentToBank($user,'payment',$label, $bankaccountid, '', '');
+						if ($result < 0)
+						{
+							$postactionmessages[] = $paiement->error.' '.joint("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						}
+						else
+						{
+							$postactionmessages[] = 'Bank entry of payment created';
+							$ispostactionok=1;
+						}
+					}
+					else
+					{
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. Not way to record the payment.';
+						$ispostactionok = -1;
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					$db->commit();
+				}
+				else
+				{
+					$db->rollback();
+				}
+			}
+			else
+			{
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'];
+				$ispostactionok = -1;
+			}
+		}
+		else
+		{
+			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
+			$ispostactionok = -1;
+		}
+	}
+	else
+	{
+		// Nothing done
+	}
+}
+
 if ($ispaymentok)
 {
     // Get on url call
-    $fulltag            = $FULLTAG;
     $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
     $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
     $currencyCodeType   = $_SESSION['currencyCodeType'];
     $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-    $TRANSACTIONID      = $_SESSION['TRANSACTIONID'];
 
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -296,6 +451,10 @@ if ($ispaymentok)
 	// Send an email
     if ($sendemail)
 	{
+		$companylangs = new Translate('', $conf);
+		$companylangs->setDefaultLang($mysoc->default_lang);
+		$companylangs->loadLangs(array('main','members','bills','paypal','paybox'));
+
 		$sendto=$sendemail;
 		$from=$conf->global->MAILING_EMAIL_FROM;
 		// Define $urlwithroot
@@ -317,25 +476,56 @@ if ($ispaymentok)
 		else $appli.=" ".DOL_VERSION;
 
 		$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
+		$topic='['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 		$content="";
-		if (! empty($tmptag['MEM']))
+		if (in_array('MEM', array_keys($tmptag)))
 		{
-			$langs->load("members");
 			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-			$content.=$langs->trans("PaymentSubscription")."<br>\n";
-			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+			$content.='<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
+			$content.=$companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
+			$content.=$companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		}
+		elseif (in_array('INV', array_keys($tmptag)))
+		{
+			$url=$urlwithroot."/compta/facture/card.php?ref=".$tmptag['INV'];
+			$content.='<strong>'.$companylangs->trans("Payment")."</strong><br><br>\n";
+			$content.=$companylangs->trans("Invoice").': <strong>'.$tmptag['INV']."</strong><br>\n";
+			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
+			$content.=$companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
 		}
 		else
 		{
-			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
+			$content.=$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
+		$content.=$companylangs->transnoentities("PostActionAfterPayment").' : ';
+		if ($ispostactionok > 0)
+		{
+			//$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')';
+			$content.='<font color="green">'.$companylangs->transnoentitiesnoconv("OK").'</font>';
+		}
+		elseif ($ispostactionok == 0)
+		{
+			$content.=$companylangs->transnoentitiesnoconv("None");
+		}
+		else
+		{
+			$topic.=($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
+			$content.='<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
+		}
+		$content.='<br>'."\n";
+		foreach($postactionmessages as $postactionmessage)
+		{
+			$content.=' * '.$postactionmessage.'<br>'."\n";
+		}
+		$content.='<br>'."\n";
+
 		$content.="<br>\n";
-		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		$content.='<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
+		$content.=$companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
+		$content.=$companylangs->transnoentitiesnoconv("TransactionId").': <strong>'.$TRANSACTIONID."</strong><br>\n";
+		$content.=$companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content.="<br>\n";
+		$content.="tag=".$fulltag."<br>\ntoken=".$onlinetoken."<br>\npaymentType=".$paymentType."<br>\ncurrencycodeType=".$currencyCodeType."<br>\npayerId=".$payerID."<br>\nipaddress=".$ipaddress."<br>\nFinalPaymentAmt=".$FinalPaymentAmt."<br>\n";
 
 		$ishtml=dol_textishtml($content);	// May contain urls
 
@@ -356,15 +546,12 @@ if ($ispaymentok)
 else
 {
     // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+	$onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
     $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
     $currencyCodeType   = $_SESSION['currencyCodeType'];
     $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
 
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -389,12 +576,14 @@ else
     if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
     if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
 
-    $tmptag=dolExplodeIntoArray($fulltag,'.','=');
-
     // Send an email
     if ($sendemail)
     {
-        $sendto=$sendemail;
+    	$companylangs = new Translate('', $conf);
+    	$companylangs->setDefaultLang($mysoc->default_lang);
+    	$companylangs->loadLangs(array('main','members','bills','paypal','paybox'));
+
+    	$sendto=$sendemail;
         $from=$conf->global->MAILING_EMAIL_FROM;
         // Define $urlwithroot
         $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -415,14 +604,17 @@ else
         else $appli.=" ".DOL_VERSION;
 
         $urlback=$_SERVER["REQUEST_URI"];
-        $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
+        $topic='['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
         $content="";
-        $content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
-        $content.="\n";
-        $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
-        $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-        $content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+        $content.='<font color="orange">'.$companylangs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."</font>\n";
+
+        $content.="<br>\n";
+        $content.='<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
+        $content.=$companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
+        $content.=$companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+        $content.="<br>\n";
+        $content.="tag=".$fulltag."<br>\ntoken=".$onlinetoken."<br>\npaymentType=".$paymentType."<br>\ncurrencycodeType=".$currencyCodeType."<br>\npayerId=".$payerID."<br>\nipaddress=".$ipaddress."<br>\nFinalPaymentAmt=".$FinalPaymentAmt."<br>\n";
+
 
         $ishtml=dol_textishtml($content);	// May contain urls
 
@@ -448,6 +640,10 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix);
 
 
+// Clean session variables to avoid duplicate actions if post is resent
+unset($_SESSION["FinalPaymentAmt"]);
+unset($_SESSION["TRANSACTIONID"]);
+
 llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index b1ecfa43803..24abc52526c 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -250,7 +250,7 @@ if (GETPOST('action','aZ09') == 'dopayment')
 	    //$_SESSION["FinalPaymentAmt"]=$PAYPAL_API_PRICE;
 
 	    // A redirect is added if API call successfull
-        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+        $mesg = print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
 
 		exit;
 	}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 5762c54a698..8f7a8ae9d86 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -56,7 +56,9 @@ if ($action == 'setvalue' && $user->admin)
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','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++;
+	if (! $result > 0) $error++;
+	$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, "ONLINE_PAYMENT_CSS_URL",GETPOST('ONLINE_PAYMENT_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM','alpha'),'chaine',0,'',$conf->entity);
@@ -195,6 +197,14 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
+if (! empty($conf->banque->enabled))
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '</td></tr>';
+}
+
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';

From 76d8bd517d4170c31ddccfb0ee22b87f5f43f551 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Mon, 5 Mar 2018 08:45:40 +0100
Subject: [PATCH 298/386] Optimise SQL squery

Just a suppress a table and fields not needed
---
 htdocs/user/perms.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b83a6831053..209bc2541a8 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -176,11 +176,9 @@ $db->commit();
 // Lecture des droits utilisateurs
 $permsuser = array();
 
-$sql = "SELECT DISTINCT r.id, r.libelle, r.module";
-$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-$sql.= " ".MAIN_DB_PREFIX."user_rights as ur";
-$sql.= " WHERE ur.fk_id = r.id";
-$sql.= " AND ur.entity = ".$entity;
+$sql = "SELECT DISTINCT ur.fk_id";
+$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
+$sql.= " WHERE ur.entity = ".$entity;
 $sql.= " AND ur.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
@@ -192,7 +190,7 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		array_push($permsuser,$obj->id);
+		array_push($permsuser,$obj->fk_id);
 		$i++;
 	}
 	$db->free($result);
@@ -205,12 +203,10 @@ else
 // Lecture des droits groupes
 $permsgroupbyentity = array();
 
-$sql = "SELECT DISTINCT r.id, r.libelle, r.module, gu.entity";
-$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-$sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
+$sql = "SELECT DISTINCT gr.fk_id, gu.entity";
+$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
 $sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu";
-$sql.= " WHERE gr.fk_id = r.id";
-$sql.= " AND gr.entity = ".$entity;
+$sql.= " WHERE gr.entity = ".$entity;
 $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 $sql.= " AND gu.fk_user = ".$object->id;
 
@@ -225,7 +221,7 @@ if ($result)
 		$obj = $db->fetch_object($result);
 		if (! isset($permsgroupbyentity[$obj->entity]))
 			$permsgroupbyentity[$obj->entity] = array();
-		array_push($permsgroupbyentity[$obj->entity], $obj->id);
+		array_push($permsgroupbyentity[$obj->entity], $obj->fk_id);
 		$i++;
 	}
 	$db->free($result);

From 6a4a3c9e824dc3ca2596929a9e5391589ea46085 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 5 Mar 2018 10:58:19 +0100
Subject: [PATCH 299/386] NEW: supplier credit notes: remove
 MAIN_FEATURES_LEVEL

---
 htdocs/comm/remise.php            |  26 ++--
 htdocs/comm/remx.php              |  35 +++---
 htdocs/fourn/card.php             |  64 +++++-----
 htdocs/fourn/commande/card.php    |  47 ++++----
 htdocs/fourn/facture/card.php     | 194 +++++++++++++++---------------
 htdocs/supplier_proposal/card.php |  47 ++++----
 6 files changed, 196 insertions(+), 217 deletions(-)

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index c961f6f43a7..8fb75c908d4 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -109,10 +109,6 @@ if ($socid > 0)
 
 	$isCustomer = $object->client == 1 || $object->client == 3;
 	$isSupplier = $object->fournisseur == 1;
-	
-	$displayCustomer = $conf->global->MAIN_FEATURES_LEVEL <= 0 || $isCustomer;
-	$displaySupplier = $conf->global->MAIN_FEATURES_LEVEL > 0 && $isSupplier;
-
 
 	print '<form method="POST" action="remise.php?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -127,7 +123,7 @@ if ($socid > 0)
 
     print '<div class="underbanner clearboth"></div>';
     
-    if(! $displayCustomer && ! $displaySupplier) {
+    if(! $isCustomer && ! $isSupplier) {
     	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
     	
     	dol_fiche_end();
@@ -141,13 +137,13 @@ if ($socid > 0)
 
 	print '<table class="border centpercent">';
 
-	if($displayCustomer) {
+	if($isCustomer) {
 		// Customer discount
 		print '<tr><td class="titlefield">';
 		print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";
 	}
 	
-	if($displaySupplier) {
+	if($isSupplier) {
 		// Supplier discount
 		print '<tr><td class="titlefield">';
 		print $langs->trans("SupplierRelativeDiscount").'</td><td>'.price2num($object->remise_supplier_percent)."%</td></tr>";
@@ -160,17 +156,17 @@ if ($socid > 0)
 
 	print '<div class="underbanner clearboth"></div>';
 
-	if($conf->global->MAIN_FEATURES_LEVEL <= 0 || ($isCustomer && ! $isSupplier)) {
+	if($isCustomer && ! $isSupplier) {
 		print '<input type="hidden" name="discount_type" value="0" />';
 	}
 	
-	if($conf->global->MAIN_FEATURES_LEVEL > 0 && (! $isCustomer && $isSupplier)) {
+	if(! $isCustomer && $isSupplier) {
 		print '<input type="hidden" name="discount_type" value="1" />';
 	}
 	
 	print '<table class="border centpercent">';
 
-	if($conf->global->MAIN_FEATURES_LEVEL > 0 && $isCustomer && $isSupplier) {
+	if($isCustomer && $isSupplier) {
 		// Discount type
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';
 		print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
@@ -205,8 +201,8 @@ if ($socid > 0)
 
 	print '<br>';
 
-	if($displayCustomer) {
-		if($displaySupplier) {
+	if($isCustomer) {
+		if($isSupplier) {
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
@@ -263,8 +259,8 @@ if ($socid > 0)
 		}
 	}
 
-	if($displaySupplier) {
-		if($displayCustomer) {
+	if($isSupplier) {
+		if($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright">';
 			print '<div class="ficheaddleft">';
@@ -321,7 +317,7 @@ if ($socid > 0)
 			dol_print_error($db);
 		}
 
-		if($displayCustomer) {
+		if($isCustomer) {
 			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 92e2f1d5d71..b580684af7e 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -238,9 +238,6 @@ if ($socid > 0)
 	$isCustomer = $object->client == 1 || $object->client == 3;
 	$isSupplier = $object->fournisseur == 1;
 
-	$displayCustomer = $conf->global->MAIN_FEATURES_LEVEL <= 0 || $isCustomer;
-	$displaySupplier = $conf->global->MAIN_FEATURES_LEVEL > 0 && $isSupplier;
-
 	/*
 	 * Display tabs
 	 */
@@ -259,7 +256,7 @@ if ($socid > 0)
 
     print '<div class="underbanner clearboth"></div>';
     
-    if(! $displayCustomer && ! $displaySupplier) {
+    if(! $isCustomer && ! $isSupplier) {
     	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
     	dol_fiche_end();
@@ -274,7 +271,7 @@ if ($socid > 0)
     
 	print '<table class="border centpercent">';
 
-	if($displayCustomer) {	// Calcul avoirs client en cours
+	if($isCustomer) {	// Calcul avoirs client en cours
 		$remise_all=$remise_user=0;
 		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
@@ -305,7 +302,7 @@ if ($socid > 0)
 		}
 	}
 
-	if($displaySupplier) {
+	if($isSupplier) {
 		// Calcul avoirs fournisseur en cours
 		$remise_all=$remise_user=0;
 		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
@@ -349,16 +346,16 @@ if ($socid > 0)
 
     	print '<div class="underbanner clearboth"></div>';
  
-    	if($conf->global->MAIN_FEATURES_LEVEL <= 0 || ($isCustomer && ! $isSupplier)) {
+    	if($isCustomer && ! $isSupplier) {
     		print '<input type="hidden" name="discount_type" value="0" />';
     	}
     	
-    	if($conf->global->MAIN_FEATURES_LEVEL > 0 && (! $isCustomer && $isSupplier)) {
+    	if(! $isCustomer && $isSupplier) {
     		print '<input type="hidden" name="discount_type" value="1" />';
     	}
 
     	print '<table class="border" width="100%">';
-		if($conf->global->MAIN_FEATURES_LEVEL > 0 && $isCustomer && $isSupplier) {
+		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" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 			print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
@@ -408,8 +405,8 @@ if ($socid > 0)
 	
 	print load_fiche_titre($langs->trans("DiscountStillRemaining"));
 
-	if($displayCustomer) {
-		if($displaySupplier) {
+	if($isCustomer) {
+		if($isSupplier) {
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
@@ -541,8 +538,8 @@ if ($socid > 0)
 		}
 	}
 
-	if($displaySupplier) {
-		if($displayCustomer) {
+	if($isSupplier) {
+		if($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright">';
 			print '<div class="ficheaddleft">';
@@ -677,7 +674,7 @@ if ($socid > 0)
 			dol_print_error($db);
 		}
 
-		if($displayCustomer) {
+		if($isCustomer) {
 			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
@@ -692,8 +689,8 @@ if ($socid > 0)
 	
 	print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
 
-	if($displayCustomer) {
-		if($displaySupplier) {
+	if($isCustomer) {
+		if($isSupplier) {
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
@@ -843,8 +840,8 @@ if ($socid > 0)
 		}
 	}
 
-	if($displaySupplier) {
-		if($displayCustomer) {
+	if($isSupplier) {
+		if($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright">';
 			print '<div class="ficheaddleft">';
@@ -994,7 +991,7 @@ if ($socid > 0)
 			dol_print_error($db);
 		}
 
-		if($displayCustomer) {
+		if($isCustomer) {
 			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index a5d5490e660..877ba0f6e14 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -258,40 +258,38 @@ if ($object->id > 0)
 	print "</td>";
 	print '</tr>';
 
-	if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-		// Relative discounts (Discounts-Drawbacks-Rebates)
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans("CustomerRelativeDiscountShort");
-		print '<td><td align="right">';
-		if ($user->rights->societe->creer && !$user->societe_id > 0)
-		{
-			print '<a 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_supplier_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_supplier_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 align="right">';
-		if ($user->rights->societe->creer && !$user->societe_id > 0)
-		{
-			print '<a 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('', '', 0, 1);
-		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>';
+	// Relative discounts (Discounts-Drawbacks-Rebates)
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans("CustomerRelativeDiscountShort");
+	print '<td><td align="right">';
+	if ($user->rights->societe->creer && !$user->societe_id > 0)
+	{
+		print '<a 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_supplier_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_supplier_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 align="right">';
+	if ($user->rights->societe->creer && !$user->societe_id > 0)
+	{
+		print '<a 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('', '', 0, 1);
+	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>';
 	
 	print '<tr class="nowrap">';
 	print '<td>';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index c7487f4cc51..4225646a3af 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1479,7 +1479,7 @@ if ($action=='create')
 	}
 	print '</td>';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $societe->id > 0)
+	if ($societe->id > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
@@ -1874,32 +1874,29 @@ elseif (! empty($object->id))
 	print '<td>'.$author->getNomUrl(1, '', 0, 0, 0).'</td>';
 	print '</tr>';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
-
-		// Relative and absolute discounts
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		} else {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
-		}
-
-		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
-		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
-		$absolute_discount = price2num($absolute_discount, 'MT');
-		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-
-		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-
-		$thirdparty = $societe;
-		$discount_type = 1;
-		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
-		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
-
-		print '</td></tr>';
+	// Relative and absolute discounts
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+	} else {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 	}
 
+	$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+	$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+	$absolute_discount = price2num($absolute_discount, 'MT');
+	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+
+	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+
+	$thirdparty = $societe;
+	$discount_type = 1;
+	$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
+	print '</td></tr>';
+
 	// Conditions de reglement par defaut
 	$langs->load('bills');
 	print '<tr><td class="nowrap">';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 14909a1fc2e..8069f6cf520 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1848,74 +1848,71 @@ if ($action == 'create')
 
 	if (empty($origin))
 	{
-		if ($conf->global->MAIN_FEATURES_LEVEL > 0)        // Need to fix reports of standard accounting module to manage supplier credit note
+		if ($societe->id > 0)
 		{
-			if ($societe->id > 0)
-			{
-				// Credit note
-				if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
-				{
-					print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-					$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
-					if (! $optionsav) $tmp.=' disabled';
-					$tmp.= '> ';
-					// Show credit note options only if we checked credit note
-					print '<script type="text/javascript" language="javascript">
-    				jQuery(document).ready(function() {
-    					if (! jQuery("#radio_creditnote").is(":checked"))
-    					{
-    						jQuery("#credit_note_options").hide();
-    					}
-    					jQuery("#radio_creditnote").click(function() {
-    						jQuery("#credit_note_options").show();
-    					});
-    					jQuery("#radio_standard, #radio_replacement, #radio_deposit").click(function() {
-    						jQuery("#credit_note_options").hide();
-    					});
-    				});
-    				</script>';
-					$text = $tmp.$langs->transnoentities("InvoiceAvoirAsk") . ' ';
-					// $text.='<input type="text" value="">';
-					$text .= '<select class="flat valignmiddle" name="fac_avoir" id="fac_avoir"';
-					if (! $optionsav)
-						$text .= ' disabled';
-					$text .= '>';
-					if ($optionsav) {
-						$text .= '<option value="-1"></option>';
-						$text .= $optionsav;
-					} else {
-						$text .= '<option value="-1">' . $langs->trans("NoInvoiceToCorrect") . '</option>';
-					}
-					$text .= '</select>';
-					$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
-					print $desc;
-
-					print '<div id="credit_note_options" class="clearboth">';
-					print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
-					print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
-					print '</div>';
-
-					print '</div></div>';
-				}
-			}
-			else
+			// Credit note
+			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
 			{
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp='<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
-				$text = $tmp.$langs->trans("InvoiceAvoir") . ' ';
-				$text.= '('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").') ';
+				$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
+				if (! $optionsav) $tmp.=' disabled';
+				$tmp.= '> ';
+				// Show credit note options only if we checked credit note
+				print '<script type="text/javascript" language="javascript">
+   				jQuery(document).ready(function() {
+   					if (! jQuery("#radio_creditnote").is(":checked"))
+   					{
+   						jQuery("#credit_note_options").hide();
+   					}
+   					jQuery("#radio_creditnote").click(function() {
+   						jQuery("#credit_note_options").show();
+   					});
+   					jQuery("#radio_standard, #radio_replacement, #radio_deposit").click(function() {
+   						jQuery("#credit_note_options").hide();
+   					});
+   				});
+   				</script>';
+				$text = $tmp.$langs->transnoentities("InvoiceAvoirAsk") . ' ';
+				// $text.='<input type="text" value="">';
+				$text .= '<select class="flat valignmiddle" name="fac_avoir" id="fac_avoir"';
+				if (! $optionsav)
+					$text .= ' disabled';
+				$text .= '>';
+				if ($optionsav) {
+					$text .= '<option value="-1"></option>';
+					$text .= $optionsav;
+				} else {
+					$text .= '<option value="-1">' . $langs->trans("NoInvoiceToCorrect") . '</option>';
+				}
+				$text .= '</select>';
 				$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
 				print $desc;
-				print '</div></div>' . "\n";
+
+				print '<div id="credit_note_options" class="clearboth">';
+				print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
+				print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
+				print '</div>';
+
+				print '</div></div>';
 			}
 		}
+		else
+		{
+			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+			$tmp='<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
+			$text = $tmp.$langs->trans("InvoiceAvoir") . ' ';
+			$text.= '('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").') ';
+			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
+			print $desc;
+			print '</div></div>' . "\n";
+		}
 	}
 
 	print '</div>';
 
 	print '</td></tr>';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $societe->id > 0)
+	if ($societe->id > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
@@ -2411,18 +2408,17 @@ else
         }
         print '</td></tr>';
 
-        if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
-	        // Relative and absolute discounts
-			print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
-			print '</td><td>';
 
-			$thirdparty = $societe;
-			$discount_type = 1;
-			$backtopage = urlencode($_SERVER["PHP_SELF"] . '?facid=' . $object->id);
-			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+        // Relative and absolute discounts
+		print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
+		print '</td><td>';
 
-			print '</td></tr>';
-        }
+		$thirdparty = $societe;
+		$discount_type = 1;
+		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?facid=' . $object->id);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
+		print '</td></tr>';
 
         // Label
         print '<tr>';
@@ -2782,41 +2778,39 @@ else
 			$creditnoteamount = 0;
 			$depositamount = 0;
 
-			if($conf->global->MAIN_FEATURES_LEVEL > 0) {
-				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-				$sql .= " re.description, re.fk_invoice_supplier_source";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
-				$sql .= " WHERE fk_invoice_supplier = " . $object->id;
-				$resql = $db->query($sql);
-				if ($resql) {
-					$num = $db->num_rows($resql);
-					$i = 0;
-					$invoice = new FactureFournisseur($db);
-					while ($i < $num) {
-						$obj = $db->fetch_object($resql);
-						$invoice->fetch($obj->fk_invoice_supplier_source);
-						print '<tr><td colspan="' . $nbcols . '" align="right">';
-						if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-							print $langs->trans("CreditNote") . ' ';
-						if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
-							print $langs->trans("Deposit") . ' ';
-						print $invoice->getNomUrl(0);
-						print ' :</td>';
-						print '<td align="right">' . price($obj->amount_ttc) . '</td>';
-						print '<td align="right">';
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
-						print '</td></tr>';
-						$i ++;
-						if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-							$creditnoteamount += $obj->amount_ttc;
-						if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
-							$depositamount += $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_invoice_supplier_source";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
+			$sql .= " WHERE fk_invoice_supplier = " . $object->id;
+			$resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+				$i = 0;
+				$invoice = new FactureFournisseur($db);
+				while ($i < $num) {
+					$obj = $db->fetch_object($resql);
+					$invoice->fetch($obj->fk_invoice_supplier_source);
+					print '<tr><td colspan="' . $nbcols . '" align="right">';
+					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+						print $langs->trans("CreditNote") . ' ';
+					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+						print $langs->trans("Deposit") . ' ';
+					print $invoice->getNomUrl(0);
+					print ' :</td>';
+					print '<td align="right">' . price($obj->amount_ttc) . '</td>';
+					print '<td align="right">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&action=unlinkdiscount&discountid=' . $obj->rowid . '">' . img_delete() . '</a>';
+					print '</td></tr>';
+					$i ++;
+					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+						$creditnoteamount += $obj->amount_ttc;
+					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+						$depositamount += $obj->amount_ttc;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
 			// Paye partiellement 'escompte'
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
@@ -3029,7 +3023,7 @@ else
 				}
 
 				// Reverse back money or convert to reduction
-				if ($conf->global->MAIN_FEATURES_LEVEL > 0 && ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD)) {
+				if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD) {
 					// For credit note only
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0)
 					{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 4e4611d4fd5..e906fea4041 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1050,7 +1050,7 @@ if ($action == 'create')
 	}
 	print '</tr>' . "\n";
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0 && $soc->id > 0)
+	if ($soc->id > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';		
@@ -1404,32 +1404,29 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
-
-		// Relative and absolute discounts
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		} else {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
-		}
-
-		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
-
-		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
-		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
-		$absolute_discount = price2num($absolute_discount, 'MT');
-		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-
-		$thirdparty = $soc;
-		$discount_type = 1;
-		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
-		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
-
-		print '</td></tr>';
+	// Relative and absolute discounts
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+	} else {
+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 	}
 
+	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+
+	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
+	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);
+	$absolute_discount = price2num($absolute_discount, 'MT');
+	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+
+	$thirdparty = $soc;
+	$discount_type = 1;
+	$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+
+	print '</td></tr>';
+
 	// Payment term
 	print '<tr><td class="titlefield">';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';

From 480d756090a06699a47f61cd89e807a61c8c69ce Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 5 Mar 2018 11:30:18 +0100
Subject: [PATCH 300/386] FIX: supplier discounts: typo

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

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index b71d84130a1..c8237a839c7 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -46,7 +46,7 @@ class DiscountAbsolute
     public $fk_facture;			    // Id invoice when a discount line is used into an invoice (for credit note)
     public $fk_facture_source;		// Id facture avoir a l'origine de la remise
     public $ref_facture_source;	    // Ref facture avoir a l'origine de la remise
-    public $ref_invoive_supplier_source;
+    public $ref_invoice_supplier_source;
 
     /**
      *	Constructor

From f1faf155fc8d3154cb6a06fba3d3036e85a1639d Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 5 Mar 2018 11:41:06 +0100
Subject: [PATCH 301/386] FIX: supplier discounts: wrong link to source
 supplier invoice

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

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index c8237a839c7..2813a0d46b1 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -570,8 +570,9 @@ class DiscountAbsolute
 
         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("ShowDiscount").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+            $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';

From c4950d4f0c193fe7618a434ee5ea0078054f3a37 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 5 Mar 2018 11:49:04 +0100
Subject: [PATCH 302/386] FIX: supplier discounts: wrong source invoice ref in
 DOCs

---
 htdocs/core/lib/doc.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 447c7c2149e..ae8410bd188 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -73,15 +73,15 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$sourceref=!empty($discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
 		}
 		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 		    $discount=new DiscountAbsolute($db);
 		    $discount->fetch($line->fk_remise_except);
-		    $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$discount->ref_facture_source);
-		    $sourceref=!empty($discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+		    $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+		    $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
 		    // Add date of deposit
 		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
 		}

From fad521d66cbc76ee1fc8f0f302714ac67b9d3e03 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Mon, 5 Mar 2018 12:09:13 +0100
Subject: [PATCH 303/386] FIX: supplier disocunts: add forgotten index to
 migration script

---
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

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 08d7d362ec5..f23c095dca6 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
@@ -59,6 +59,7 @@ ALTER TABLE llx_c_type_container ADD UNIQUE INDEX uk_c_type_container_id (code,
 
 
 ALTER TABLE llx_societe_remise_except ADD COLUMN discount_type integer DEFAULT 0 NOT NULL AFTER fk_soc;
+ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_discount_type (discount_type);
 ALTER TABLE llx_societe ADD COLUMN remise_supplier real DEFAULT 0 AFTER remise_client;
 CREATE TABLE llx_societe_remise_supplier
 (

From 212dc9bca1c6d628a393815ad8537e0470da5c28 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 16:48:38 +0100
Subject: [PATCH 304/386] Introduce StripeConnect Addon

As multicompany module, i submit to push my already fonctionnal stripeconnect module for a marketplace mode
---
 htdocs/stripe/admin/stripe.php | 66 +++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index de3c4db8987..f9cdb049304 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -45,18 +45,26 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+  $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
+  if (! $result > 0) $error++;
+if (empty($conf->stripeconnect->enabled)) {  
 	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY",GETPOST('STRIPE_TEST_WEBHOOK_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;  
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
+ 	$result=dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY",GETPOST('STRIPE_LIVE_WEBHOOK_KEY','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++;
+	if (! $result > 0) $error++;
+	$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, "ONLINE_PAYMENT_CSS_URL",GETPOST('ONLINE_PAYMENT_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM','alpha'),'chaine',0,'',$conf->entity);
@@ -107,19 +115,9 @@ if ($action=="setlive")
 
 $form=new Form($db);
 
-//$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
-//if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
-//$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
-//if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
-
-//$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
-//if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
-//$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
-//if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
-
 llxHeader('',$langs->trans("StripeSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
 
 $head=stripeadmin_prepare_head();
@@ -143,18 +141,27 @@ print "</tr>\n";
 print '<tr class="oddeven">';
 print '<td class="titlefield">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
+if (empty($conf->global->STRIPECONNECT_LIVE) && ! empty($conf->stripeconnect->enabled)) {
+if (!empty($conf->global->STRIPE_LIVE))
+	print '<A href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+	print img_picto($langs->trans("Disabled"),'switch_off');
+print '</A>';
+}
+else {
 if (!empty($conf->global->STRIPE_LIVE))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+	print '<A href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+	print '<A href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
 }
+print '</A>';
+}
 print '</td></tr>';
-
+if (empty($conf->stripeconnect->enabled)) {
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
@@ -165,6 +172,12 @@ print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';  
+
+print '<tr class="oddeven"><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
+print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -179,6 +192,15 @@ print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" valu
 print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
+print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+} else {
+print '<tr class="oddeven"><td>'.$langs->trans("STRIPECONNECT").'</td>';
+print '<td>Ce module est configuré en mode marketplace</td></tr>';
+}
 print '</table>';
 
 print '<br>';
@@ -195,6 +217,14 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
+if (! empty($conf->banque->enabled))
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '</td></tr>';
+}
+
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
@@ -253,6 +283,8 @@ $token='';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242', '4000000000000101', '4000000000000069', '4000000000000341'));
+
 if (! empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';

From 628a14db0c80c0ec86ed3a65df2a14996afdd1c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 17:06:14 +0100
Subject: [PATCH 305/386] FIX Trad and creation date in subscription create

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

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 8d4b1884bab..1c4007780b9 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -77,15 +77,17 @@ class Subscription extends CommonObject
 			$this->error=$langs->trans("ErrorBadValueForDate");
 			return -1;
 		}
+		if (empty($this->datec)) $this->datec = $now;
+
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, datec, dateadh, datef, subscription, note)";
-        $sql.= " VALUES (".$this->fk_adherent.", '".$this->db->idate($now)."',";
+        $sql.= " VALUES (".$this->fk_adherent.", '".$this->db->idate($this->datec)."',";
 		$sql.= " '".$this->db->idate($this->dateh)."',";
 		$sql.= " '".$this->db->idate($this->datef)."',";
 		$sql.= " ".$this->amount.",";
-		$sql.= " '".$this->db->escape($this->note)."')";
+		$sql.= " '".$this->db->escape($this->note_public?$this->note_public:$this->note)."')";
 
 		$resql = $this->db->query($sql);
 		if (! $resql) {
@@ -324,6 +326,8 @@ class Subscription extends CommonObject
 		global $langs;
 
 		$result='';
+
+		$langs->load("members");
         $label=$langs->trans("ShowSubscription").': '.$this->ref;
 
         $linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

From db65379ebcd0da432a82c682dc6bcfb3ede37285 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 17:07:59 +0100
Subject: [PATCH 306/386] FIX Subscription not correctly log in blockedlog

---
 htdocs/blockedlog/admin/blockedlog_list.php   |  4 +-
 htdocs/blockedlog/ajax/block-info.php         |  2 +-
 htdocs/blockedlog/class/blockedlog.class.php  | 54 ++++++++++++++++---
 ..._modBlockedlog_ActionsBlockedLog.class.php |  6 ++-
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index d508d1edceb..9410ef9be5e 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -474,7 +474,7 @@ if (is_array($blocks))
 		   	print '<td class="nowrap">'.$block->ref_object.'</td>';
 
 		   	// Link to source object
-		   	print '<td>'.$object_link.'</td>';
+		   	print '<td><!-- object_link -->'.$object_link.'</td>';
 
 		   	// Amount
 		   	print '<td align="right">'.price($block->amounts).'</td>';
@@ -501,7 +501,7 @@ if (is_array($blocks))
 
 		   	print '</td>';
 
-		   	// Status note
+		   	// Note
 		   	print '<td class="center">';
 		   	if (! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror))	// If error
 		   	{
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index c8a9cbf70be..a092b13ca99 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -87,7 +87,7 @@ function formatObject($objtoshow, $prefix)
 			{
 				$s.='<tr><td>'.($prefix?$prefix.' > ':'').$key.'</td>';
 				$s.='<td>';
-				if (in_array($key, array('date','datef')))
+				if (in_array($key, array('date','datef','dateh','datec','datem','datep')))
 				{
 					$s.=dol_print_date($val, 'dayhour');
 				}
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 3d41aba340a..1bddb23de1d 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -239,6 +239,17 @@ class BlockedLog
 				$this->error++;
 			}
 		}
+		else if($this->element === 'subscription') {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+			$object = new Subscription($this->db);
+			if ($object->fetch($this->fk_object)>0) {
+				return $object->getNomUrl(1);
+			}
+			else{
+				$this->error++;
+			}
+		}
 		else if ($this->action == 'MODULE_SET')
 		{
 			return '<i class="opacitymedium">System to track events into unalterable logs were enabled</i>';
@@ -313,6 +324,10 @@ class BlockedLog
 		{
 			$this->date_object = $object->datepaid?$object->datepaid:$object->datep;
 		}
+		elseif ($object->element=='subscription')
+		{
+			$this->date_object = $object->dateh;
+		}
 		else {
 			$this->date_object = $object->date;
 		}
@@ -323,7 +338,10 @@ class BlockedLog
 		// id of object
 		$this->fk_object = $object->id;
 
+
+		// Set object_data
 		$this->object_data=new stdClass();
+		$arrayoffieldstoexclude = array('table_element','fields','ref_previous','ref_next','origin','origin_id','oldcopy','picto','error','modelpdf','table_element_line','linkedObjectsIds','linkedObjects','fk_delivery_address');
 
 		// Add thirdparty info
 		if (empty($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) $object->fetch_thirdparty();
@@ -333,7 +351,7 @@ class BlockedLog
 
 			foreach($object->thirdparty as $key=>$value)
 			{
-				if (in_array($key, array('fields'))) continue;	// Discard some properties
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 				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'
@@ -349,7 +367,7 @@ class BlockedLog
 
 			foreach($mysoc as $key=>$value)
 			{
-				if (in_array($key, array('fields'))) continue;	// Discard some properties
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 				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'
@@ -366,12 +384,11 @@ class BlockedLog
 		}
 
 		// Field specific to object
-
 		if ($this->element == 'facture')
 		{
 			foreach($object as $key=>$value)
 			{
-				if (in_array($key, array('fields'))) continue;	// Discard some properties
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 				if (! in_array($key, array(
 				'ref','facnumber','ref_client','ref_supplier','date','datef','type','total_ht','total_tva','total_ttc','localtax1','localtax2','revenuestamp','datepointoftax','note_public','lines'
 				))) continue;									// Discard if not into a dedicated list
@@ -402,7 +419,7 @@ class BlockedLog
 		{
 			foreach($object as $key=>$value)
 			{
-				if (in_array($key, array('fields'))) continue;	// Discard some properties
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 				if (! in_array($key, array(
 				'ref','facnumber','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
@@ -498,7 +515,7 @@ class BlockedLog
 					$paymentpart->thirdparty = new stdClass();
 					foreach($tmpobject->thirdparty as $key=>$value)
 					{
-						if (in_array($key, array('fields'))) continue;	// Discard some properties
+						if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 						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'
@@ -515,7 +532,7 @@ class BlockedLog
 				{
 					foreach($tmpobject as $key=>$value)
 					{
-						if (in_array($key, array('fields'))) continue;	// Discard some properties
+						if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
 						if (! in_array($key, array(
 						'ref','facnumber','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
@@ -542,6 +559,29 @@ class BlockedLog
 
 			if (! empty($object->newref)) $this->object_data->ref = $object->newref;
 		}
+		elseif($this->element == 'subscription')
+		{
+			foreach($object as $key=>$value)
+			{
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
+				if (! in_array($key, array(
+					'id','datec','dateh','datef','fk_adherent','amount','import_key','statut','note'
+				))) continue;									// Discard if not into a dedicated list
+				if (!is_object($value)) $this->object_data->{$key} = $value;
+			}
+
+			if (! empty($object->newref)) $this->object_data->ref = $object->newref;
+		}
+		else 	// Generic case
+		{
+			foreach($object as $key=>$value)
+			{
+				if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
+				if (!is_object($value)) $this->object_data->{$key} = $value;
+			}
+
+			if (! empty($object->newref)) $this->object_data->ref = $object->newref;
+		}
 
 		return 1;
 	}
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index ec0b0cb6941..f97d1400018 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -69,14 +69,16 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		$amounts = 0;
 		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
 			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBCRIPTION_CREATE' || $action==='MEMBER_SUBCRIPTION_MODIFY' || $action==='MEMBER_SUBCRIPTION_DELETE'
+			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
 			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
 			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
 		)
 		{
 			$qualified++;
 
-			if ($action==='DON_VALIDATE') $amounts = (double) $object->amount;
+			if (in_array($action, array(
+				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
+				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
 			else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'

From fcf7d8f162b9572fa7374cb4692f2ff1208acddf Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 17:23:32 +0100
Subject: [PATCH 307/386] NEW introduce stripeconnect mode

---
 htdocs/stripe/config.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 9f5f0e4de96..a692e541050 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -33,6 +33,15 @@ global $conf;
 //use \includes\stripe as stripe;
 $stripe = array();
 
+if ((empty($conf->global->STRIPECONNECT_LIVE) && ! (empty($conf->stripeconnect->enabled))) || GETPOST('forcesandbox','alpha'))
+{
+	$stripe = array(
+		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+	);
+}
+else 
+{
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))
 {
 	$stripe = array(
@@ -47,8 +56,13 @@ else
 		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
 	);
 }
+}
 
 require_once DOL_DOCUMENT_ROOT."/includes/stripe/lib/Stripe.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 \Stripe\Stripe::setApiKey($stripe['secret_key']);
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+\Stripe\Stripe::setAppInfo("Stripe", "dolibarr version", "https://www.dolibarr.org"); // add dolibarr version

From 136b5c4431260cb239686d24fcebc6bc485325c6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 17:26:03 +0100
Subject: [PATCH 308/386] New introduce stripeconnect mode

---
 htdocs/public/payment/newpayment.php | 70 ++++++++++++++++------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3f2c2979e00..92eb0a5e856 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -264,11 +264,12 @@ else if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$param
  * Actions
  */
 
+// Action dopayment is called after choosing the payment mode
 if ($action == 'dopayment')
 {
 	if ($paymentmethod == 'paypal')
 	{
-		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
+		$PAYPAL_API_PRICE=price2num(GETPOST("newamount",'alpha'),'MT');
 		$PAYPAL_PAYMENT_TYPE='Sale';
 
 		$origfulltag=GETPOST("fulltag",'alpha');
@@ -310,6 +311,7 @@ if ($action == 'dopayment')
 			dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+			// All those fields may be empty when making a payment for a free amount for example
 			dol_syslog("shipToName: $shipToName", LOG_DEBUG);
 			dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
 			dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
@@ -327,9 +329,10 @@ if ($action == 'dopayment')
 			//$_SESSION["FinalPaymentAmt"]=$PAYPAL_API_PRICE;
 
 			// A redirect is added if API call successfull
-			print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+			$mesg = print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
 
-			exit;
+			// If we are here, it means the Paypal redirect was not done, so we show error message
+			$action = '';
 		}
 	}
 
@@ -366,7 +369,7 @@ if ($action == 'dopayment')
 
 	if ($paymentmethod == 'stripe')
 	{
-		if (GETPOST('newamount')) $amount = GETPOST('newamount');
+		if (GETPOST('newamount','alpha')) $amount = price2num(GETPOST('newamount','alpha'),'MT');
 		else
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
@@ -379,10 +382,12 @@ if ($action == 'dopayment')
 // Called when choosing Stripe mode, after the 'dopayment'
 if ($action == 'charge')
 {
+	$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)) $amount=$amount * 100;
+	if (! in_array($currency, $arrayzerounitcurrency)) $amountstripe=$amountstripe * 100;
 
 	dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
@@ -411,7 +416,7 @@ if ($action == 'charge')
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 		$charge = \Stripe\Charge::create(array(
 		'customer' => $customer->id,
-		'amount'   => price2num($amount, 'MU'),
+		'amount'   => price2num($amountstripe, 'MU'),
 		'currency' => $currency,
 		'description' => 'Stripe payment: '.$FULLTAG,
 		'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name),
@@ -529,7 +534,7 @@ if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBO
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
 }
-if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
+if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
 }
@@ -647,7 +652,7 @@ if (! $source)
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -661,7 +666,7 @@ if (! $source)
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -738,7 +743,7 @@ if ($source == 'order')
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -752,7 +757,7 @@ if ($source == 'order')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -850,7 +855,7 @@ if ($source == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentAmount");
 	if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($object->paye))
@@ -858,7 +863,7 @@ if ($source == 'invoice')
 		if (empty($amount) || ! is_numeric($amount))
 		{
 			print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-			print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"), 'MT').'">';
 		}
 		else {
 			print '<b>'.price($amount).'</b>';
@@ -877,7 +882,7 @@ if ($source == 'invoice')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1079,7 +1084,7 @@ if ($source == 'contractline')
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -1093,7 +1098,7 @@ if ($source == 'contractline')
 
 	// Tag
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1202,7 +1207,7 @@ if ($source == 'membersubscription')
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && ! GETPOST('newamount','alpha')) $_GET['newamount']=$member->last_subscription_amount;
 	}
 
 	// Amount
@@ -1215,27 +1220,31 @@ if ($source == 'membersubscription')
 		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) print ')';
 	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	$valtoshow='';
 	if (empty($amount) || ! is_numeric($amount))
 	{
-		$valtoshow=GETPOST("newamount",'int');
+		$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
 		// force default subscription amount to value defined into constant...
-		if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-			if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-				$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
+		if (empty($valtoshow))
+		{
+			if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
+				}
 			}
-		}
-		else {
-			if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-				$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+			else {
+				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+				}
 			}
 		}
 	}
 	if (empty($amount) || ! is_numeric($amount))
 	{
-		//$valtoshow=GETPOST("newamount",'int');
+		//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
 		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
 	}
 	else {
 		$valtoshow=$amount;
@@ -1252,7 +1261,7 @@ if ($source == 'membersubscription')
 	// Tag
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1428,7 +1437,7 @@ if (preg_match('/^dopayment/',$action))
 
 	    <div class="form-row left">
 	    <label for="card-element">
-	    Credit or debit card
+	    '.$langs->trans("CreditOrDebitCard").'
 	    </label>
 	    <div id="card-element">
 	    <!-- a Stripe Element will be inserted here. -->
@@ -1438,7 +1447,7 @@ if (preg_match('/^dopayment/',$action))
 	    <div id="card-errors" role="alert"></div>
 	    </div>
 	    <br>
-	    <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
+	    <button class="butAction" id="buttontopay">'.$langs->trans("ValidatePayment").'</button>
 	    <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
 	    </td></tr></tbody></table>
 
@@ -1537,3 +1546,4 @@ htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix,$object);
 llxFooter('', 'public');
 
 $db->close();
+

From a84990ab781798d36ead733cdde8c102203cac85 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 5 Mar 2018 17:43:06 +0100
Subject: [PATCH 309/386] NEW price in burger menu on mouvement list

---
 htdocs/product/stock/mouvement.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 8659dfe8461..348de55aeda 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -100,8 +100,9 @@ $arrayfields=array(
     'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
     'm.label'=>array('label'=>$langs->trans("LabelMovement"), 'checked'=>1),
     'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
-    'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
-	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
+	'm.price'=>array('label'=>$langs->trans("Price"), 'checked'=>0),
+		//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 
@@ -416,7 +417,7 @@ if (!empty($conf->projet->enabled)) $formproject=new FormProjets($db);
 $sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.fk_product_type as type, p.entity,";
 $sql.= " e.label as stock, e.rowid as entrepot_id, e.lieu,";
 $sql.= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
-$sql.= " m.batch,";
+$sql.= " m.batch, m.price,";
 $sql.= " pl.rowid as lotid, pl.eatby, pl.sellby,";
 $sql.= " u.login, u.photo, u.lastname, u.firstname";
 // Add fields from extrafields
@@ -824,6 +825,13 @@ if ($resql)
 	    print '<td class="liste_titre" align="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" align="left">';
+    	print '&nbsp; ';
+    	print '</td>';
     }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -885,7 +893,8 @@ if ($resql)
     if (! empty($arrayfields['m.label']['checked']))            print_liste_field_titre($arrayfields['m.label']['label'],$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
     if (! empty($arrayfields['origin']['checked']))             print_liste_field_titre($arrayfields['origin']['label'],$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);
     if (! empty($arrayfields['m.value']['checked']))            print_liste_field_titre($arrayfields['m.value']['label'],$_SERVER["PHP_SELF"], "m.value","",$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
+    if (! empty($arrayfields['m.price']['checked']))            print_liste_field_titre($arrayfields['m.price']['label'],$_SERVER["PHP_SELF"], "m.price","",$param,'align="right"',$sortfield,$sortorder);
+    // Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
 	   foreach($extrafields->attribute_label as $key => $val)
@@ -1023,6 +1032,13 @@ if ($resql)
 	        print $objp->qty;
 	        print '</td>';
         }
+        if (! empty($arrayfields['m.price']['checked']))
+        {
+        	// Price
+        	print '<td align="right">';
+        	print price($objp->price);
+        	print '</td>';
+        }
         // 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

From 667db35e75eead566e98e108063b4ba47446a706 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 17:44:38 +0100
Subject: [PATCH 310/386] Better form for subscription

---
 htdocs/public/members/new.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 978c646a524..9c93808e819 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -418,10 +418,12 @@ $extrafields->fetch_name_optionals_label('adherent');    // fetch optionals attr
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 
-print load_fiche_titre($langs->trans("NewSubscription"));
+print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
 
+print '<div class="center subscriptionformhelptext">';
 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);
 

From afa8b372392720d56a10a305a8fdb713d8f9b79e Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 19:45:55 +0100
Subject: [PATCH 311/386] NEW: add link to stripe's info in bank menu

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

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index fa9abbec0e5..90a712fdbd8 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -106,6 +106,48 @@ class modStripe extends DolibarrModules
 	        'user'=>2
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;
+	    
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=bank',
+		'type'=>'left',
+		'titre'=>'StripeAccount',
+		'mainmenu'=>'bank',
+		'leftmenu'=>'stripe',
+		'url' => '/stripe/charge.php',
+		'langs' => 'stripe',
+		'position' => 100,
+		'enabled' => '1',
+		'perms' => '$user->rights->banque->configurer',
+		'target' => '',
+		'user' => 0
+		);
+    
+        $r ++;
+	$this->menu[$r] = array(
+		'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
+		'type' => 'left',
+		'titre' => 'StripeChargeList',
+		'url' => '/stripe/charge.php',
+		'langs' => 'stripe',
+		'position' => 102,
+		'enabled' => '$conf->stripe->enabled && $conf->banque->enabled',
+		'perms' => '$user->rights->banque->configurer',
+		'target' => '',
+		'user' => 0
+		);
+    
+        $r ++;
+		$this->menu[$r] = array(
+		'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
+		'type' => 'left',
+		'titre' => 'StripeTransactionList',
+		'url' => '/stripe/transaction.php',
+		'langs' => 'stripe',
+		'position' => 102,
+		'enabled' => '$conf->stripe->enabled && $conf->banque->enabled',
+		'perms' => '$user->rights->banque->configurer',
+		'target' => '',
+		'user' => 0
+		);
 
         // Exports
         $r=1;

From 01bb263fd771637e25266be12b6c7a2a99edf3c6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 19:58:50 +0100
Subject: [PATCH 312/386] Create charge

---
 htdocs/stripe/charge | 158 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 htdocs/stripe/charge

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge
new file mode 100644
index 00000000000..908492d7a38
--- /dev/null
+++ b/htdocs/stripe/charge
@@ -0,0 +1,158 @@
+<?php
+/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.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 <http://www.gnu.org/licenses/>.
+ */
+
+// Put here all includes required by your class file
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';;
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+
+$langs->load("compta");
+$langs->load("salaries");
+$langs->load("bills");
+$langs->load("hrm");
+$langs->load("stripe");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+//$result = restrictedArea($user, 'salaries', '', '', '');
+
+if (empty($conf->global->STRIPECONNECT_LIVE))
+{
+$mode=$conf->global->STRIPECONNECT_LIVE;
+}
+else 
+{
+$mode=$conf->global->STRIPE_LIVE;	
+}
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$rowid = GETPOST("rowid",'alpha');
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+/*
+* View
+*/ 
+llxHeader('', $langs->trans("StripeChargeList"));
+$form = new Form($db);
+$societestatic = new societe($db);
+$acc = new Account($db);
+$stripeconnect=new StripeConnexion($db);
+if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+}
+if (!$rowid){
+
+	print '<FORM method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<INPUT type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<INPUT type="hidden" name="token" value="'.$_SESSION['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_barre_liste($langs->trans("StripeChargeList"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $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("Customer",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    print_liste_field_titre("Origin",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"","","",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="left"');
+    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"","","",'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre("Paid",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);
+    print "</TR>\n";
+
+	print "</TR>\n";
+  
+$list=\Stripe\Charge::all(array("limit" => $limit),array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+//print $list;
+foreach ($list->data as $charge) {
+    print '<TR class="oddeven">';
+    $societestatic->fetch($charge->metadata->idcustomer);
+    $societestatic->id=$charge->metadata->idcustomer;
+    $societestatic->lastname=$obj->lastname;
+    $societestatic->firstname=$obj->firstname;
+    $societestatic->admin=$obj->admin;
+    $societestatic->login=$obj->login;
+    $societestatic->email=$obj->email;
+    $societestatic->societe_id=$obj->fk_soc;
+        // Ref
+		print "<TD><A href='".DOL_URL_ROOT."?rowid=".$charge->id."'>".$charge->id."</A></TD>\n";
+		// Employee
+		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
+    // Origine
+		print "<TD>";
+if ($charge->metadata->source=="order"){
+$object = new Commande($db);
+$object->fetch($charge->metadata->idsource);
+    print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
+} elseif ($charge->metadata->source=="invoice"){
+$object = new Facture($db);
+$object->fetch($charge->metadata->idsource);
+    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
+}  
+    print "</TD>\n";
+		// Date payment
+    print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n";
+    // Label payment
+    print "<TD>";
+if ($charge->refunded=='1'){
+    print $langs->trans("refunded");
+} elseif ($charge->paid=='1'){
+    print $langs->trans("".$charge->status."");
+} else {
+$label="Message: ".$charge->failure_message."<BR>";
+$label.="Réseau: ".$charge->outcome->network_status."<BR>";
+$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
+}
+    print "</TD>\n";
+    // Type
+    print '<TD>';
+if ($charge->source->type=='card'){
+    print $langs->trans("card");
+} elseif ($charge->source->type=='three_d_secure'){
+    print $langs->trans("card3DS");
+}    
+    print '</TD>';
+    // Amount
+    print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100)."</TD>";       
+    print "</TR>\n";
+   }       
+} else {
+
+}    
+
+llxFooter();
+$db->close();

From dacd49e789696028de3c9dc7c48ade2d1b9e9a76 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 20:01:07 +0100
Subject: [PATCH 313/386] Update charge

---
 htdocs/stripe/charge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge
index 908492d7a38..8ecd4d7e0c3 100644
--- a/htdocs/stripe/charge
+++ b/htdocs/stripe/charge
@@ -19,7 +19,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-//require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';;
+//require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

From 877b446373a042dfb48ab789ee2bfc730a2606bb Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 20:01:55 +0100
Subject: [PATCH 314/386] NEW add stripe transaction

---
 htdocs/stripe/transaction.php | 157 ++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 htdocs/stripe/transaction.php

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
new file mode 100644
index 00000000000..74258fc4937
--- /dev/null
+++ b/htdocs/stripe/transaction.php
@@ -0,0 +1,157 @@
+<?php
+/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.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 <http://www.gnu.org/licenses/>.
+ */
+
+// Put here all includes required by your class file
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+
+$langs->load("compta");
+$langs->load("salaries");
+$langs->load("bills");
+$langs->load("hrm");
+$langs->load("stripe");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+//$result = restrictedArea($user, 'salaries', '', '', '');
+
+if (empty($conf->global->STRIPECONNECT_LIVE))
+{
+$mode=$conf->global->STRIPECONNECT_LIVE;
+}
+else 
+{
+$mode=$conf->global->STRIPE_LIVE;	
+}
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$rowid = GETPOST("rowid",'alpha');
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+/*
+* View
+*/ 
+llxHeader('', $langs->trans("StripeTransactionList"));
+$form = new Form($db);
+$societestatic = new societe($db);
+$acc = new Account($db);
+$stripeconnect=new StripeConnexion($db);
+if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+}
+if (!$rowid){
+
+	print '<FORM method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<INPUT type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<INPUT type="hidden" name="token" value="'.$_SESSION['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_barre_liste($langs->trans("StripeTransactionList"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $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("Customer",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    print_liste_field_titre("Origin",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"","","",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="left"');
+    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"","","",'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre("Paid",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Fee",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);    
+    print "</TR>\n";
+
+	print "</TR>\n";      
+    
+$txn=\Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+foreach ($txn->data as $txn) {
+    print '<TR class="oddeven">';
+    $societestatic->fetch($charge->metadata->idcustomer);
+    $societestatic->id=$charge->metadata->idcustomer;
+    $societestatic->lastname=$obj->lastname;
+    $societestatic->firstname=$obj->firstname;
+    $societestatic->admin=$obj->admin;
+    $societestatic->login=$obj->login;
+    $societestatic->email=$obj->email;
+    $societestatic->societe_id=$obj->fk_soc;
+
+    // Ref
+		print "<TD><A href='".dol_buildpath('/stripeconnect/charge.php', 1) . "?rowid=".$txn->source."'>".$txn->source."</A></TD>\n";
+		// Employee
+		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
+    // Origine
+		print "<TD>";
+if ($charge->metadata->source=="order"){
+$object = new Commande($db);
+$object->fetch($charge->metadata->idsource);
+    print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$txn->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
+} elseif ($txn->metadata->source=="invoice"){
+$object = new Facture($db);
+$object->fetch($txn->metadata->idsource);
+    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$txn->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
+}  
+    print "</TD>\n";
+		// Date payment
+    print '<TD align="center">'.dol_print_date($txn->created,'%d/%m/%Y %H:%M')."</TD>\n";
+    // Label payment
+    print "<TD>";
+if ($charge->refunded=='1'){
+    print $langs->trans("refunded");
+} elseif ($charge->paid=='1'){
+    print $langs->trans("".$charge->status."");
+} else {
+$label="Message: ".$charge->failure_message."<BR>";
+$label.="Réseau: ".$charge->outcome->network_status."<BR>";
+$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
+}
+    print "</TD>\n";
+    // Type
+    print '<TD>'.$txn->type.'</TD>';
+    // Amount
+    print "<TD align=\"right\">".price(($txn->amount)/100)."</TD>";
+    print "<TD align=\"right\">".price(($txn->fee)/100)."</TD>";        
+    print "</TR>\n";
+   }    
+    print "</TABLE>";
+    print '</DIV>';
+	  print '</FORM>';    
+}else{
+
+}
+
+llxFooter();
+$db->close();

From 76e81eec905306cc39af07d6c57d2c94a991a41e Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 20:06:14 +0100
Subject: [PATCH 315/386] Update transaction.php

---
 htdocs/stripe/transaction.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 74258fc4937..d49771de0a5 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -36,15 +36,6 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-if (empty($conf->global->STRIPECONNECT_LIVE))
-{
-$mode=$conf->global->STRIPECONNECT_LIVE;
-}
-else 
-{
-$mode=$conf->global->STRIPE_LIVE;	
-}
-
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $rowid = GETPOST("rowid",'alpha');
 $sortfield = GETPOST("sortfield",'alpha');

From ac05dbb2066b67c0cdb027edd8ed1d4e278d020c Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 20:07:00 +0100
Subject: [PATCH 316/386] Update charge

---
 htdocs/stripe/charge | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge
index 8ecd4d7e0c3..a7d988e542c 100644
--- a/htdocs/stripe/charge
+++ b/htdocs/stripe/charge
@@ -36,15 +36,6 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-if (empty($conf->global->STRIPECONNECT_LIVE))
-{
-$mode=$conf->global->STRIPECONNECT_LIVE;
-}
-else 
-{
-$mode=$conf->global->STRIPE_LIVE;	
-}
-
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $rowid = GETPOST("rowid",'alpha');
 $sortfield = GETPOST("sortfield",'alpha');

From c921fde3e53ddca17e971f5f0180859001f10d15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 20:58:30 +0100
Subject: [PATCH 317/386] Update mouvement.php

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

diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 95859d3e19b..dc976921cc0 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -102,7 +102,7 @@ $arrayfields=array(
     'm.label'=>array('label'=>$langs->trans("LabelMovement"), '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("Price"), 'checked'=>0),
+	'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)
 );

From 1537363e59606b8382b909c7437cc705f307eee8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 21:16:01 +0100
Subject: [PATCH 318/386] Fix cancel and template to record stock
 movement/correction

---
 htdocs/product/stock/mouvement.php            |  2 +-
 .../product/stock/tpl/stockcorrection.tpl.php | 20 +++++++++----------
 .../product/stock/tpl/stocktransfer.tpl.php   | 18 ++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index e7329f1d44a..7a82b2d7371 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -634,7 +634,7 @@ if ($resql)
     /*                                                                            */
     /* ************************************************************************** */
 
-    if (empty($action) && $id > 0)
+    if ((empty($action) || $action == 'list') && $id > 0)
     {
         print "<div class=\"tabsAction\">\n";
 
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 732fa8c889d..d946a23bf70 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -68,8 +68,8 @@ if (empty($conf) || ! is_object($conf))
 		print '<tr>';
 		if ($object->element == 'product')
 		{
-			print '<td width="20%" class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
-			print '<td width="30%">';
+			print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
+			print '<td>';
 			print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
     		print ' &nbsp; <select name="mouvement" id="mouvement">';
     		print '<option value="0">'.$langs->trans("Add").'</option>';
@@ -79,28 +79,28 @@ if (empty($conf) || ! is_object($conf))
 		}
 		if ($object->element == 'stock')
 		{
-			print '<td width="20%" class="fieldrequired" colspan="2">'.$langs->trans("Product").'</td>';
-	        print '<td width="30%">';
-	        print $form->select_produits(GETPOST('product_id'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 20, 0, -1);
+			print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
+	        print '<td>';
+	        print $form->select_produits(GETPOST('product_id'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 20, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
     		print ' &nbsp; <select name="mouvement" id="mouvement">';
     		print '<option value="0">'.$langs->trans("Add").'</option>';
     		print '<option value="1"'.(GETPOST('mouvement')?' selected="selected"':'').'>'.$langs->trans("Delete").'</option>';
     		print '</select>';
 	        print '</td>';
 		}
-		print '<td width="20%" class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
-		print '<td width="30%"><input name="nbpiece" id="nbpiece" size="10" value="'.GETPOST("nbpiece").'"></td>';
+		print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
+		print '<td><input name="nbpiece" id="nbpiece" size="10" value="'.GETPOST("nbpiece").'"></td>';
 		print '</tr>';
 
 		// Purchase price
 		print '<tr>';
-		print '<td width="25%">'.$langs->trans("UnitPurchaseValue").'</td>';
+		print '<td>'.$langs->trans("UnitPurchaseValue").'</td>';
 		print '<td colspan="'.(!empty($conf->projet->enabled) ? '1' : '3').'"><input name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
 		if (! empty($conf->projet->enabled))
 		{
 			print '<td>'.$langs->trans('Project').'</td>';
 			print '<td>';
-			$formproject->select_projects();
+			$formproject->select_projects(0, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300');
 			print '</td>';
 		}
 		print '</tr>';
@@ -133,7 +133,7 @@ if (empty($conf) || ! is_object($conf))
 		print '<tr>';
 		print '<td>'.$langs->trans("MovementLabel").'</td>';
 		print '<td>';
-		print '<input type="text" name="label" size="60" value="'.$valformovementlabel.'">';
+		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 '</tr>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 18f6b831cf2..4c89b97622f 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -72,20 +72,20 @@ if (empty($conf) || ! is_object($conf))
 		print '<tr>';
 		if ($object->element == 'product')
 		{
-		    print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
-		    print '<td width="30%">';
+		    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'):'ifone')), 'id_entrepot', 'warehouseopen,warehouseinternal', 1);
 		    print '</td>';
 		}
 		if ($object->element == 'stock')
 		{
-		    print '<td width="20%" class="fieldrequired">'.$langs->trans("Product").'</td>';
-		    print '<td width="30%">';
-		    print $form->select_produits(GETPOST('product_id'),'product_id',(empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''));
+		    print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
+		    print '<td>';
+		    print $form->select_produits(GETPOST('product_id'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 20, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 		    print '</td>';
 		}
 
-		print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td width="30%">';
+		print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
 		print $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>';
@@ -125,11 +125,11 @@ if (empty($conf) || ! is_object($conf))
 		// Label
 		$valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $productref));
 		print '<tr>';
-		print '<td width="15%">'.$langs->trans("MovementLabel").'</td>';
+		print '<td>'.$langs->trans("MovementLabel").'</td>';
 		print '<td>';
-		print '<input type="text" name="label" size="60" value="'.dol_escape_htmltag($valformovementlabel).'">';
+		print '<input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag($valformovementlabel).'">';
 		print '</td>';
-		print '<td width="15%">'.$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="'.(isset($_POST["inventorycode"])?GETPOST("inventorycode",'alpha'):dol_print_date(dol_now(),'%y%m%d%H%M%S')).'"></td>';
 		print '</tr>';
 
 		print '</table>';

From b09e6f327964d51bee05cce25611caccfdf5d389 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 21:35:00 +0100
Subject: [PATCH 319/386] Update transaction.php

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

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index d49771de0a5..b350154bee9 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -100,7 +100,7 @@ foreach ($txn->data as $txn) {
     $societestatic->societe_id=$obj->fk_soc;
 
     // Ref
-		print "<TD><A href='".dol_buildpath('/stripeconnect/charge.php', 1) . "?rowid=".$txn->source."'>".$txn->source."</A></TD>\n";
+		print "<TD><A href='".DOL_URL_ROOT."/stripe/transaction.php?rowid=".$txn->source."'>".$txn->source."</A></TD>\n";
 		// Employee
 		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
     // Origine

From 10ff23e6c4dd72c8bc98a45e7edcfe3d63e09252 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Mon, 5 Mar 2018 21:35:37 +0100
Subject: [PATCH 320/386] Update charge

---
 htdocs/stripe/charge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge
index a7d988e542c..28b990fe811 100644
--- a/htdocs/stripe/charge
+++ b/htdocs/stripe/charge
@@ -99,7 +99,7 @@ foreach ($list->data as $charge) {
     $societestatic->email=$obj->email;
     $societestatic->societe_id=$obj->fk_soc;
         // Ref
-		print "<TD><A href='".DOL_URL_ROOT."?rowid=".$charge->id."'>".$charge->id."</A></TD>\n";
+		print "<TD><A href='".DOL_URL_ROOT."/stripe/charge.php?rowid=".$charge->id."'>".$charge->id."</A></TD>\n";
 		// Employee
 		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
     // Origine

From 2f9f4d06759f647860401bf24334b50d730a5fb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Mar 2018 21:46:24 +0100
Subject: [PATCH 321/386] WIP Create payment of member subscription with paypal

---
 htdocs/adherents/class/adherent.class.php     | 308 +++++++++++++++++-
 htdocs/adherents/subscription.php             | 274 ++--------------
 htdocs/compta/facture/class/facture.class.php |  10 +-
 htdocs/public/payment/newpayment.php          |  12 +-
 htdocs/public/payment/paymentok.php           | 133 +++++++-
 htdocs/societe/class/societe.class.php        |   3 +-
 6 files changed, 470 insertions(+), 270 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 5691cd6687b..4fd04a0a9c9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1248,7 +1248,7 @@ class Adherent extends CommonObject
 	 *	Insert subscription into database and eventually add links to banks, mailman, etc...
 	 *
 	 *	@param	int	        $date        		Date of effect of subscription
-	 *	@param	double		$montant     		Amount of subscription (0 accepted for some members)
+	 *	@param	double		$amount     		Amount of subscription (0 accepted for some members)
 	 *	@param	int			$accountid			Id bank account
 	 *	@param	string		$operation			Type operation (if Id bank account provided)
 	 *	@param	string		$label				Label operation (if Id bank account provided)
@@ -1258,7 +1258,7 @@ class Adherent extends CommonObject
 	 *	@param	int     	$datesubend			Date end subscription
 	 *	@return int         					rowid of record added, <0 if KO
 	 */
-	function subscription($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0)
+	function subscription($date, $amount, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0)
 	{
 		global $conf,$langs,$user;
 
@@ -1267,7 +1267,7 @@ class Adherent extends CommonObject
 		$error=0;
 
 		// Clean parameters
-		if (! $montant) $montant=0;
+		if (! $amount) $amount=0;
 
 		$this->db->begin();
 
@@ -1287,7 +1287,7 @@ class Adherent extends CommonObject
 		$subscription->fk_adherent=$this->id;
 		$subscription->dateh=$date;		// Date of new subscription
 		$subscription->datef=$datefin;	// End data of new subscription
-		$subscription->amount=$montant;
+		$subscription->amount=$amount;
 		$subscription->note=$label;
 
 		$rowid=$subscription->create($user);
@@ -1300,7 +1300,7 @@ class Adherent extends CommonObject
 			{
 				// Change properties of object (used by triggers)
 				$this->last_subscription_date=dol_now();
-				$this->last_subscription_amount=$montant;
+				$this->last_subscription_amount=$amount;
 				$this->last_subscription_date_start=$date;
 				$this->last_subscription_date_end=$datefin;
 			}
@@ -1319,11 +1319,303 @@ class Adherent extends CommonObject
 		else
 		{
 			$this->error=$subscription->error;
+			$this->errors=$subscription->errors;
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
+
+	/**
+	 *	Do complementary actions after subscription recording.
+	 *
+	 *	@param	int			$subscriptionid		Id of created subscription
+	 *  @param	string		$option				Which action ('bankdirect', 'invoiceonly', ...)
+	 *	@param	int			$accountid			Id bank account
+	 *	@param	int			$datesubscription	Date of subscription
+	 *	@param	int			$paymentdate		Date of payment
+	 *	@param	string		$operation			Code of type of operation (if Id bank account provided). Example 'CB', ...
+	 *	@param	string		$label				Label operation (if Id bank account provided)
+	 *	@param	double		$amount     		Amount of subscription (0 accepted for some members)
+	 *	@param	string		$num_chq			Numero cheque (if Id bank account provided)
+	 *	@param	string		$emetteur_nom		Name of cheque writer
+	 *	@param	string		$emetteur_banque	Name of bank of cheque
+	 *  @param	string		$autocreatethirdparty	Auto create new thirdparty if member not linked to a thirdparty.
+	 *	@return int         					<0 if KO, >0 if OK
+	 */
+	function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom='', $emetteur_banque='', $autocreatethirdparty=0)
+	{
+		global $conf, $langs, $user, $mysoc;
+
+		$error = 0;
+
+		// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
+		if ($option == 'bankdirect' && $accountid)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+			$acct=new Account($this->db);
+			$result=$acct->fetch($accountid);
+
+			$dateop=$paymentdate;
+
+			$insertid=$acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
+			if ($insertid > 0)
+			{
+				$inserturlid=$acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
+				if ($inserturlid > 0)
+				{
+					// Update table subscription
+					$sql ="UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
+					$sql.=" WHERE rowid=".$subscriptionid;
+
+					dol_syslog("subscription::subscription", LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if (! $resql)
+					{
+						$error++;
+						$this->error=$this->db->lasterror();
+						$this->errors[]=$this->error;
+					}
+				}
+				else
+				{
+					$error++;
+					$this->error=$acct->error;
+					$this->errors=$acct->errors;
+				}
+			}
+			else
+			{
+				$error++;
+				$this->error=$acct->error;
+				$this->errors=$acct->errors;
+			}
+		}
+
+		// If option choosed, we create invoice
+		if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
+
+			$invoice=new Facture($this->db);
+			$customer=new Societe($this->db);
+
+			if (! $error)
+			{
+				if (! ($this->fk_soc > 0))
+				{
+					if ($autocreatethirdparty)
+					{
+						// Create a linked thirdparty to member
+						$companyalias='';
+						$fullname = $this->getFullName($langs);
+
+						if ($this->morphy == 'mor')
+						{
+							$companyname=$this->societe;
+							if (! empty($fullname)) $companyalias=$fullname;
+						}
+						else
+						{
+							$companyname=$fullname;
+							if (! empty($this->societe)) $companyalias=$this->societe;
+						}
+
+						$result=$customer->create_from_member($this, $companyname, $companyalias);
+						if ($result < 0)
+						{
+							$this->error = $company->error;
+							$this->errors = $company->errors;
+							$error++;
+						}
+						else
+						{
+							$this->fk_soc = $result;
+						}
+					}
+					else
+					{
+						 $langs->load("errors");
+						 $this->error=$langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
+						 $this->errors[]=$this->error;
+						 $error++;
+					}
+				}
+			}
+			if (! $error)
+			{
+				$result=$customer->fetch($this->fk_soc);
+				if ($result <= 0)
+				{
+					$this->error=$customer->error;
+					$this->errors=$customer->errors;
+					$error++;
+				}
+			}
+
+			if (! $error)
+			{
+				// Create draft invoice
+				$invoice->type=Facture::TYPE_STANDARD;
+				$invoice->cond_reglement_id=$customer->cond_reglement_id;
+				if (empty($invoice->cond_reglement_id))
+				{
+					$paymenttermstatic=new PaymentTerm($this->db);
+					$invoice->cond_reglement_id=$paymenttermstatic->getDefaultId();
+					if (empty($invoice->cond_reglement_id))
+					{
+						$error++;
+						$this->error='ErrorNoPaymentTermRECEPFound';
+						$this->errors[]=$this->error;
+					}
+				}
+				$invoice->socid=$this->fk_soc;
+				$invoice->date=$datesubscription;
+
+				// Possibility to add external linked objects with hooks
+				$invoice->linked_objects['subscription'] = $subscriptionid;
+				if (! empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects']))
+				{
+					$invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
+				}
+
+				$result=$invoice->create($user);
+				if ($result <= 0)
+				{
+					$this->error=$invoice->error;
+					$this->errors=$invoice->errors;
+					$error++;
+				}
+			}
+
+			if (! $error)
+			{
+				// Add line to draft invoice
+				$idprodsubscription=0;
+				if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+
+				$vattouse=0;
+				if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
+				{
+					$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
+				}
+				//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
+				$result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datesubscription,$datesubend,0,0,'','TTC',$amount,1);
+				if ($result <= 0)
+				{
+					$this->error=$invoice->error;
+					$this->errors=$invoice->errors;
+					$error++;
+				}
+			}
+
+			if (! $error)
+			{
+				// Validate invoice
+				$result=$invoice->validate($user);
+				if ($result <= 0)
+				{
+					$this->error=$invoice->error;
+					$this->errors=$invoice->errors;
+					$error++;
+				}
+			}
+
+			// Add payment onto invoice
+			if (! $error && $option == 'bankviainvoice' && $accountid)
+			{
+				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/lib/functions.lib.php';
+
+				$amounts = array();
+				$amounts[$invoice->id] = price2num($amount);
+
+				$paiement = new Paiement($this->db);
+				$paiement->datepaye     = $paymentdate;
+				$paiement->amounts      = $amounts;
+				$paiement->paiementid   = dol_getIdFromCode($this->db,$operation,'c_paiement','code','id',1);
+				$paiement->num_paiement = $num_chq;
+				$paiement->note         = $label;
+				$paiement->note_public  = $label;
+
+				if (! $error)
+				{
+					// Create payment line for invoice
+					$paiement_id = $paiement->create($user);
+					if (! $paiement_id > 0)
+					{
+						$this->error=$paiement->error;
+						$this->errors=$paiement->errors;
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					// Add transaction into bank account
+					$bank_line_id=$paiement->addPaymentToBank($user,'payment','(SubscriptionPayment)',$accountid,$emetteur_nom,$emetteur_banque);
+					if (! ($bank_line_id > 0))
+					{
+						$this->error=$paiement->error;
+						$this->errors=$paiement->errors;
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					// Update fk_bank into subscription table
+					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
+					$sql.= ' WHERE rowid='.$subscriptionid;
+
+					$result = $this->db->query($sql);
+					if (! $result)
+					{
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					// Set invoice as paid
+					$invoice->set_paid($user);
+				}
+
+				if (! $error)
+				{
+					// 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 = $customer->default_lang;
+					if (! empty($newlang)) {
+							$outputlangs = new Translate("", $conf);
+							$outputlangs->setDefaultLang($newlang);
+					}
+					// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
+					//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+
+					$invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			}
+		}
+
+		if ($error)
+		{
+			return -1;
+		}
+		else
+		{
+			return 1;
+		}
+	}
+
+
 	/**
 	 *		Function that validate a member
 	 *
@@ -2155,9 +2447,9 @@ class Adherent extends CommonObject
 	/**
 	 * 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
+	 * @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)
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 8d4b7829925..efb3627ddbf 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -118,7 +118,7 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 {
 	if ($result > 0)
 	{
-		// Creation user
+		// Creation of thirdparty
 		$company = new Societe($db);
 		$result=$company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'));
 
@@ -203,8 +203,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
     $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;
@@ -222,7 +222,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     {
         $paymentdate=dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
     }
-    $subscription=price2num(GETPOST("subscription",'alpha'));	// Amount of subscription
+    $amount=price2num(GETPOST("subscription",'alpha'));	// Amount of subscription
     $label=$_POST["label"];
 
     // Payment informations
@@ -233,6 +233,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $emetteur_banque=$_POST["chqbank"];
     $option=$_POST["paymentsave"];
     if (empty($option)) $option='none';
+    $sendalsoemail=GETPOST("sendmail",'alpha');
 
     // Check parameters
     if (! $datesubscription)
@@ -263,8 +264,6 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         $action='addsubscription';
     }
 
-    $amount = price2num(GETPOST("subscription",'alpha'));
-
     // Check if a payment is mandatory or not
     if (! $error && $adht->subscription)	// Member type need subscriptions
     {
@@ -284,7 +283,7 @@ if ($user->rights->adherent->cotisation->creer && $action == '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"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("FinancialAccount"));
+                    if ($_POST["paymentsave"] != 'invoiceonly' && ! ($_POST["accountid"] > 0)) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("FinancialAccount"));
                 }
                 else
                 {
@@ -292,6 +291,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 }
                 if ($errmsg)
                 {
+                	$error++;
         			setEventMessages($errmsg, null, 'errors');
                 	$action='addsubscription';
                 }
@@ -299,12 +299,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         }
     }
 
+    // Record the subscription then complementary actions
     if (! $error && $action=='subscription')
     {
         $db->begin();
 
         // Create subscription
-        $crowid=$object->subscription($datesubscription, $subscription, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
+        $crowid=$object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
         if ($crowid <= 0)
         {
             $error++;
@@ -314,233 +315,12 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
         if (! $error)
         {
-            // Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
-            if ($option == 'bankdirect' && $accountid)
-            {
-                require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-                $acct=new Account($db);
-                $result=$acct->fetch($accountid);
-
-                $dateop=$paymentdate;
-
-                $insertid=$acct->addline($dateop, $operation, $label, $subscription, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
-                if ($insertid > 0)
-                {
-                    $inserturlid=$acct->add_url_line($insertid, $object->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $object->getFullname($langs), 'member');
-                    if ($inserturlid > 0)
-                    {
-                        // Update table subscription
-                        $sql ="UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
-                        $sql.=" WHERE rowid=".$crowid;
-
-                        dol_syslog("subscription::subscription", LOG_DEBUG);
-                        $resql = $db->query($sql);
-                        if (! $resql)
-                        {
-                            $error++;
-                            $errmsg=$db->lasterror();
-        					setEventMessages($errmsg, null, 'errors');
-                        }
-                    }
-                    else
-					{
-                        $error++;
-                        $errmsg=$acct->error;
-                        $errmsgs=$acct->errors;
-        				setEventMessages($errmsg, $errmsgs, 'errors');
-					}
-                }
-                else
-				{
-                    $error++;
-                    $errmsg=$acct->error;
-                    $errmsgs=$acct->errors;
-        			setEventMessages($errmsg, $errmsgs, 'errors');
-				}
-            }
-
-            // If option choosed, we create invoice
-            if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly')
-            {
-                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
-
-                $invoice=new Facture($db);
-                $customer=new Societe($db);
-
-                if (! $error)
-                {
-                	if (! ($object->fk_soc > 0))
-                	{
-                		$langs->load("errors");
-                		$errmsg=$langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
-        				setEventMessages($errmsg, null, 'errors');
-                		$error++;
-                	}
-                }
-                if (! $error)
-                {
-	                $result=$customer->fetch($object->fk_soc);
-	                if ($result <= 0)
-	                {
-	                    $errmsg=$customer->error;
-	                    $errmsgs=$acct->errors;
-        				setEventMessages($errmsg, $errmsgs, 'errors');
-	                    $error++;
-	                }
-                }
-
-                if (! $error)
-                {
-	                // Create draft invoice
-	                $invoice->type= Facture::TYPE_STANDARD;
-	                $invoice->cond_reglement_id=$customer->cond_reglement_id;
-	                if (empty($invoice->cond_reglement_id))
-	                {
-	                    $paymenttermstatic=new PaymentTerm($db);
-	                    $invoice->cond_reglement_id=$paymenttermstatic->getDefaultId();
-	                    if (empty($invoice->cond_reglement_id))
-	                    {
-	                        $error++;
-	                        $errmsg='ErrorNoPaymentTermRECEPFound';
-        					setEventMessages($errmsg, null, 'errors');
-	                    }
-	                }
-	                $invoice->socid=$object->fk_soc;
-	                $invoice->date=$datesubscription;
-
-	                // Possibility to add external linked objects with hooks
-	                $invoice->linked_objects['subscription'] = $crowid;
-	                if (! empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects']))
-	                {
-	                    $invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
-	                }
-
-	                $result=$invoice->create($user);
-	                if ($result <= 0)
-	                {
-	                    $errmsg=$invoice->error;
-	                    $errmsgs=$invoice->errors;
-        				setEventMessages($errmsg, $errmsgs, 'errors');
-	                    $error++;
-	                }
-                }
-
-                if (! $error)
-                {
-	                // Add line to draft invoice
-	                $idprodsubscription=0;
-			        if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
-
-	                $vattouse=0;
-	                if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
-	                {
-	                	$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
-	                }
-	                //print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
-	                $result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datesubscription,$datesubend,0,0,'','TTC',$subscription,1);
-	                if ($result <= 0)
-	                {
-	                    $errmsg=$invoice->error;
-        				setEventMessages($errmsg, null, 'errors');
-	                    $error++;
-	                }
-                }
-
-                if (! $error)
-                {
-	                // Validate invoice
-	                $result=$invoice->validate($user);
-   	                if ($result <= 0)
-	                {
-	                    $errmsg=$invoice->error;
-	                    $errmsgs=$invoice->errors;
-        				setEventMessages($errmsg, $errmsgs, 'errors');
-	                    $error++;
-	                }
-                }
-
-                // Add payment onto invoice
-                if ($option == 'bankviainvoice' && $accountid)
-                {
-                    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/lib/functions.lib.php';
-
-                    $amounts[$invoice->id] = price2num($subscription);
-                    $paiement = new Paiement($db);
-                    $paiement->datepaye     = $paymentdate;
-                    $paiement->amounts      = $amounts;
-                    $paiement->paiementid   = dol_getIdFromCode($db,$operation,'c_paiement','code','id',1);
-                    $paiement->num_paiement = $num_chq;
-                    $paiement->note         = $label;
-
-                    if (! $error)
-                    {
-	                    // Create payment line for invoice
-                    	$paiement_id = $paiement->create($user);
-                        if (! $paiement_id > 0)
-                        {
-                            $errmsg=$paiement->error;
-                            $errmsgs=$paiement->errors;
-        					setEventMessages($errmsg, $errmsgs, 'errors');
-                            $error++;
-                        }
-                    }
-
-                    if (! $error)
-                    {
-                    	// Add transaction into bank account
-                        $bank_line_id=$paiement->addPaymentToBank($user,'payment','(SubscriptionPayment)',$accountid,$emetteur_nom,$emetteur_banque);
-                        if (! ($bank_line_id > 0))
-                        {
-                            $errmsg=$paiement->error;
-                            $errmsgs=$paiement->errors;
-	                        setEventMessages($paiement->error, $paiement->errors, 'errors');
-                            $error++;
-                        }
-                    }
-
-                    if (! $error)
-                    {
-                        // Update fk_bank into subscription table
-                        $sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
-                        $sql.= ' WHERE rowid='.$crowid;
-
-	                    $result = $db->query($sql);
-                        if (! $result)
-                        {
-                            $error++;
-                        }
-                    }
-
-                    if (! $error)
-                    {
-                        // Set invoice as paid
-                    	$invoice->set_paid($user);
-                    }
-
-                    if (! $error)
-                    {
-						// 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 = $customer->default_lang;
-						if (! empty($newlang)) {
-							$outputlangs = new Translate("", $conf);
-							$outputlangs->setDefaultLang($newlang);
-						}
-                    	// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
-						//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-
-	                    $invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                    }
-                }
-            }
+        	$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');
+			}
         }
 
         if (! $error)
@@ -557,7 +337,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         if (! $error)
         {
             // Send confirmation Email
-            if ($object->email && $_POST["sendmail"])
+            if ($object->email && $sendalsoemail)
             {
                 $subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
                 $texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
@@ -569,7 +349,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         			setEventMessages($errmsg, null, 'errors');
                 }
             }
+        }
 
+        // Clean some POST vars
+        if (! $error)
+        {
             $_POST["subscription"]='';
             $_POST["accountid"]='';
             $_POST["operation"]='';
@@ -933,7 +717,7 @@ if ($rowid > 0)
 
         print load_fiche_titre($langs->trans("NewCotisation"));
 
-        // Define default choice to select
+        // 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
@@ -944,11 +728,11 @@ if ($rowid > 0)
         	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;
-       		else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && ! empty($conf->banque->enabled)) $bankdirect=1;
+        	else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && ! empty($conf->banque->enabled)) $bankdirect=1;
         	else if (! 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";
 
@@ -1047,15 +831,11 @@ if ($rowid > 0)
         }
         if (! $datefrom)
         {
-            if ($object->datefin > 0)
+        	$datefrom=$object->datevalid;
+        	if ($object->datefin > 0)
             {
                 $datefrom=dol_time_plus_duree($object->datefin,1,'d');
             }
-            else
-			{
-                //$datefrom=dol_now();
-				$datefrom=$object->datevalid;
-            }
         }
         print $form->select_date($datefrom,'','','','',"subscription",1,1,1);
         print "</td></tr>";
@@ -1207,7 +987,7 @@ if ($rowid > 0)
             $subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
             $texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
 
-            $tmp='<input name="sendmail" type="checkbox"'.(GETPOST('sendmail')?GETPOST('sendmail'):(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?' checked':'')).'>';
+            $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";
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d514bbaf603..c9bc13eefe4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -239,7 +239,7 @@ class Facture extends CommonInvoice
 	 * 	@param	int		$forceduedate	1=Do not recalculate due date from payment condition but force it with value
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function create($user,$notrigger=0,$forceduedate=0)
+	function create(User $user, $notrigger=0, $forceduedate=0)
 	{
 		global $langs,$conf,$mysoc,$hookmanager;
 		$error=0;
@@ -265,13 +265,13 @@ class Facture extends CommonInvoice
 			$this->multicurrency_tx = 1;
 		}
 
-		dol_syslog(get_class($this)."::create user=".$user->id);
+		dol_syslog(get_class($this)."::create user=".$user->id." date=".$this->date);
 
 		// Check parameters
-		if (empty($this->date) || empty($user->id))
+		if (empty($this->date))
 		{
-			$this->error="ErrorBadParameter";
-			dol_syslog(get_class($this)."::create Try to create an invoice with an empty parameter (user, date, ...)", LOG_ERR);
+			$this->error="Try to create an invoice with an empty parameter (date)";
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -3;
 		}
 		$soc = new Societe($this->db);
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 350a73d3571..37873033535 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -285,10 +285,18 @@ if ($action == 'dopayment')
 		$desc=GETPOST("desc",'alpha');
 
 		$mesg='';
-		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))
+		{
+			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+			$action='';
+		}
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-		elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+		elseif (! $origfulltag)
+		{
+			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+			$action='';
+		}
 
 		//var_dump($_POST);
 		if (empty($mesg))
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 7e5413e6509..5e3ba33949c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -271,21 +271,136 @@ $ispostactionok = 0;
 $postactionmessages = array();
 if ($ispaymentok)
 {
+	// Set permission for the anonymous user
+	$user->rights->societe->creer = 1;
+	$user->rights->facture->creer = 1;
+	$user->rights->adherent->cotisation->creer = 1;
+
 	if (in_array('MEM', array_keys($tmptag)))
 	{
+		$defaultdelay=1;
+		$defaultdelayunit='y';
+
 		// Record subscription
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		$member = new Adherent($db);
-		$result = $member->fetch(0, $tmptag['MEM']);
-		if ($result)
-		{
-			if (empty($paymentType)) $paymentType = 'CB';
-			$paymentTypeId      = dol_getIdFromCode($db, $paymentType,'c_paiement','code','id',1);
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+		$adht = new AdherentType($db);
+		$object = new Adherent($db);
 
+		$result1 = $object->fetch(0, $tmptag['MEM']);
+		$result2 = $adht->fetch($object->typeid);
+
+		if ($result1 > 0 && $result2 > 0)
+		{
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') $paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'paypal') $paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'stripe') $paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			if (empty($paymentTypeId))
+			{
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) $paymentType = 'CB';
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType   = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (! empty($FinalPaymentAmt) && $paymentTypeId > 0)
 			{
+				// Subscription informations
+				$datesubscription=$object->datevalid;
+				if ($object->datefin > 0)
+				{
+					$datesubscription=dol_time_plus_duree($object->datefin,1,'d');
+				}
+				$datesubend=dol_time_plus_duree(dol_time_plus_duree($datesubscription,$defaultdelay,$defaultdelayunit),-1,'d');
+				$paymentdate=$now;
+				$amount = $FinalPaymentAmt;
+				$label='Online subscription '.dol_print_date($now, 'standard');
 
+				// Payment informations
+				$accountid = 0;
+				if ($paymentmethod == 'paybox') $accountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+				if ($paymentmethod == 'paypal') $accountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+				if ($paymentmethod == 'stripe') $accountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+				$operation=$paymentTypeId; // Payment mode
+				$num_chq='';
+				$emetteur_nom='';
+				$emetteur_banque='';
+				// Define default choice for complementary actions
+				$option='';
+				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)) $option='bankviainvoice';
+				else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && ! empty($conf->banque->enabled)) $option='bankdirect';
+				else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $option='invoiceonly';
+				if (empty($option)) $option='none';
+				$sendalsoemail = 1;
 
+				// Record the subscription then complementary actions
+				$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;
+					$postactionmessages[] = $errmsg;
+					$ispostactionok = -1;
+				}
+				else
+				{
+					$postactionmessages[]='Subscription created';
+					$ispostactionok=1;
+				}
+
+				if (! $error)
+				{
+					$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque, 1);
+					if ($result < 0)
+					{
+						$error++;
+						$postactionmessages[] = $object->error;
+						$postactionmessages = array_merge($postactionmessages, $object->errors);
+						$ispostactionok = -1;
+					}
+					else
+					{
+						if ($option == 'bankviainvoice') $postactionmessages[] = 'Invoice, payment and bank record created';
+						if ($option == 'bankdirect')     $postactionmessages[] = 'Bank record created';
+						if ($option == 'invoiceonly')    $postactionmessages[] = 'Invoice recorded';
+						$ispostactionok = 1;
+					}
+				}
+
+				if (! $error)
+				{
+					$db->commit();
+				}
+				else
+				{
+					$db->rollback();
+				}
+
+				// Send email
+				if (! $error)
+				{
+					// Send confirmation Email
+					if ($object->email && $sendalsoemail)
+					{
+						$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
+						$texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
+
+						$result=$object->send_an_email($texttosend,$subjecttosend,array(),array(),array(),"","",0,-1);
+						if ($result < 0)
+						{
+							$errmsg=$object->error;
+							$postactionmessages[] = $errmsg;
+							$ispostactionok = -1;
+						}
+					}
+				}
 			}
 			else
 			{
@@ -295,7 +410,7 @@ if ($ispaymentok)
 		}
 		else
 		{
-			$postactionmessages[] = 'Member for subscription payed '.$tmptag['MEM'].' was not found';
+			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
 			$ispostactionok = -1;
 		}
 	}
@@ -322,8 +437,11 @@ if ($ispaymentok)
 
 			$currencyCodeType   = $_SESSION['currencyCodeType'];
 
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (! empty($FinalPaymentAmt) && $paymentTypeId > 0)
 			{
+				$db->begin();
+
 				// Creation of payment line
 				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 				$paiement = new Paiement($db);
@@ -644,6 +762,7 @@ htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix);
 unset($_SESSION["FinalPaymentAmt"]);
 unset($_SESSION["TRANSACTIONID"]);
 
+
 llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index db614ed833e..94b686c3b35 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3102,6 +3102,8 @@ class Societe extends CommonObject
 	{
 		global $user,$langs;
 
+		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
+
 		$name = $socname?$socname:$member->societe;
 		if (empty($name)) $name=$member->getFullName($langs);
 
@@ -3134,7 +3136,6 @@ class Societe extends CommonObject
 			$sql.= " SET fk_soc=".$this->id;
 			$sql.= " WHERE rowid=".$member->id;
 
-			dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{

From 0cfa19ee09f931c23b0254287adeadf552ba4034 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Mar 2018 00:12:23 +0100
Subject: [PATCH 322/386] NEW Online payment of invoice and subscription record
 the payment automatically.

---
 htdocs/adherents/class/adherent.class.php     |  5 +++--
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/langs/en_US/paypal.lang                |  3 ++-
 htdocs/paypal/lib/paypal.lib.php              |  4 ++--
 htdocs/public/payment/paymentok.php           | 17 ++++++++++++-----
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 4fd04a0a9c9..78fc662f6b4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1250,7 +1250,7 @@ class Adherent extends CommonObject
 	 *	@param	int	        $date        		Date of effect of subscription
 	 *	@param	double		$amount     		Amount of subscription (0 accepted for some members)
 	 *	@param	int			$accountid			Id bank account
-	 *	@param	string		$operation			Type operation (if Id bank account provided)
+	 *	@param	string		$operation			Type of payment (if Id bank account provided). Example: 'CB', ...
 	 *	@param	string		$label				Label operation (if Id bank account provided)
 	 *	@param	string		$num_chq			Numero cheque (if Id bank account provided)
 	 *	@param	string		$emetteur_nom		Name of cheque writer
@@ -1288,7 +1288,8 @@ class Adherent extends CommonObject
 		$subscription->dateh=$date;		// Date of new subscription
 		$subscription->datef=$datefin;	// End data of new subscription
 		$subscription->amount=$amount;
-		$subscription->note=$label;
+		$subscription->note=$label;		// deprecated
+		$subscription->note_public=$label;
 
 		$rowid=$subscription->create($user);
 		if ($rowid > 0)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 93c7c4ad941..7c49ff909d6 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2242,7 +2242,7 @@ class Facture extends CommonInvoice
 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+			$sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".($user->id > 0 ? $user->id : "null").", date_valid = '".$this->db->idate($now)."'";
 			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
 				$sql.= ", datef='".$this->db->idate($this->date)."'";
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index aec7404924b..25f06dacd42 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -31,4 +31,5 @@ ErrorSeverityCode=Error Severity Code
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
 PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
\ No newline at end of file
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
\ No newline at end of file
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index dc2e95c44da..c34e964c522 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -342,7 +342,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
     $nvpstr = '';
-    $nvpstr = $nvpstr . "&VERSION=98.0";
+    //$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))
@@ -592,7 +592,7 @@ function hash_call($methodName,$nvpStr)
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
     // TODO problem with triggers
-    $API_version="56";
+    $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";
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5e3ba33949c..83b672604cc 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -272,6 +272,9 @@ $postactionmessages = array();
 if ($ispaymentok)
 {
 	// Set permission for the anonymous user
+	if (empty($user->rights->societe))  $user->rights->societe=new stdClass();
+	if (empty($user->rights->facture))  $user->rights->facture=new stdClass();
+	if (empty($user->rights->adherent)) { $user->rights->adherent=new stdClass(); $user->rights->adherent->cotisation=new stdClass(); }
 	$user->rights->societe->creer = 1;
 	$user->rights->facture->creer = 1;
 	$user->rights->adherent->cotisation->creer = 1;
@@ -318,14 +321,14 @@ if ($ispaymentok)
 				$datesubend=dol_time_plus_duree(dol_time_plus_duree($datesubscription,$defaultdelay,$defaultdelayunit),-1,'d');
 				$paymentdate=$now;
 				$amount = $FinalPaymentAmt;
-				$label='Online subscription '.dol_print_date($now, 'standard');
+				$label='Online subscription '.dol_print_date($now, 'standard').' using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID;
 
 				// Payment informations
 				$accountid = 0;
 				if ($paymentmethod == 'paybox') $accountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
 				if ($paymentmethod == 'paypal') $accountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
 				if ($paymentmethod == 'stripe') $accountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
-				$operation=$paymentTypeId; // Payment mode
+				$operation=$paymentType; // Payment mode code
 				$num_chq='';
 				$emetteur_nom='';
 				$emetteur_banque='';
@@ -460,7 +463,7 @@ if ($ispaymentok)
 				}
 				$paiement->paiementid   = $paymentTypeId;
 				$paiement->num_paiement = '';
-				$paiement->note_public  = 'Online payment using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID;
+				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID;
 
 				if (! $error)
 				{
@@ -556,7 +559,7 @@ if ($ispaymentok)
 
 
     print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-    print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+    if ($TRANSACTIONID) print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
 
     $key='ONLINE_PAYMENT_MESSAGE_OK';
     if (! empty($conf->global->$key)) print $conf->global->$key;
@@ -635,12 +638,16 @@ if ($ispaymentok)
 		{
 			$content.=' * '.$postactionmessage.'<br>'."\n";
 		}
+		if ($ispostactionok < 0)
+		{
+			$content.= $langs->transnoentities("ARollbackWasPerformedOnPostActions");
+		}
 		$content.='<br>'."\n";
 
 		$content.="<br>\n";
 		$content.='<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
 		$content.=$companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
-		$content.=$companylangs->transnoentitiesnoconv("TransactionId").': <strong>'.$TRANSACTIONID."</strong><br>\n";
+		$content.=$companylangs->transnoentitiesnoconv("ThisIsTransactionId").': <strong>'.$TRANSACTIONID."</strong><br>\n";
 		$content.=$companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 		$content.="<br>\n";
 		$content.="tag=".$fulltag."<br>\ntoken=".$onlinetoken."<br>\npaymentType=".$paymentType."<br>\ncurrencycodeType=".$currencyCodeType."<br>\npayerId=".$payerID."<br>\nipaddress=".$ipaddress."<br>\nFinalPaymentAmt=".$FinalPaymentAmt."<br>\n";

From 4a46ffc5d8a4750c8dcc4d05c2900fde7b4426f4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 6 Mar 2018 05:02:09 +0100
Subject: [PATCH 323/386] Add information in VAT admin page

---
 htdocs/admin/taxes.php            | 225 +++++++++++++++++-------------
 htdocs/langs/en_US/companies.lang |   1 +
 htdocs/langs/en_US/main.lang      |   3 +
 3 files changed, 134 insertions(+), 95 deletions(-)

diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index bbf2435436e..f904c7750f8 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2018 Alexandre Spangaro   <aspangaro@zendsi.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,12 +30,14 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load('admin');
+$langs->load('objects');
+$langs->load("companies");
 
 if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 
-// Other parameters ACCOUNTING_*
+// Other parameters
 $list = array (
 		'ACCOUNTING_VAT_PAY_ACCOUNT'
 );
@@ -59,51 +61,55 @@ $list = array (
 $tax_mode = empty($conf->global->TAX_MODE)?0:$conf->global->TAX_MODE;
 
 if ($action == 'update') {
-    $error = 0;
+	$error = 0;
 
 	// Tax mode
 	$tax_mode = GETPOST('tax_mode','alpha');
 
-    $db->begin();
+	$db->begin();
 
-    $res = dolibarr_set_const($db, 'TAX_MODE', $tax_mode,'chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, 'TAX_MODE', $tax_mode,'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
 
-    switch ($tax_mode)
-    {
-        case 0:
-            $value = 'payment';
-            break;
-        case 1:
-            $value = 'invoice';
-            break;
-    }
+	switch ($tax_mode)
+	{
+		case 0:
+			$value = 'payment';
+			break;
+		case 1:
+			$value = 'invoice';
+			break;
+	}
 
-    $res = dolibarr_set_const($db, 'TAX_MODE_SELL_PRODUCT', 'invoice','chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
-    $res = dolibarr_set_const($db, 'TAX_MODE_BUY_PRODUCT', 'invoice','chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
-    $res = dolibarr_set_const($db, 'TAX_MODE_SELL_SERVICE', $value,'chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
-    $res = dolibarr_set_const($db, 'TAX_MODE_BUY_SERVICE', $value,'chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, 'TAX_MODE_SELL_PRODUCT', 'invoice','chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, 'TAX_MODE_BUY_PRODUCT', 'invoice','chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, 'TAX_MODE_SELL_SERVICE', $value,'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, 'TAX_MODE_BUY_SERVICE', $value,'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+
+	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva",'alpha'),'chaine',0,'',$conf->entity);
+
+	dolibarr_set_const($db, "MAIN_INFO_VAT_RETURN", GETPOST("MAIN_INFO_VAT_RETURN",'alpha'),'chaine',0,'',$conf->entity);
 
 	// Others options
-    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) {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (! $error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -122,74 +128,105 @@ dol_fiche_head();
 
 if (empty($mysoc->tva_assuj))
 {
-    print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
+	print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
 }
 else
 {
-    print '<table class="noborder" width="100%">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    // Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
-    print "</tr>\n";
-    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
-    print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
-    print "</td></tr>\n";
-    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
-    print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
+	print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+	print '<input name="tva" id="intra_vat" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
+	print '</td></tr>';
 
-    print "</table>\n";
+	print '<tr class="oddeven"><td><label for="activate_MAIN_INFO_VAT_RETURN">'.$langs->trans("VATReturn").'</label></td>';
+	if (! $conf->use_javascript_ajax)
+	{
+		print '<td class="nowrap" align="right">';
+		print $langs->trans("NotAvailableWhenAjaxDisabled");
+		print "</td>";
+	}
+	else
+	{
+		print '<td width="120">';
+		$listval=array('0'=>$langs->trans(""),
+		'1'=>$langs->trans("Monthly"),
+		'2'=>$langs->trans("Quarterly"),
+		'3'=>$langs->trans("Annual"),
+		);
+		print $form->selectarray("MAIN_INFO_VAT_RETURN", $listval, $conf->global->MAIN_INFO_VAT_RETURN);
+		print "</td>";
+	}
+	print '</tr>';
 
-    print '<br>';
-    print load_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'','');
-    //print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')';
+	print '</table>';
 
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
+	print "<br>\n";
 
-    // Products
-    print '<tr class="oddeven"><td>'.$langs->trans("Product").'</td>';
-    print '<td>';
-    print $langs->trans("OnDelivery");
-    print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
-    print '</td>';
-    print '<td>';
-    print $langs->trans("OnDelivery");
-    print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
-    print '</td></tr>';
+	print '<table class="noborder" width="100%">';
 
-    // Services
-    print '<tr class="oddeven"><td>'.$langs->trans("Services").'</td>';
-    print '<td>';
-    if ($tax_mode == 0)
-    {
-        print $langs->trans("OnPayment");
-        print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-    }
-    if ($tax_mode == 1)
-    {
-        print $langs->trans("OnInvoice");
-        print ' ('.$langs->trans("InvoiceDateUsed").')';
-    }
-    print '</td>';
-    print '<td>';
-    if ($tax_mode == 0)
-    {
-        print $langs->trans("OnPayment");
-        print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-    }
-    if ($tax_mode == 1)
-    {
-        print $langs->trans("OnInvoice");
-        print ' ('.$langs->trans("InvoiceDateUsed").')';
-    }
-    print '</td></tr>';
+	// Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
+	print "</tr>\n";
+	print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
+	print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
+	print "</td></tr>\n";
+	print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
+	print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
 
-    print '</table>';
+	print "</table>\n";
+
+	print '<br>';
+	print load_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'','');
+	//print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
+
+	// Products
+	print '<tr class="oddeven"><td>'.$langs->trans("Product").'</td>';
+	print '<td>';
+	print $langs->trans("OnDelivery");
+	print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
+	print '</td>';
+	print '<td>';
+	print $langs->trans("OnDelivery");
+	print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
+	print '</td></tr>';
+
+	// Services
+	print '<tr class="oddeven"><td>'.$langs->trans("Services").'</td>';
+	print '<td>';
+	if ($tax_mode == 0)
+	{
+		print $langs->trans("OnPayment");
+		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
+	}
+	if ($tax_mode == 1)
+	{
+		print $langs->trans("OnInvoice");
+		print ' ('.$langs->trans("InvoiceDateUsed").')';
+	}
+	print '</td>';
+	print '<td>';
+	if ($tax_mode == 0)
+	{
+		print $langs->trans("OnPayment");
+		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
+	}
+	if ($tax_mode == 1)
+	{
+		print $langs->trans("OnInvoice");
+		print ' ('.$langs->trans("InvoiceDateUsed").')';
+	}
+	print '</td></tr>';
+
+	print '</table>';
 }
 
 print "<br>\n";
@@ -204,8 +241,6 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	
-
 	print '<tr class="oddeven value">';
 
 	// Param
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7d2b878c5cc..57ff05ed8ac 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -258,6 +258,7 @@ ProfId4DZ=NIS
 VATIntra=Sales tax ID
 VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 0fd9fe52b3e..41891a9e091 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -921,3 +921,6 @@ CommentDeleted=Comment deleted
 Everybody=Everybody
 PayedBy=Payed by
 PayedTo=Payed to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
\ No newline at end of file

From c133b04abf7c51cdbf6900770f7ac808eadc5649 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 13:16:12 +0100
Subject: [PATCH 324/386] ADD banktransfer account for stripe webhook

---
 htdocs/stripe/admin/stripe.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index f9cdb049304..e25a84ee6a6 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -65,6 +65,8 @@ if (empty($conf->stripeconnect->enabled)) {
 	if (! $result > 0) $error++;
 	$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_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);
 	if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM','alpha'),'chaine',0,'',$conf->entity);
@@ -223,6 +225,11 @@ if (! empty($conf->banque->enabled))
 	print $langs->trans("BankAccount").'</td><td>';
 	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
+  
+  print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+	print '</td></tr>';
 }
 
 print '<tr class="oddeven"><td>';

From 5e0327329c896f0f62e80edd3c83853a3a568e0b Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 13:23:35 +0100
Subject: [PATCH 325/386] NEW convert rib.php to gateways.php

do stripe integration
be conform to PSD2 rules
less tab fo company
---
 htdocs/societe/gateway.php | 985 +++++++++++++++++++++++++++++++++++++
 1 file changed, 985 insertions(+)
 create mode 100644 htdocs/societe/gateway.php

diff --git a/htdocs/societe/gateway.php b/htdocs/societe/gateway.php
new file mode 100644
index 00000000000..79a9a60bb96
--- /dev/null
+++ b/htdocs/societe/gateway.php
@@ -0,0 +1,985 @@
+<?php
+/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
+ * Copyright (C) 2015-2016 Marcos García        <marcosgdf@gmail.com>
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/societe/rib.php
+ *      \ingroup    societe
+ *		\brief      BAN tab for companies
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+
+$langs->load("companies");
+$langs->load("commercial");
+$langs->load("banks");
+$langs->load("bills");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe','','');
+
+$id=GETPOST("id","int");
+$source=GETPOST("source","alpha");
+$ribid=GETPOST("ribid","int");
+$action=GETPOST("action", 'alpha', 3);
+
+$object = new Societe($db);
+$object->fetch($socid);
+
+$account = new CompanyBankAccount($db);
+$prelevement = new BonPrelevement($db);
+
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$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('thirdpartybancard','globalcard'));
+
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('thirdpartybancard'));
+
+
+
+/*
+ *	Actions
+ */
+
+$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$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 ($cancel)
+	{
+		$action='';
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
+
+
+	if ($action == 'update' && ! $_POST["cancel"])
+	{
+		// Modification
+		if (! GETPOST('label'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$action='edit';
+			$error++;
+		}
+		if (! GETPOST('bank'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			$action='edit';
+			$error++;
+		}
+		if ($account->needIBAN() == 1)
+		{
+			if (! GETPOST('iban'))
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+				$action='edit';
+				$error++;
+			}
+			if (! GETPOST('bic'))
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+				$action='edit';
+				$error++;
+			}
+		}
+
+		$account->fetch($id);
+		if (! $error)
+		{
+			$account->socid           = $object->id;
+
+			$account->bank            = GETPOST('bank','alpha');
+			$account->label           = GETPOST('label','alpha');
+			$account->courant         = GETPOST('courant','alpha');
+			$account->clos            = GETPOST('clos','alpha');
+			$account->code_banque     = GETPOST('code_banque','alpha');
+			$account->code_guichet    = GETPOST('code_guichet','alpha');
+			$account->number          = GETPOST('number','alpha');
+			$account->cle_rib         = GETPOST('cle_rib','alpha');
+			$account->bic             = GETPOST('bic','alpha');
+			$account->iban            = GETPOST('iban','alpha');
+			$account->domiciliation   = GETPOST('domiciliation','alpha');
+			$account->proprio         = GETPOST('proprio','alpha');
+			$account->owner_address   = GETPOST('owner_address','alpha');
+			$account->frstrecur       = GETPOST('frstrecur','alpha');
+			$account->rum             = GETPOST('rum','alpha');
+			if (empty($account->rum))
+			{
+				$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+				$account->date_rum = dol_now();
+			}
+
+			$result = $account->update($user);
+			if (! $result)
+			{
+				setEventMessages($account->error, $account->errors, 'errors');
+			}
+			else
+			{
+				// If this account is the default bank account, we disable others
+				if ($account->default_rib)
+				{
+					$account->setAsDefault($id);	// This will make sure there is only one default rib
+				}
+
+				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+		}
+	}
+
+	if ($action == 'add' && ! $_POST["cancel"])
+	{
+		$error=0;
+
+		if (! GETPOST('label'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$action='create';
+			$error++;
+		}
+		if (! GETPOST('bank'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			$action='create';
+			$error++;
+		}
+
+		if (! $error)
+		{
+			// Ajout
+			$account = new CompanyBankAccount($db);
+
+			$account->socid           = $object->id;
+
+			$account->bank            = GETPOST('bank','alpha');
+			$account->label           = GETPOST('label','alpha');
+			$account->courant         = GETPOST('courant','alpha');
+			$account->clos            = GETPOST('clos','alpha');
+			$account->code_banque     = GETPOST('code_banque','alpha');
+			$account->code_guichet    = GETPOST('code_guichet','alpha');
+			$account->number          = GETPOST('number','alpha');
+			$account->cle_rib         = GETPOST('cle_rib','alpha');
+			$account->bic             = GETPOST('bic','alpha');
+			$account->iban            = GETPOST('iban','alpha');
+			$account->domiciliation   = GETPOST('domiciliation','alpha');
+			$account->proprio         = GETPOST('proprio','alpha');
+			$account->owner_address   = GETPOST('owner_address','alpha');
+			$account->frstrecur       = GETPOST('frstrecur');
+			$account->rum             = GETPOST('rum','alpha');
+			$account->datec			  = dol_now();
+
+			$db->begin();
+
+			// This test can be done only once properties were set
+			if ($account->needIBAN() == 1)
+			{
+				if (! GETPOST('iban'))
+				{
+					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+					$action='create';
+					$error++;
+				}
+				if (! GETPOST('bic'))
+				{
+					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+					$action='create';
+					$error++;
+				}
+			}
+
+			if (! $error)
+			{
+				$result = $account->create($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($account->error, $account->errors, 'errors');
+					$action='create';     // Force chargement page création
+				}
+
+				if (empty($account->rum))
+				{
+					$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+					$account->date_rum = dol_now();
+				}
+			}
+
+			if (! $error)
+			{
+				$result = $account->update($user);	// This will set the UMR number.
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($account->error, $account->errors, 'errors');
+					$action='create';
+				}
+			}
+
+			if (! $error)
+			{
+				$db->commit();
+
+				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+			else
+			{
+				$db->rollback();
+			}
+		}
+	}
+
+	if ($action == 'setasdefault')
+	{
+		$account = new CompanyBankAccount($db);
+		$res = $account->setAsDefault(GETPOST('ribid','int'));
+		if ($res)
+		{
+			$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
+			header('Location: '.$url);
+			exit;
+		}
+		else
+		{
+			setEventMessages($db->lasterror, null, 'errors');
+		}
+	}
+
+	if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
+	{
+		$account = new CompanyBankAccount($db);
+		if ($account->fetch($ribid?$ribid:$id))
+		{
+			$result = $account->delete($user);
+			if ($result > 0)
+			{
+				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+			else
+			{
+				setEventMessages($account->error, $account->errors, 'errors');
+			}
+		}
+		else
+		{
+			setEventMessages($account->error, $account->errors, 'errors');
+		}
+	}
+
+	$savid=$id;
+
+	// Actions to build doc
+	if ($action == 'builddocrib')
+	{
+		$action = 'builddoc';
+		$moreparams = array(
+			'use_companybankid'=>GETPOST('companybankid'),
+			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
+		);
+		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
+		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
+	}
+	$id = $socid;
+	$upload_dir = $conf->societe->multidir_output[$object->entity];
+	$permissioncreate=$user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	$id = $savid;
+}
+
+$stripeconnect=new StripeConnexion($db);
+$customer=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
+if ($customer->id) {
+$cu = \Stripe\Customer::retrieve("".$customer->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
+$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
+if ($action == 'setasdefault')
+{
+$cu->default_source = "$source"; // obtained with Stripe.js
+$cu->save();
+
+header('Location: '.$url);
+exit;
+}
+elseif ($action == 'delete')
+{
+$cu->sources->retrieve("$source")->delete();
+
+header('Location: '.$url);
+exit;
+}
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader();
+
+$head=societe_prepare_head($object);
+if (! $id)
+{
+	$account->fetch(0,$object->id);
+}
+else
+{
+	$account->fetch($id);
+}
+if (empty($account->socid)) $account->socid=$object->id;
+
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
+}
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+}
+
+
+// View
+if ($socid && $action != 'edit' && $action != "create")
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
+
+	// Confirm delete third party
+	if ($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
+	}
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+if (! (empty($conf->stripe->enabled))){
+print '<tr><td class="titlefield">';
+print $langs->trans('StripeGateways').'</td><td colspan="3">';
+if ($stripeconnect->GetStripeAccount($conf->entity)) {
+$customer=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
+}
+
+if ($customer->id) {
+$input=$customer->sources->data;
+}
+print '<table class="liste" width="100%">'."\n";
+print '<tr class="liste_titre">';
+print '<td align="left">'.$langs->trans('Type').'</td>';
+print '<td align="left">'.$langs->trans('Informations').'</td>';
+print '<td align="left"></td>';
+print '<td align="center">'.$langs->trans('Default').'</td>';
+print "<td></td></tr>\n";
+    
+foreach ($input as $src) {
+print '<tr>';
+print '<td>';
+if ($src->object=='card'){
+if ($src->brand == 'Visa') {$brand='cc-visa';}
+elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
+elseif ($src->brand == 'American Express') {$brand='cc-amex';}
+elseif ($src->brand == 'Discover') {$brand='cc-discover';}
+elseif ($src->brand == 'JCB') {$brand='cc-jcb';}
+elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
+else {$brand='credit-card';}
+print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+}
+elseif ($src->object=='source' && $src->type=='card'){
+if ($src->card->brand == 'Visa') {$brand='cc-visa';}
+elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
+elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
+elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
+elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
+elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
+else {$brand='credit-card';}
+
+print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+}
+elseif ($src->object=='source' && $src->type=='sepa_debit'){
+print '<span class="fa fa-university fa-3x fa-fw"></span>';
+}
+print'</td><td valign="middle">';
+if ($src->object=='card'){
+print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
+print '</td><td>';
+ if ($src->country)
+	{
+		$img=picto_from_langcode($src->country);
+		print $img?$img.' ':'';
+		print getCountry($src->country,1);
+	}
+	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+}
+elseif ($src->object=='source' && $src->type=='card'){
+print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
+print '</td><td>';
+ if ($src->card->country)
+	{
+		$img=picto_from_langcode($src->card->country);
+		print $img?$img.' ':'';
+		print getCountry($src->card->country,1);
+	}
+	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+}
+elseif ($src->object=='source' && $src->type=='sepa_debit'){
+print 'info sepa';
+print '</td><td>';
+ if ($src->sepa_debit->country)
+	{
+		$img=picto_from_langcode($src->sepa_debit->country);
+		print $img?$img.' ':'';
+		print getCountry($src->sepa_debit->country,1);
+	}
+	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+}
+print '</td>';
+            // Default
+            print '<td align="center" width="50">';
+            if (($cu->default_source!=$src->id)) {
+                print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
+                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
+                print '</a>';
+            } else {
+                print "<SPAN class=' fa fa-check-circle  fa-2x'></SPAN>";
+            }
+            print '</td>';
+print '<td align="center">';
+            if ($user->rights->societe->creer)
+            {
+//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
+//            	print img_picto($langs->trans("Modify"),'edit');
+//            	print '</a>';
+//           		print '&nbsp;';
+           		print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=delete">';
+           		print "<SPAN class='fa fa-trash fa-2x'></SPAN>";
+           		print '</a>';
+            }
+print '</td></tr>';
+}
+if (empty($input))
+{
+print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
+}	
+print "</table>";
+}
+
+	// List of bank accounts
+
+	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+
+	print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
+
+	$rib_list = $object->get_all_rib();
+	$var = false;
+	if (is_array($rib_list))
+	{
+		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" width="100%">';
+
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("LabelRIB");
+		print_liste_field_titre("Bank");
+		print_liste_field_titre("RIB");
+		print_liste_field_titre("IBAN");
+		print_liste_field_titre("BIC");
+		if (! empty($conf->prelevement->enabled))
+		{
+			print print_liste_field_titre("RUM");
+			print print_liste_field_titre("WithdrawMode");
+		}
+		print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
+		print_liste_field_titre('', '', '', '', '', 'align="center"');
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print "</tr>\n";
+
+		foreach ($rib_list as $rib)
+		{
+			print '<tr class="oddeven">';
+			// Label
+			print '<td>'.$rib->label.'</td>';
+			// Bank name
+			print '<td>'.$rib->bank.'</td>';
+			// Account number
+			print '<td>';
+			$string='';
+			foreach ($rib->getFieldsToShow() as $val) {
+
+				if ($val == 'BankCode') {
+					$string .= $rib->code_banque.' ';
+				} elseif ($val == 'BankAccountNumber') {
+					$string .= $rib->number.' ';
+				} elseif ($val == 'DeskCode') {
+					$string .= $rib->code_guichet.' ';
+				} elseif ($val == 'BankAccountNumberKey') {
+					$string .= $rib->cle_rib.' ';
+				/* Already output after
+                }elseif ($val == 'BIC') {
+                    $string .= $rib->bic.' ';
+                }elseif ($val == 'IBAN') {
+                    $string .= $rib->iban.' ';*/
+				}
+			}
+			if (! empty($rib->label) && $rib->number) {
+				if (! checkBanForAccount($rib)) {
+					$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
+				} else {
+					$string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
+				}
+			}
+
+			print $string;
+			print '</td>';
+			// IBAN
+			print '<td>'.$rib->iban;
+   			if (! empty($rib->iban)) {
+				if (! checkIbanForAccount($rib)) {
+					print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
+				} else {
+					print ' '.img_picto($langs->trans("IbanValid"),'info');
+				}
+			}
+			print '</td>';
+			// BIC
+			print '<td>'.$rib->bic;
+			if (! empty($rib->bic)) {
+				if (! checkSwiftForAccount($rib)) {
+					print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
+				} else {
+					print ' '.img_picto($langs->trans("SwiftValid"),'info');
+				}
+			}
+			print '</td>';
+
+			if (! empty($conf->prelevement->enabled))
+			{
+				// RUM
+				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
+				print '<td>'.$rib->rum.'</td>';
+
+				// FRSTRECUR
+				print '<td>'.$rib->frstrecur.'</td>';
+			}
+
+			// Default
+			print '<td align="center" width="70">';
+			if (!$rib->default_rib) {
+				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasdefault">';
+				print img_picto($langs->trans("Disabled"),'off');
+				print '</a>';
+			} else {
+				print img_picto($langs->trans("Enabled"),'on');
+			}
+			print '</td>';
+
+			// Generate doc
+			print '<td align="center">';
+
+			$buttonlabel = $langs->trans("BuildDoc");
+			$forname='builddocrib'.$rib->id;
+
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+			$modellist=ModeleBankAccountDoc::liste_modeles($db);
+
+			$out = '';
+			if (is_array($modellist) && count($modellist))
+			{
+				$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+				$out.= '<input type="hidden" name="action" value="builddocrib">';
+				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
+				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
+
+				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				{
+					$arraykeys=array_keys($modellist);
+					$modelselected=$arraykeys[0];
+				}
+				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
+
+				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out.= ajax_combobox('modelrib'.$rib->id);
+
+				// Language code (if multilang)
+				if ($conf->global->MAIN_MULTILANGS)
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+					$formadmin=new FormAdmin($db);
+					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+					$morecss='maxwidth150';
+					if (! empty($conf->browser->phone)) $morecss='maxwidth100';
+					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
+				}
+				// Button
+				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+				$genbutton.= '>';
+				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+				{
+					$langs->load("errors");
+					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+				}
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+				$out.= $genbutton;
+				$out.= '</form>';
+			}
+			print $out;
+			print '</td>';
+
+			// Edit/Delete
+			print '<td align="right">';
+			if ($user->rights->societe->creer)
+			{
+				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
+				print img_picto($langs->trans("Modify"),'edit');
+				print '</a>';
+
+		   		print '&nbsp;';
+
+		   		print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
+		   		print img_picto($langs->trans("Delete"),'delete');
+		   		print '</a>';
+			}
+			print '</td>';
+
+			print '</tr>';
+		}
+
+		if (count($rib_list) == 0)
+		{
+			$colspan=8;
+			if (! empty($conf->prelevement->enabled)) $colspan+=2;
+			print '<tr '.$bc[0].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
+		}
+
+		print '</table>';
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
+
+	dol_fiche_end();
+/*
+	if ($socid && $action != 'edit' && $action != 'create')
+	{
+		// Barre d'actions
+		print '<div class="tabsAction">';
+
+		if ($user->rights->societe->creer)
+		{
+			print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+		}
+
+		print '</div>';
+	}
+*/
+	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+	{
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		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;
+
+		$var=true;
+
+		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+		print '</div></div></div>';
+
+		print '<br>';
+	}
+	/*
+    include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+    $modellist=ModeleBankAccountDoc::liste_modeles($db);
+    //print '<td>';
+    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+    {
+        $arraykeys=array_keys($modellist);
+        $modelselected=$arraykeys[0];
+    }
+    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+    $out.= ajax_combobox('model');
+    //print $out;
+    $buttonlabel=$langs->trans("Generate");
+    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+    $genbutton.= '>';
+    print $genbutton;
+    //print '</td>';     // TODO Add link to generate doc
+    */
+}
+
+// Edit
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td><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>';
+
+	// Show fields of bank account
+	foreach ($account->getFieldsToShow(1) as $val) {
+
+		$require=false;
+		if ($val == 'BankCode') {
+			$name = 'code_banque';
+			$size = 8;
+			$content = $account->code_banque;
+		} elseif ($val == 'DeskCode') {
+			$name = 'code_guichet';
+			$size = 8;
+			$content = $account->code_guichet;
+		} elseif ($val == 'BankAccountNumber') {
+			$name = 'number';
+			$size = 18;
+			$content = $account->number;
+		} elseif ($val == 'BankAccountNumberKey') {
+			$name = 'cle_rib';
+			$size = 3;
+			$content = $account->cle_rib;
+		} elseif ($val == 'IBAN') {
+			$name = 'iban';
+			$size = 30;
+			$content = $account->iban;
+			if ($account->needIBAN()) $require=true;
+		} elseif ($val == 'BIC') {
+			$name = 'bic';
+			$size = 12;
+			$content = $account->bic;
+			if ($account->needIBAN()) $require=true;
+		}
+
+		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
+		print '</tr>';
+	}
+
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
+	print $account->domiciliation;
+	print "</textarea></td></tr>";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+	print "</td></tr>\n";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+	print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+	print $account->owner_address;
+	print "</textarea></td></tr>";
+
+	print '</table>';
+
+	if ($conf->prelevement->enabled)
+	{
+		print '<br>';
+
+		print '<table class="border" width="100%">';
+
+		if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+
+		// RUM
+		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
+		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
+
+		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
+		print '</td></tr>';
+
+		print '</table>';
+	}
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	print '<div align="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>';
+}
+
+
+// Create
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+	print '<div class="nofichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
+	print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
+
+	// Show fields of bank account
+	foreach ($account->getFieldsToShow(1) as $val) {
+
+		$require=false;
+		if ($val == 'BankCode') {
+			$name = 'code_banque';
+			$size = 8;
+		} elseif ($val == 'DeskCode') {
+			$name = 'code_guichet';
+			$size = 8;
+		} elseif ($val == 'BankAccountNumber') {
+			$name = 'number';
+			$size = 18;
+		} elseif ($val == 'BankAccountNumberKey') {
+			$name = 'cle_rib';
+			$size = 3;
+		} elseif ($val == 'IBAN') {
+			$name = 'iban';
+			$size = 30;
+			if ($account->needIBAN()) $require=true;
+		} elseif ($val == 'BIC') {
+			$name = 'bic';
+			$size = 12;
+			if ($account->needIBAN()) $require=true;
+		}
+
+		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
+		print '</tr>';
+	}
+
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+	print GETPOST('domiciliation');
+	print "</textarea></td></tr>";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
+	print "</td></tr>\n";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+	print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+	print GETPOST('owner_address');
+	print "</textarea></td></tr>";
+
+	print '</table>';
+
+	if ($conf->prelevement->enabled)
+	{
+		print '<br>';
+
+		print '<table class="border" width="100%">';
+
+		// RUM
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
+		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+
+		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+		print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
+		print '</td></tr>';
+
+		print '</table>';
+	}
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	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 '</div>';
+}
+
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	print '</form>';
+}
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	print '</form>';
+}
+
+
+llxFooter();
+
+$db->close();

From 10b16187d4fa9a286cd431045f0b573986a6c43c Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 13:26:40 +0100
Subject: [PATCH 326/386] NEW convert rib.php to gateway.php

---
 htdocs/core/lib/company.lib.php | 301 ++++++++++++++++++++------------
 1 file changed, 194 insertions(+), 107 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 354bbdeddef..38b59876494 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -181,8 +181,8 @@ function societe_prepare_head(Societe $object)
         $langs->load("banks");
 
         $nbBankAccount=0;
-        $head[$h][0] = DOL_URL_ROOT .'/societe/rib.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("BankAccounts");
+        $head[$h][0] = DOL_URL_ROOT .'/societe/gateway.php?socid='.$object->id;
+        $head[$h][1] = $langs->trans("Gateways");
         $sql = "SELECT COUNT(n.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
         $sql.= " WHERE fk_soc = ".$object->id;
@@ -206,7 +206,7 @@ function societe_prepare_head(Societe $object)
         $h++;
     }
 
-    if (! empty($conf->website->enabled) && (!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");
@@ -573,7 +573,7 @@ function getFormeJuridiqueLabel($code)
 }
 
 /**
- *  Return if a country is inside the EEC (European Economic Community)
+ *  Return if a country of an object is inside the EEC (European Economic Community)
  *  TODO Add a field into country dictionary.
  *
  *  @param      Object      $object    Object
@@ -640,7 +640,6 @@ function isInEEC($object)
 function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0, $morehtmlright='')
 {
     global $user;
-    global $bc;
 
     $i = -1 ;
 
@@ -768,10 +767,10 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
  */
 function show_contacts($conf,$langs,$db,$object,$backtopage='')
 {
-    global $user,$conf;
-    global $bc;
+	global $user,$conf,$extrafields,$hookmanager;
+	global $contextpage;
 
-    $form= new Form($db);
+    $form = new Form($db);
 
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
@@ -782,24 +781,67 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     $search_addressphone = GETPOST("search_addressphone",'alpha');
 
     if (! $sortorder) $sortorder="ASC";
-    if (! $sortfield) $sortfield="p.lastname";
+    if (! $sortfield) $sortfield="t.lastname";
 
+    if (! empty($conf->clicktodial->enabled))
+    {
+    	$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
+    }
+
+
+    $contactstatic = new Contact($db);
+
+    $extralabels=$extrafields->fetch_name_optionals_label($contactstatic->table_element);
+
+    $contactstatic->fields=array(
+    'name'      =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
+    'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOfFunction',   'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>20),
+    'address'   =>array('type'=>'varchar(128)', 'label'=>'Address',          'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>30),
+    'statut'    =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>40, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0,1), 1=>$contactstatic->LibStatut(1,1))),
+    );
+
+    // 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.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),
+    't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>40, 'align'=>'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 (! empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$contactstatic->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key])!=3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key]));
+    	}
+    }
+
+    // Initialize array of search criterias
+    $search=array();
+    foreach($contactstatic->fields as $key => $val)
+    {
+    	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    }
+
+
+    // 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_name         = '';
     	$search_addressphone = '';
     	$search_array_options=array();
+
+    	foreach($contactstatic->fields as $key => $val)
+   		{
+   			$search[$key]='';
+   		}
+   		$toselect='';
     }
 
-    $i=-1;
-
-    $contactstatic = new Contact($db);
-
-    if (! empty($conf->clicktodial->enabled))
-    {
-        $user->fetch_clicktodial(); // lecture des infos de clicktodial
-    }
+    $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');
+    $arrayfields = dol_sort_array($arrayfields, 'position');
 
     $buttoncreate='';
     if ($user->rights->societe->contact->creer)
@@ -815,26 +857,32 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print load_fiche_titre($title, $buttoncreate,'');
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
 
+    $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-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print "\n".'<table class="noborder" width="100%">'."\n";
+	print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+    print "\n".'<table class="tagtable liste">'."\n";
 
     $param="socid=".$object->id;
     if ($search_status != '') $param.='&amp;search_status='.$search_status;
     if ($search_name != '') $param.='&amp;search_name='.urlencode($search_name);
 
-    $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.civility, p.poste, p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.email, p.skype, p.statut, p.photo,";
-    $sql .= " p.civility as civility_id, p.address, p.zip, p.town";
-    $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-    $sql .= " WHERE p.fk_soc = ".$object->id;
-    if ($search_status!='' && $search_status != '-1') $sql .= " AND p.statut = ".$db->escape($search_status);
-    if ($search_name)       $sql .= " AND (p.lastname LIKE '%".$db->escape($search_name)."%' OR p.firstname LIKE '%".$db->escape($search_name)."%')";
-    $sql.= " ORDER BY $sortfield $sortorder";
+    $sql = "SELECT t.rowid, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.skype, t.statut, t.photo,";
+    $sql .= " t.civility as civility_id, t.address, t.zip, t.town";
+    $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
+    $sql .= " WHERE t.fk_soc = ".$object->id;
+    if ($search_status!='' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
+    if ($search_name)       $sql .= " AND (t.lastname LIKE '%".$db->escape($search_name)."%' OR t.firstname LIKE '%".$db->escape($search_name)."%')";
+    if ($sortfield == "t.name") $sql.=" ORDER BY t.lastname $sortorder, t.firstname $sortorder";
+    else $sql.= " ORDER BY $sortfield $sortorder";
 
     dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
     $result = $db->query($sql);
@@ -842,59 +890,63 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $num = $db->num_rows($result);
 
-    $colspan=9;
-
-	print '<tr class="liste_titre">';
-
-	// Photo - Name
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat minwidth75" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
-	print '</td>';
-
-	// Position
-	print '<td class="liste_titre">';
-	print '</td>';
-
-	// Address - Phone - Email
-	print '<td class="liste_titre"></td>';
-
-	// Status
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
-	print '</td>';
-
-	// Add to agenda
-	if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-	{
-		$colspan++;
-		print '<td class="liste_titre"></td>';
-	}
-
-	// Action
-	print '<td class="liste_titre" align="right">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-
-	print "</tr>";
-
-    $titlefieldaddress=$langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email");
-    if (! empty($conf->dol_optimize_smallscreen)) $titlefieldaddress=$langs->trans("Address");
-
+    // Fields title search
+    // --------------------------------------------------------------------
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Poste",$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($titlefieldaddress,$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"p.statut","",$param,'align="center"',$sortfield,$sortorder);
-    // Add to agenda
-    if (! empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create)) print_liste_field_titre('');
-    // Edit
-    print_liste_field_titre('');
-    print "</tr>\n";
+    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']))
+    	{
+    		print '<td class="liste_titre'.($align?' '.$align:'').'">';
+    		if (in_array($key, array('lastname','name'))) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+    		elseif (in_array($key, array('statut'))) print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
+    		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, $contactstatic);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+    print '</tr>'."\n";
+
+
+    // Fields title label
+    // --------------------------------------------------------------------
+    print '<tr class="liste_titre">';
+    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'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+    // Hook fields
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
+    print '</tr>'."\n";
+
+    $i = -1;
 
 	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
     {
-    	$i=0;
+    	$i = 0;
 
         while ($i < $num)
         {
@@ -923,46 +975,81 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             $contactstatic->country_code = $country_code;
 
             $contactstatic->setGenderFromCivility();
+            $contactstatic->fetch_optionals();
+
+            if (is_array($contactstatic->array_options))
+            {
+	            foreach($contactstatic->array_options as $key => $val)
+	            {
+	            	$obj->$key = $val;
+	            }
+            }
 
             print '<tr class="oddeven">';
 
+            // ID
+            if (! empty($arrayfields['t.rowid']['checked']))
+            {
+            	print '<td>';
+            	print $contactstatic->id;
+            	print '</td>';
+            }
+
 			// Photo - Name
-			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));
-			print '</td>';
+            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));
+				print '</td>';
+            }
 
 			// Job position
-			print '<td>';
-            if ($obj->poste) print $obj->poste;
-            print '</td>';
+            if (! empty($arrayfields['t.poste']['checked']))
+            {
+            	print '<td>';
+            	if ($obj->poste) print $obj->poste;
+            	print '</td>';
+            }
 
             // Address - Phone - Email
-            print '<td>';
-            print $contactstatic->getBannerAddress('contact', $object);
-            print '</td>';
+            if (! empty($arrayfields['t.address']['checked']))
+            {
+            	print '<td>';
+	            print $contactstatic->getBannerAddress('contact', $object);
+    	        print '</td>';
+            }
 
             // Status
-			print '<td align="center">'.$contactstatic->getLibStatut(5).'</td>';
+            if (! empty($arrayfields['t.statut']['checked']))
+            {
+            	print '<td align="center">'.$contactstatic->getLibStatut(5).'</td>';
+            }
 
-            // Add to agenda
+            // Extra fields
+            $extrafieldsobjectkey='socpeople';
+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+            // Actions
+			print '<td align="right">';
+
+			// Add to agenda
             if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
             {
-                print '<td align="center">';
                 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></td>';
+                print '</a> &nbsp; ';
             }
 
             // Edit
             if ($user->rights->societe->contact->creer)
             {
-                print '<td align="right">';
                 print '<a href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&amp;id='.$obj->rowid.'&amp;backtopage='.urlencode($backtopage).'">';
                 print img_edit();
-                print '</a></td>';
+                print '</a>';
             }
-            else print '<td>&nbsp;</td>';
+
+            print '</td>';
 
             print "</tr>\n";
             $i++;
@@ -970,9 +1057,9 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     }
     else
 	{
-        print '<tr class="oddeven">';
-        print '<td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td>';
-        print "</tr>\n";
+		$colspan=1;
+		foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print "\n</table>\n";
 	print '</div>';
@@ -995,7 +1082,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 function show_addresses($conf,$langs,$db,$object,$backtopage='')
 {
 	global $user;
-	global $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php';
 
@@ -1087,7 +1173,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
  */
 function show_actions_todo($conf,$langs,$db,$filterobj,$objcon='',$noprint=0,$actioncode='')
 {
-    global $bc,$user,$conf;
+    global $user,$conf;
 
     $out = show_actions_done($conf,$langs,$db,$filterobj,$objcon,1,$actioncode, 'todo');
 
@@ -1114,7 +1200,7 @@ function show_actions_todo($conf,$langs,$db,$filterobj,$objcon='',$noprint=0,$ac
  */
 function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=0, $actioncode='', $donetodo='done', $filters=array(), $sortfield='a.datep,a.id', $sortorder='DESC')
 {
-    global $bc,$user,$conf;
+    global $user,$conf;
     global $form;
 
     global $param;
@@ -1142,14 +1228,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         if (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql.= ", m.lastname, m.firstname";
         if (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql.= ", o.ref";
         if (is_object($filterobj) && get_class($filterobj) == 'Product') $sql.= ", o.ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
+        $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";
         if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
         if (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         if (is_object($filterobj) && get_class($filterobj) == 'Product') $sql.= ", ".MAIN_DB_PREFIX."product as o";
-        $sql.= " WHERE u.rowid = a.fk_user_action";
-        $sql.= " AND a.entity IN (".getEntity('agenda').")";
+        $sql.= " WHERE a.entity IN (".getEntity('agenda').")";
         if (is_object($filterobj) && get_class($filterobj) == 'Societe'  && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
         if (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;
         if (is_object($filterobj) && get_class($filterobj) == 'Adherent')
@@ -1192,7 +1278,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         if ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
         if (is_array($filters) && $filters['search_agenda_label']) $sql.= natural_search('a.label', $filters['search_agenda_label']);
         $sql.= $db->order($sortfield, $sortorder);
-
         dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
@@ -1298,7 +1383,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         }
     }
 
-
     if (! empty($conf->agenda->enabled) || (! empty($conf->mailing->enabled) && ! empty($objcon->email)))
     {
         $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
@@ -1385,7 +1469,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 
         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
 
             $out.='<tr class="oddeven">';
@@ -1407,8 +1490,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             //$userstatic->id=$histo[$key]['userid'];
             //$userstatic->login=$histo[$key]['login'];
             //$out.=$userstatic->getLoginUrl(1);
-            $userstatic->fetch($histo[$key]['userid']);
-            $out.=$userstatic->getNomUrl(-1);
+            if ($histo[$key]['userid'] > 0)
+            {
+            	$userstatic->fetch($histo[$key]['userid']);
+            	$out.=$userstatic->getNomUrl(-1);
+            }
             $out.='</td>';
 
             // Type
@@ -1560,7 +1646,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 function show_subsidiaries($conf,$langs,$db,$object)
 {
 	global $user;
-	global $bc;
 
 	$i=-1;
 
@@ -1622,3 +1707,5 @@ function show_subsidiaries($conf,$langs,$db,$object)
 	return $i;
 }
 
+
+

From f35606e434b28bb5287ebc6e0ed6ea1c97519e60 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 13:50:42 +0100
Subject: [PATCH 327/386] FIX update stripe php librairy

---
 htdocs/includes/stripe/.gitignore       |   3 +
 htdocs/includes/stripe/.travis.yml      |  30 +-
 htdocs/includes/stripe/CHANGELOG.md     | 454 +++++++++++++-----------
 htdocs/includes/stripe/README.md        |  98 ++++-
 htdocs/includes/stripe/VERSION          |   2 +-
 htdocs/includes/stripe/build.php        |   2 +-
 htdocs/includes/stripe/composer.json    |   2 +-
 htdocs/includes/stripe/init.php         |  38 +-
 htdocs/includes/stripe/update_certs.php |  19 +
 9 files changed, 412 insertions(+), 236 deletions(-)
 create mode 100644 htdocs/includes/stripe/update_certs.php

diff --git a/htdocs/includes/stripe/.gitignore b/htdocs/includes/stripe/.gitignore
index 93251c95077..17b94183baf 100644
--- a/htdocs/includes/stripe/.gitignore
+++ b/htdocs/includes/stripe/.gitignore
@@ -12,3 +12,6 @@ composer.lock
 
 # Ignore PHPUnit coverage file
 clover.xml
+
+# Ignore IDE's configuration files
+.idea
diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
index 934b517bfea..d575ed51a7d 100644
--- a/htdocs/includes/stripe/.travis.yml
+++ b/htdocs/includes/stripe/.travis.yml
@@ -1,18 +1,40 @@
+sudo: false
+
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
 
 env:
-  - AUTOLOAD=1
-  - AUTOLOAD=0
+  global:
+    - STRIPE_MOCK_VERSION=0.8.0
+  matrix:
+    - AUTOLOAD=1
+    - AUTOLOAD=0
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+    - stripe-mock
+
+before_install:
+  # Unpack and start stripe-mock so that the test suite can talk to it
+  - |
+    if [ ! -d "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}" ]; then
+      mkdir -p stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}/
+      curl -L "https://github.com/stripe/stripe-mock/releases/download/v${STRIPE_MOCK_VERSION}/stripe-mock_${STRIPE_MOCK_VERSION}_linux_amd64.tar.gz" -o "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}_linux_amd64.tar.gz"
+      tar -zxf "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}_linux_amd64.tar.gz" -C "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}/"
+    fi
+  - |
+    stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}/stripe-mock > /dev/null &
+    STRIPE_MOCK_PID=$!
 
 script: ./build.php ${AUTOLOAD}
+
 after_script: ./vendor/bin/coveralls -v
-sudo: false
diff --git a/htdocs/includes/stripe/CHANGELOG.md b/htdocs/includes/stripe/CHANGELOG.md
index 3650c21d1c2..3f0fdfce153 100644
--- a/htdocs/includes/stripe/CHANGELOG.md
+++ b/htdocs/includes/stripe/CHANGELOG.md
@@ -1,237 +1,315 @@
-### 4.7.0 2017-04-10
+# Changelog
 
+## 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
+
+## 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`
+
+## 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`
+
+## 6.3.1 - 2018-02-26
+* [#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
+
+## 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`
+
+## 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
+
+## 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`.
+
+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
+
+## 5.9.2 - 2018-02-07
+* [#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
+
+## 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
+
+## 5.8.0 - 2017-12-20
+* [#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
+
+## 5.6.0 - 2017-10-31
+* [#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
+
+## 5.5.0 - 2017-10-27
+* [#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
+
+## 5.3.0 - 2017-10-11
+* [#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`
+
+## 5.2.2 - 2017-09-20
+* Fix deserialization mapping of `FileUpload` objects
+
+## 5.2.1 - 2017-09-14
+* Serialized `shipping` nested attribute
+
+## 5.2.0 - 2017-08-29
+* Add support for `InvalidClient` OAuth error
+
+## 5.1.3 - 2017-08-14
+* 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)
+
+## 5.1.1 - 2017-07-03
+* Fix order returns to use the right URL `/v1/order_returns`
+
+## 5.1.0 - 2017-06-30
+* Add support for OAuth
+
+## 5.0.0 - 2017-06-27
+* `pay` on invoice now takes params as well as opts
+
+## 4.13.0 - 2017-06-19
+* Add support for ephemeral keys
+
+## 4.12.0 - 2017-06-05
+* Clients can implement `getUserAgentInfo()` to add additional user agent information
+
+## 4.11.0 - 2017-06-05
+* Implement `Countable` for `AttachedObject` (`metadata` and `additional_owners`)
+
+## 4.10.0 - 2017-05-25
+* Add support for login links
+
+## 4.9.1 - 2017-05-10
+* Fix docs to include arrays on `$id` parameter for retrieve methods
+
+## 4.9.0 - 2017-04-28
+* Support for checking webhook signatures
+
+## 4.8.1 - 2017-04-24
+* 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
+
+## 4.7.0 - 2017-04-10
 * Add support for payouts and recipient transfers
 
-### 4.6.0 2017-04-06
-
+## 4.6.0 - 2017-04-06
 * Please see 4.7.0 instead (no-op release)	
 
-### 4.5.1 2017-03-22
-
+## 4.5.1 - 2017-03-22
 * Remove hard dependency on cURL
 
-### 4.5.0 2017-03-20
-
+## 4.5.0 - 2017-03-20
 * Support for detaching sources from customers
 
-### 4.4.2 2017-02-27
-
+## 4.4.2 - 2017-02-27
 * Correct handling of `owner` parameter when updating sources
 
-### 4.4.1 2017-02-24
-
+## 4.4.1 - 2017-02-24
 * Correct the error check on a bad JSON decoding
 
-### 4.4.0 2017-01-18
-
+## 4.4.0 - 2017-01-18
 * Add support for updating sources
 
-### 4.3.0 2016-11-30
-
+## 4.3.0 - 2016-11-30
 * Add support for verifying sources
 
-### 4.2.0 2016-11-21
-
+## 4.2.0 - 2016-11-21
 * Add retrieve method for 3-D Secure resources
 
-### 4.1.1 2016-10-21
-
+## 4.1.1 - 2016-10-21
 * Add docblock with model properties for `Plan`
 
-### 4.1.0 2016-10-18
-
+## 4.1.0 - 2016-10-18
 * Support for 403 status codes (permission denied)
 
-### 4.0.1 2016-10-17
-
+## 4.0.1 - 2016-10-17
 * Fix transfer reversal materialization
 * Fixes for some property definitions in docblocks
 
-### 4.0.0 2016-09-28
-
+## 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!)
 
-### 3.23.0 2016-09-15
-
+## 3.23.0 - 2016-09-15
 * Add support for Apple Pay domains
 
-### 3.22.0 2016-09-13
-
+## 3.22.0 - 2016-09-13
 * Add `Stripe::setAppInfo` to allow plugins to register user agent information
 
-### 3.21.0 2016-08-25
-
+## 3.21.0 - 2016-08-25
 * Add `Source` model for generic payment sources
 
-### 3.20.0 2016-08-08
-
+## 3.20.0 - 2016-08-08
 * Add `getDeclineCode` to card errors
 
-### 3.19.0 2016-07-29
-
+## 3.19.0 - 2016-07-29
 * Opt requests directly into TLS 1.2 where OpenSSL >= 1.0.1 (see #277 for context)
 
-### 3.18.0 2016-07-28
-
+## 3.18.0 - 2016-07-28
 * Add new `STATUS_` constants for subscriptions
 
-### 3.17.1 2016-07-28
-
+## 3.17.1 - 2016-07-28
 * Fix auto-paging iterator so that it plays nicely with `iterator_to_array`
 
-### 3.17.0 2016-07-14
-
+## 3.17.0 - 2016-07-14
 * Add field annotations to model classes for better editor hinting
 
-### 3.16.0 2016-07-12
-
+## 3.16.0 - 2016-07-12
 * Add `ThreeDSecure` model for 3-D secure payments
 
-### 3.15.0 2016-06-29
-
+## 3.15.0 - 2016-06-29
 * Add static `update` method to all resources that can be changed.
 
-### 3.14.3 2016-06-20
-
+## 3.14.3 - 2016-06-20
 * Make sure that cURL never sends `Expects: 100-continue`, even on large request bodies
 
-### 3.14.2 2016-06-03
-
+## 3.14.2 - 2016-06-03
 * Add `inventory` under `SKU` to list of keys that have nested data and can be updated
 
-### 3.14.1 2016-05-27
-
+## 3.14.1 - 2016-05-27
 * Fix some inconsistencies in PHPDoc
 
-### 3.14.0 2016-05-25
-
+## 3.14.0 - 2016-05-25
 * Add support for returning Relay orders
 
-### 3.13.0 2016-05-04
-
+## 3.13.0 - 2016-05-04
 * Add `list`, `create`, `update`, `retrieve`, and `delete` methods to the Subscription class
 
-### 3.12.1 2016-04-07
-
+## 3.12.1 - 2016-04-07
 * Additional check on value arrays for some extra safety
 
-### 3.12.0 2016-03-31
-
+## 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
 
-### 3.11.0 2016-03-22
-
+## 3.11.0 - 2016-03-22
 * Allow `CurlClient` to be initialized with default `CURLOPT_*` options
 
-### 3.10.1 2016-03-22
-
+## 3.10.1 - 2016-03-22
 * Fix bug where request params and options were ignored in `ApplicationFee`'s `refund.`
 
-### 3.10.0 2016-03-15
-
+## 3.10.0 - 2016-03-15
 * Add `reject` on `Account` to support the new API feature
 
-### 3.9.2 2016-03-04
-
+## 3.9.2 - 2016-03-04
 * Fix error when an object's metadata is set more than once
 
-### 3.9.1 2016-02-24
-
+## 3.9.1 - 2016-02-24
 * Fix encoding behavior of nested arrays for requests (see #227)
 
-### 3.9.0 2016-02-09
-
+## 3.9.0 - 2016-02-09
 * Add automatic pagination mechanism with `autoPagingIterator()`
 * Allow global account ID to be set with `Stripe::setAccountId()`
 
-### 3.8.0 2016-02-08
-
+## 3.8.0 - 2016-02-08
 * Add `CountrySpec` model for looking up country payment information
 
-### 3.7.1 2016-02-01
-
+## 3.7.1 - 2016-02-01
 * Update bundled CA certs
 
-### 3.7.0 2016-01-27
-
+## 3.7.0 - 2016-01-27
 * Support deleting Relay products and SKUs
 
-### 3.6.0 2016-01-05
-
+## 3.6.0 - 2016-01-05
 * Allow configuration of HTTP client timeouts
 
-### 3.5.0 2015-12-01
-
+## 3.5.0 - 2015-12-01
 * Add a verification routine for external accounts
 
-### 3.4.0 2015-09-14
-
+## 3.4.0 - 2015-09-14
 * Products, SKUs, and Orders -- https://stripe.com/relay
 
-### 3.3.0 2015-09-11
-
+## 3.3.0 - 2015-09-11
 * Add support for 429 Rate Limit response
 
-### 3.2.0 2015-08-17
-
+## 3.2.0 - 2015-08-17
 * Add refund listing and retrieval without an associated charge
 
-### 3.1.0 2015-08-03
-
+## 3.1.0 - 2015-08-03
 * Add dispute listing and retrieval
 * Add support for manage account deletion
 
-### 3.0.0 2015-07-28
-
+## 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
 
-### 2.3.0 2015-07-06
-
+## 2.3.0 - 2015-07-06
 * Add request ID to all Stripe exceptions
 
-### 2.2.0 2015-06-01
-
+## 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
 
-### 2.1.4 2015-05-13
-
+## 2.1.4 - 2015-05-13
 * Fix CA certificate file path (thanks @lphilps & @matthewarkin)
 
-### 2.1.3 2015-05-12
-
+## 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
 
-### 2.1.2 2015-04-10
-
+## 2.1.2 - 2015-04-10
 * Remove SSL cert revokation checking (all pre-Heartbleed certs have expired)
 * Bug fixes to account updating
 
-### 2.1.1 2015-02-27
+## 2.1.1 - 2015-02-27
 * Support transfer reversals
 
-### 2.1.0 2015-02-19
-
+## 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
 
-### 2.0.1 2015-02-16
-
+## 2.0.1 - 2015-02-16
 * Fix to fetching endpoints that use a non-default baseUrl (`FileUpload`)
 
-### 2.0.0 2015-02-14
-
+## 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!)
@@ -239,192 +317,134 @@
 * 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
-
+## 1.18.0 - 2015-01-21
 * Support making bitcoin charges through BitcoinReceiver source object
 
-### 1.17.5 2014-12-23
-
+## 1.17.5 - 2014-12-23
 * Adding support for creating file uploads.
 
-### 1.17.4 2014-12-15
-
+## 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
 
-### 1.17.3 2014-11-06
-
+## 1.17.3 - 2014-11-06
 * Better handling of HHVM support for SSL certificate blacklist checking.
 
-### 1.17.2 2014-09-23
-
+## 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
 
-### 1.17.1 2014-07-31
-
+## 1.17.1 - 2014-07-31
 * Requests now send Content-Type header
 
-### 1.17.0 2014-07-29
-
+## 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
-
-### 1.16.0 2014-06-17
+* `__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
 
-### 1.15.0 2014-05-28
-
+## 1.15.0 - 2014-05-28
 * Support canceling transfers
 
-### 1.14.1 2014-05-21
-
+## 1.14.1 - 2014-05-21
 * Support cards for recipients.
 
-### 1.13.1 2014-05-15
-
+## 1.13.1 - 2014-05-15
 * Fix bug in account resource where `id` wasn't in the result
 
-### 1.13.0 2014-04-10
-
+## 1.13.0 - 2014-04-10
 * Add support for certificate blacklisting
 * Update ca bundle
 * Drop support for HHVM (Temporarily)
 
-### 1.12.0 2014-04-01
-
+## 1.12.0 - 2014-04-01
 * Add Stripe_RateLimitError for catching rate limit errors.
 * Update to Zend coding style (thanks,  @jpiasetz)
 
-### 1.11.0 2014-01-29
-
+## 1.11.0 - 2014-01-29
 * Add support for multiple subscriptions per customer
 
-### 1.10.1 2013-12-02
-
+## 1.10.1 - 2013-12-02
 * Add new ApplicationFee
 
-### 1.9.1 2013-11-08
-
+## 1.9.1 - 2013-11-08
 * Fix a bug where a null nestable object causes warnings to fire.
 
-### 1.9.0 2013-10-16
-
+## 1.9.0 - 2013-10-16
 * Add support for metadata API.
 
-### 1.8.4 2013-09-18
-
+## 1.8.4 - 2013-09-18
 * Add support for closing disputes.
 
-### 1.8.3 2013-08-13
-
+## 1.8.3 - 2013-08-13
 * 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.
-
-### 1.8.1 2013-07-12
+## 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.
 
+## 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)
 
-### 1.8.0 2013-04-11
-
+## 1.8.0 - 2013-04-11
 * Allow Transfers to be creatable
 * Add new Recipient resource
 
-### 1.7.15 2013-02-21
-
+## 1.7.15 - 2013-02-21
 * Add 'id' to the list of permanent object attributes
 
-### 1.7.14 2013-02-20
+## 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
-
-### 1.7.12 2013-01-15
+## 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
 
+## 1.7.12 - 2013-01-15
 * Add support for setting a Stripe API version override
 
-### 1.7.11 2012-12-30
-
-* Version bump to cleanup constants and such (github issue #26)
-
-### 1.7.10 2012-11-08
+## 1.7.11 - 2012-12-30
+* 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
 
-### 1.7.9 2012-11-08
+## 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
-  (github issue #22)
-
-### 1.7.8 2012-10-30
+## 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
 
-### 1.7.7 2012-09-14
-
-* Get all of the various version numbers in the repo in sync (no other
-  changes)
-
-### 1.7.6 2012-08-31
+## 1.7.7 - 2012-09-14
+* 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
 
-### 1.7.5 2012-08-23
+## 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
-
-### 1.7.3 2012-08-15
+## 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
 
+## 1.7.3 - 2012-08-15
 * Add new Account resource
 
-### 1.7.2 2012-06-26
+## 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
-  (github issue #12)
-
-### 1.7.0 2012-05-17
+## 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)
 
+## 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)
-
+* 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/README.md b/htdocs/includes/stripe/README.md
index 16642900a1f..fa492c45cc4 100644
--- a/htdocs/includes/stripe/README.md
+++ b/htdocs/includes/stripe/README.md
@@ -10,7 +10,7 @@ You can sign up for a Stripe account at https://stripe.com.
 
 ## Requirements
 
-PHP 5.3.3 and later.
+PHP 5.4.0 and later.
 
 ## Composer
 
@@ -20,7 +20,7 @@ You can install the bindings via [Composer](http://getcomposer.org/). Run the fo
 composer require stripe/stripe-php
 ```
 
-To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/00-intro.md#autoloading):
+To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/01-basic-usage.md#autoloading):
 
 ```php
 require_once('vendor/autoload.php');
@@ -36,7 +36,7 @@ require_once('/path/to/stripe-php/init.php');
 
 ## Dependencies
 
-The bindings require the following extension in order to work properly:
+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)
@@ -50,7 +50,7 @@ Simple usage looks like:
 
 ```php
 \Stripe\Stripe::setApiKey('sk_test_BQokikJOvBiI2HlWgH4olfQ2');
-$charge = \Stripe\Charge::create(array('amount' => 2000, 'currency' => 'usd', 'source' => 'tok_189fqt2eZvKYlo2CTGBeg6Uq' ));
+$charge = \Stripe\Charge::create(['amount' => 2000, 'currency' => 'usd', 'source' => 'tok_189fqt2eZvKYlo2CTGBeg6Uq']);
 echo $charge;
 ```
 
@@ -60,14 +60,19 @@ Please see https://stripe.com/docs/api for up-to-date documentation.
 
 ## Legacy Version Support
 
+### PHP 5.3
+
+If you are using PHP 5.3, you can download v5.8.0 ([zip](https://github.com/stripe/stripe-php/archive/v5.8.0.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v5.8.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.
+
+### 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');
-$myCard = array('number' => '4242424242424242', 'exp_month' => 8, 'exp_year' => 2018);
-$charge = Stripe_Charge::create(array('card' => $myCard, 'amount' => 2000, 'currency' => 'usd'));
+$charge = Stripe_Charge::create(array('source' => 'tok_XXXXXXXX', 'amount' => 2000, 'currency' => 'usd'));
 echo $charge;
 ```
 
@@ -98,13 +103,32 @@ Need to set a proxy for your requests? Pass in the requisite `CURLOPT_*` array t
 
 ```php
 // set up your tweaked Curl client
-$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_PROXY => 'proxy.local:80'));
+$curl = new \Stripe\HttpClient\CurlClient([CURLOPT_PROXY => 'proxy.local:80']);
 // tell Stripe to use the tweaked client
 \Stripe\ApiRequestor::setHttpClient($curl);
 ```
 
 Alternately, a callable can be passed to the CurlClient constructor that returns the above array based on request inputs. See `testDefaultOptions()` in `tests/CurlClientTest.php` for an example of this behavior. Note that the callable is called at the beginning of every API request, before the request is sent.
 
+### Configuring a Logger
+
+The library does minimal logging, but it can be configured
+with a [`PSR-3` compatible logger][psr3] so that messages
+end up there instead of `error_log`:
+
+```php
+\Stripe\Stripe::setLogger($logger);
+```
+
+### Accessing response data
+
+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'];
+```
+
 ### SSL / TLS compatibility issues
 
 Stripe's API now requires that [all connections use TLS 1.2](https://stripe.com/blog/upgrading-tls). Some systems (most notably some older CentOS and RHEL versions) are capable of using TLS 1.2 but will use TLS 1.0 or 1.1 by default. In this case, you'd get an `invalid_request_error` with the following error message: "Stripe no longer supports API requests made with TLS 1.0. Please initiate HTTPS connections with TLS 1.2 or later. You can learn more about this at [https://stripe.com/blog/upgrading-tls](https://stripe.com/blog/upgrading-tls).".
@@ -112,10 +136,49 @@ Stripe's API now requires that [all connections use TLS 1.2](https://stripe.com/
 The recommended course of action is to [upgrade your cURL and OpenSSL packages](https://support.stripe.com/questions/how-do-i-upgrade-my-stripe-integration-from-tls-1-0-to-tls-1-2#php) so that TLS 1.2 is used by default, but if that is not possible, you might be able to solve the issue by setting the `CURLOPT_SSLVERSION` option to either `CURL_SSLVERSION_TLSv1` or `CURL_SSLVERSION_TLSv1_2`:
 
 ```php
-$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1));
+$curl = new \Stripe\HttpClient\CurlClient([CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1]);
 \Stripe\ApiRequestor::setHttpClient($curl);
 ```
 
+### Per-request Configuration
+
+For apps that need to use multiple keys during the lifetime of a process, like
+one that uses [Stripe Connect][connect], it's also possible to set a
+per-request key and/or account:
+
+```php
+\Stripe\Charge::all([], [
+    'api_key' => 'sk_test_...',
+    'stripe_account' => 'acct_...'
+]);
+
+\Stripe\Charge::retrieve("ch_18atAXCdGbJFKhCuBAa4532Z", [
+    'api_key' => 'sk_test_...',
+    'stripe_account' => 'acct_...'
+]);
+```
+
+### Configuring CA Bundles
+
+By default, the library will use its own internal bundle of known CA
+certificates, but it's possible to configure your own:
+
+```php
+\Stripe\Stripe::setCABundlePath("path/to/ca/bundle");
+```
+
+### Configuring Automatic Retries
+
+The library can be configured to automatically retry requests that fail due to
+an intermittent network problem:
+
+```php
+\Stripe\Stripe::setMaxNetworkRetries(2);
+```
+
+[Idempotency keys][idempotency-keys] are added to requests to guarantee that
+retries are safe.
+
 ## Development
 
 Install dependencies:
@@ -124,7 +187,12 @@ Install dependencies:
 composer install
 ```
 
-## Tests
+The test suite depends on [stripe-mock], so make sure to fetch and run it from a
+background terminal ([stripe-mock's README][stripe-mock] also contains
+instructions for installing via Homebrew and other methods):
+
+    go get -u github.com/stripe/stripe-mock
+    stripe-mock
 
 Install dependencies as mentioned above (which will resolve [PHPUnit](http://packagist.org/packages/phpunit/phpunit)), then you can run the test suite:
 
@@ -138,6 +206,12 @@ Or to run an individual test file:
 ./vendor/bin/phpunit tests/UtilTest.php
 ```
 
+Update bundled CA certificates from the [Mozilla cURL release][curl]:
+
+```bash
+./update_certs.php
+```
+
 ## 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:
@@ -151,3 +225,9 @@ The method should be called once, before any request is sent to the API. The sec
 ### SSL / TLS configuration option
 
 See the "SSL / TLS compatibility issues" paragraph above for full context. If you want to ensure that your plugin can be used on all systems, you should add a configuration option to let your users choose between different values for `CURLOPT_SSLVERSION`: none (default), `CURL_SSLVERSION_TLSv1` and `CURL_SSLVERSION_TLSv1_2`.
+
+[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
+[stripe-mock]: https://github.com/stripe/stripe-mock
diff --git a/htdocs/includes/stripe/VERSION b/htdocs/includes/stripe/VERSION
index f6cdf40983f..4c77920fd2c 100644
--- a/htdocs/includes/stripe/VERSION
+++ b/htdocs/includes/stripe/VERSION
@@ -1 +1 @@
-4.7.0
+6.4.1
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
index 4401bb4b81f..cd053e2baea 100755
--- a/htdocs/includes/stripe/build.php
+++ b/htdocs/includes/stripe/build.php
@@ -10,7 +10,7 @@ if (!$autoload) {
     $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));
+    file_put_contents('composer.json', json_encode($composer, JSON_PRETTY_PRINT));
 }
 
 passthru('composer install', $returnStatus);
diff --git a/htdocs/includes/stripe/composer.json b/htdocs/includes/stripe/composer.json
index 8cfc38a048d..67473fca421 100644
--- a/htdocs/includes/stripe/composer.json
+++ b/htdocs/includes/stripe/composer.json
@@ -15,7 +15,7 @@
     }
   ],
   "require": {
-    "php": ">=5.3.3",
+    "php": ">=5.4.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*"
diff --git a/htdocs/includes/stripe/init.php b/htdocs/includes/stripe/init.php
index 3e7f93e4e85..79cf657a7eb 100644
--- a/htdocs/includes/stripe/init.php
+++ b/htdocs/includes/stripe/init.php
@@ -5,6 +5,9 @@ require(dirname(__FILE__) . '/lib/Stripe.php');
 
 // Utilities
 require(dirname(__FILE__) . '/lib/Util/AutoPagingIterator.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');
@@ -19,19 +22,36 @@ 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');
+
+// 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');
+
+// 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');
 
 // Plumbing
 require(dirname(__FILE__) . '/lib/ApiResponse.php');
-require(dirname(__FILE__) . '/lib/JsonSerializable.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(dirname(__FILE__) . '/lib/AttachedObject.php');
-require(dirname(__FILE__) . '/lib/ExternalAccount.php');
 
 // Stripe API Resources
 require(dirname(__FILE__) . '/lib/Account.php');
@@ -51,10 +71,13 @@ require(dirname(__FILE__) . '/lib/CountrySpec.php');
 require(dirname(__FILE__) . '/lib/Coupon.php');
 require(dirname(__FILE__) . '/lib/Customer.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/FileUpload.php');
 require(dirname(__FILE__) . '/lib/Invoice.php');
 require(dirname(__FILE__) . '/lib/InvoiceItem.php');
+require(dirname(__FILE__) . '/lib/LoginLink.php');
 require(dirname(__FILE__) . '/lib/Order.php');
 require(dirname(__FILE__) . '/lib/OrderReturn.php');
 require(dirname(__FILE__) . '/lib/Payout.php');
@@ -65,9 +88,18 @@ require(dirname(__FILE__) . '/lib/RecipientTransfer.php');
 require(dirname(__FILE__) . '/lib/Refund.php');
 require(dirname(__FILE__) . '/lib/SKU.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/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');
+
+// OAuth
+require(dirname(__FILE__) . '/lib/OAuth.php');
+
+// Webhooks
+require(dirname(__FILE__) . '/lib/Webhook.php');
+require(dirname(__FILE__) . '/lib/WebhookSignature.php');
diff --git a/htdocs/includes/stripe/update_certs.php b/htdocs/includes/stripe/update_certs.php
new file mode 100644
index 00000000000..daba4a05099
--- /dev/null
+++ b/htdocs/includes/stripe/update_certs.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+chdir(dirname(__FILE__));
+
+set_time_limit(0); // unlimited max execution time
+
+$fp = fopen(dirname(__FILE__) . '/data/ca-certificates.crt', 'w+');
+
+$options = array(
+  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);

From 613e92e5e8dd65ef2c71097f9911763e24bc4919 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 13:52:56 +0100
Subject: [PATCH 328/386] update stripe php

---
 htdocs/includes/stripe/lib/Account.php        | 216 ++++--
 htdocs/includes/stripe/lib/AlipayAccount.php  |  58 +-
 htdocs/includes/stripe/lib/ApiRequestor.php   | 119 ++--
 htdocs/includes/stripe/lib/ApiResource.php    | 153 ++--
 htdocs/includes/stripe/lib/ApplePayDomain.php |  50 +-
 htdocs/includes/stripe/lib/ApplicationFee.php | 105 ++-
 .../stripe/lib/ApplicationFeeRefund.php       |  13 +
 htdocs/includes/stripe/lib/AttachedObject.php |  14 +-
 htdocs/includes/stripe/lib/Balance.php        |   6 +-
 .../stripe/lib/BalanceTransaction.php         |  27 +-
 htdocs/includes/stripe/lib/BankAccount.php    |  73 +-
 .../includes/stripe/lib/BitcoinReceiver.php   |  69 +-
 htdocs/includes/stripe/lib/Card.php           |  86 ++-
 htdocs/includes/stripe/lib/Charge.php         |  98 +--
 htdocs/includes/stripe/lib/Collection.php     |  23 +-
 htdocs/includes/stripe/lib/CountrySpec.php    |  33 +-
 htdocs/includes/stripe/lib/Coupon.php         |  85 +--
 htdocs/includes/stripe/lib/Customer.php       | 165 +++--
 htdocs/includes/stripe/lib/Dispute.php        |  67 +-
 htdocs/includes/stripe/lib/EphemeralKey.php   |  49 ++
 htdocs/includes/stripe/lib/Event.php          | 111 ++-
 htdocs/includes/stripe/lib/ExchangeRate.php   |  25 +
 .../includes/stripe/lib/ExternalAccount.php   |   3 +
 htdocs/includes/stripe/lib/FileUpload.php     |  37 +-
 htdocs/includes/stripe/lib/Invoice.php        | 100 ++-
 htdocs/includes/stripe/lib/InvoiceItem.php    |  88 +--
 htdocs/includes/stripe/lib/LoginLink.php      |  13 +
 htdocs/includes/stripe/lib/OAuth.php          |  93 +++
 htdocs/includes/stripe/lib/Order.php          |  82 +--
 htdocs/includes/stripe/lib/OrderReturn.php    |  22 +-
 htdocs/includes/stripe/lib/Payout.php         |  60 +-
 htdocs/includes/stripe/lib/Plan.php           |  94 +--
 htdocs/includes/stripe/lib/Product.php        |  90 +--
 htdocs/includes/stripe/lib/Recipient.php      |  74 +-
 .../includes/stripe/lib/RecipientTransfer.php |   2 +-
 htdocs/includes/stripe/lib/Refund.php         |  65 +-
 htdocs/includes/stripe/lib/SKU.php            |  85 +--
 htdocs/includes/stripe/lib/Source.php         | 114 ++-
 .../includes/stripe/lib/SourceTransaction.php |  13 +
 htdocs/includes/stripe/lib/Stripe.php         | 123 +++-
 htdocs/includes/stripe/lib/StripeObject.php   | 673 +++++++++++-------
 htdocs/includes/stripe/lib/Subscription.php   | 103 ++-
 .../includes/stripe/lib/SubscriptionItem.php  |  80 +--
 htdocs/includes/stripe/lib/ThreeDSecure.php   |  25 +-
 htdocs/includes/stripe/lib/Token.php          |  25 +-
 htdocs/includes/stripe/lib/Topup.php          |  32 +
 htdocs/includes/stripe/lib/Transfer.php       | 108 +--
 .../includes/stripe/lib/TransferReversal.php  |   6 +-
 htdocs/includes/stripe/lib/Webhook.php        |  40 ++
 .../includes/stripe/lib/WebhookSignature.php  | 133 ++++
 50 files changed, 2201 insertions(+), 1827 deletions(-)
 create mode 100644 htdocs/includes/stripe/lib/EphemeralKey.php
 create mode 100644 htdocs/includes/stripe/lib/ExchangeRate.php
 create mode 100644 htdocs/includes/stripe/lib/LoginLink.php
 create mode 100644 htdocs/includes/stripe/lib/OAuth.php
 create mode 100644 htdocs/includes/stripe/lib/SourceTransaction.php
 create mode 100644 htdocs/includes/stripe/lib/Topup.php
 create mode 100644 htdocs/includes/stripe/lib/Webhook.php
 create mode 100644 htdocs/includes/stripe/lib/WebhookSignature.php

diff --git a/htdocs/includes/stripe/lib/Account.php b/htdocs/includes/stripe/lib/Account.php
index 3899b8233a6..d77d60dedbc 100644
--- a/htdocs/includes/stripe/lib/Account.php
+++ b/htdocs/includes/stripe/lib/Account.php
@@ -7,11 +7,13 @@ namespace Stripe;
  *
  * @property string $id
  * @property string $object
- * @property mixed $business_logo
+ * @property string $business_logo
  * @property string $business_name
- * @property mixed $business_url
+ * @property string $business_primary_color
+ * @property string $business_url
  * @property bool $charges_enabled
  * @property string $country
+ * @property int $created
  * @property bool $debit_negative_balances
  * @property mixed $decline_charge_on
  * @property string $default_currency
@@ -20,23 +22,46 @@ namespace Stripe;
  * @property string $email
  * @property mixed $external_accounts
  * @property mixed $legal_entity
- * @property bool $managed
+ * @property StripeObject $metadata
  * @property mixed $payout_schedule
- * @property mixed $payout_statement_descriptor
+ * @property string $payout_statement_descriptor
  * @property bool $payouts_enabled
- * @property mixed $product_description
- * @property mixed $statement_descriptor
- * @property mixed $support_email
- * @property mixed $support_phone
+ * @property string $product_description
+ * @property string $statement_descriptor
+ * @property string $support_email
+ * @property string $support_phone
  * @property string $timezone
  * @property mixed $tos_acceptance
  * @property mixed $verification
- * @property mixed $keys
  *
  * @package Stripe
  */
 class Account extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\NestedResource;
+    use ApiOperations\Retrieve {
+        retrieve as protected _retrieve;
+    }
+    use ApiOperations\Update;
+
+    public static function getSavedNestedResources()
+    {
+        static $savedNestedResources = null;
+        if ($savedNestedResources === null) {
+            $savedNestedResources = new Util\Set([
+                'external_account',
+                'bank_account',
+            ]);
+        }
+        return $savedNestedResources;
+    }
+
+    const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
+    const PATH_LOGIN_LINKS = '/login_links';
+
     public function instanceUrl()
     {
         if ($this['id'] === null) {
@@ -47,7 +72,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id
+     * @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
@@ -61,50 +87,6 @@ class Account extends ApiResource
         return self::_retrieve($id, $opts);
     }
 
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Account
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Account The updated account.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Account
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Account The deleted account.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -120,13 +102,133 @@ class Account extends ApiResource
     }
 
     /**
+     * @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,
+        ];
+        OAuth::deauthorize($params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the account on which to create the external account.
      * @param array|null $params
      * @param array|string|null $opts
      *
-     * @return Collection of Accounts
+     * @return BankAccount|Card
      */
-    public static function all($params = null, $opts = null)
+    public static function createExternalAccount($id, $params = null, $opts = null)
     {
-        return self::_all($params, $opts);
+        return self::_createNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the account to which the external account belongs.
+     * @param array|null $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 array|null $id The ID of the account to which the external account belongs.
+     * @param array|null $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 array|null $id The ID of the account to which the external account belongs.
+     * @param array|null $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 array|null $id The ID of the account on which to retrieve the external accounts.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return BankAccount|Card
+     */
+    public static function allExternalAccounts($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
+    }
+
+    /**
+     * @param array|null $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);
+    }
+
+    public function serializeParameters($force = false)
+    {
+        $update = parent::serializeParameters($force);
+        if (isset($this->_values['legal_entity'])) {
+            $entity = $this['legal_entity'];
+            if (isset($entity->_values['additional_owners'])) {
+                $owners = $entity['additional_owners'];
+                $entityUpdate = isset($update['legal_entity']) ? $update['legal_entity'] : [];
+                $entityUpdate['additional_owners'] = $this->serializeAdditionalOwners($entity, $owners);
+                $update['legal_entity'] = $entityUpdate;
+            }
+        }
+        return $update;
+    }
+
+    private function serializeAdditionalOwners($legalEntity, $additionalOwners)
+    {
+        if (isset($legalEntity->_originalValues['additional_owners'])) {
+            $originalValue = $legalEntity->_originalValues['additional_owners'];
+        } 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"
+            );
+        }
+
+        $updateArr = [];
+        foreach ($additionalOwners as $i => $v) {
+            $update = ($v instanceof StripeObject) ? $v->serializeParameters() : $v;
+
+            if ($update !== []) {
+                if (!$originalValue || ($update != $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
+                    $updateArr[$i] = $update;
+                }
+            }
+        }
+        return $updateArr;
     }
 }
diff --git a/htdocs/includes/stripe/lib/AlipayAccount.php b/htdocs/includes/stripe/lib/AlipayAccount.php
index 1ba34bfa646..fb7d5bb791e 100644
--- a/htdocs/includes/stripe/lib/AlipayAccount.php
+++ b/htdocs/includes/stripe/lib/AlipayAccount.php
@@ -6,8 +6,64 @@ namespace Stripe;
  * Class AlipayAccount
  *
  * @package Stripe
+ *
+ * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
+ * @link https://stripe.com/docs/sources/alipay
  */
-class AlipayAccount extends ExternalAccount
+class AlipayAccount extends ApiResource
 {
+    use ApiOperations\Delete;
+    use ApiOperations\Update;
 
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        if ($this['customer']) {
+            $base = Customer::classUrl();
+            $parent = $this['customer'];
+            $path = 'sources';
+        } else {
+            $msg = "Alipay accounts cannot be accessed without a customer ID.";
+            throw new Error\InvalidRequest($msg, null);
+        }
+        $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
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     *
+     * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
+     * @link 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);
+    }
+
+    /**
+     * @param string $_id
+     * @param array|null $_params
+     * @param array|string|null $_options
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     *
+     * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
+     * @link 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);
+    }
 }
diff --git a/htdocs/includes/stripe/lib/ApiRequestor.php b/htdocs/includes/stripe/lib/ApiRequestor.php
index 03c718f4e1e..334d84425b3 100644
--- a/htdocs/includes/stripe/lib/ApiRequestor.php
+++ b/htdocs/includes/stripe/lib/ApiRequestor.php
@@ -33,7 +33,7 @@ class ApiRequestor
         } elseif ($d === false) {
             return 'false';
         } elseif (is_array($d)) {
-            $res = array();
+            $res = [];
             foreach ($d as $k => $v) {
                 $res[$k] = self::_encodeObjects($v);
             }
@@ -54,17 +54,13 @@ class ApiRequestor
      */
     public function request($method, $url, $params = null, $headers = null)
     {
-        if (!$params) {
-            $params = array();
-        }
-        if (!$headers) {
-            $headers = array();
-        }
+        $params = $params ?: [];
+        $headers = $headers ?: [];
         list($rbody, $rcode, $rheaders, $myApiKey) =
         $this->_requestRaw($method, $url, $params, $headers);
         $json = $this->_interpretResponse($rbody, $rcode, $rheaders);
         $resp = new ApiResponse($rbody, $rcode, $rheaders, $json);
-        return array($resp, $myApiKey);
+        return [$resp, $myApiKey];
     }
 
     /**
@@ -74,6 +70,7 @@ class ApiRequestor
      * @param array $resp
      *
      * @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\Authentication if the error is caused by a lack of
      *    permissions.
      * @throws Error\Permission if the error is caused by insufficient
@@ -84,7 +81,7 @@ class ApiRequestor
      *    hitting the API.
      * @throws Error\Api otherwise.
      */
-    public function handleApiError($rbody, $rcode, $rheaders, $resp)
+    public function handleErrorResponse($rbody, $rcode, $rheaders, $resp)
     {
         if (!is_array($resp) || !isset($resp['error'])) {
             $msg = "Invalid response object from API: $rbody "
@@ -92,35 +89,75 @@ class ApiRequestor
             throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
         }
 
-        $error = $resp['error'];
-        $msg = isset($error['message']) ? $error['message'] : null;
-        $param = isset($error['param']) ? $error['param'] : null;
-        $code = isset($error['code']) ? $error['code'] : null;
+        $errorData = $resp['error'];
+
+        $error = null;
+        if (is_string($errorData)) {
+            $error = self::_specificOAuthError($rbody, $rcode, $rheaders, $resp, $errorData);
+        }
+        if (!$error) {
+            $error = self::_specificAPIError($rbody, $rcode, $rheaders, $resp, $errorData);
+        }
+
+        throw $error;
+    }
+
+    private static function _specificAPIError($rbody, $rcode, $rheaders, $resp, $errorData)
+    {
+        $msg = isset($errorData['message']) ? $errorData['message'] : null;
+        $param = isset($errorData['param']) ? $errorData['param'] : null;
+        $code = isset($errorData['code']) ? $errorData['code'] : null;
+        $type = isset($errorData['type']) ? $errorData['type'] : 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') {
-                    throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                    return new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                }
+                if ($type == 'idempotency_error') {
+                    return new Error\Idempotency($msg, $rcode, $rbody, $resp, $rheaders);
                 }
 
                 // intentional fall-through
             case 404:
-                throw new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                return new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
             case 401:
-                throw new Error\Authentication($msg, $rcode, $rbody, $resp, $rheaders);
+                return new Error\Authentication($msg, $rcode, $rbody, $resp, $rheaders);
             case 402:
-                throw new Error\Card($msg, $param, $code, $rcode, $rbody, $resp, $rheaders);
+                return new Error\Card($msg, $param, $code, $rcode, $rbody, $resp, $rheaders);
             case 403:
-                throw new Error\Permission($msg, $rcode, $rbody, $resp, $rheaders);
+                return new Error\Permission($msg, $rcode, $rbody, $resp, $rheaders);
             case 429:
-                throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                return new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
             default:
-                throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+                return new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
         }
     }
 
+    private static function _specificOAuthError($rbody, $rcode, $rheaders, $resp, $errorCode)
+    {
+        $description = isset($resp['error_description']) ? $resp['error_description'] : $errorCode;
+
+        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 null;
+    }
+
     private static function _formatAppInfo($appInfo)
     {
         if ($appInfo !== null) {
@@ -137,44 +174,34 @@ class ApiRequestor
         }
     }
 
-    private static function _defaultHeaders($apiKey)
+    private static function _defaultHeaders($apiKey, $clientInfo = null)
     {
-        $appInfo = Stripe::getAppInfo();
-
         $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
 
         $langVersion = phpversion();
         $uname = php_uname();
 
-        $httplib = 'unknown';
-        $ssllib = 'unknown';
-
-        if (function_exists('curl_version')) {
-            $curlVersion = curl_version();
-            $httplib = 'curl ' . $curlVersion['version'];
-            $ssllib = $curlVersion['ssl_version'];
-        }
-
         $appInfo = Stripe::getAppInfo();
-        $ua = array(
+        $ua = [
             'bindings_version' => Stripe::VERSION,
             'lang' => 'php',
             'lang_version' => $langVersion,
             'publisher' => 'stripe',
             'uname' => $uname,
-            'httplib' => $httplib,
-            'ssllib' => $ssllib,
-        );
+        ];
+        if ($clientInfo) {
+            $ua = array_merge($clientInfo, $ua);
+        }
         if ($appInfo !== null) {
             $uaString .= ' ' . self::_formatAppInfo($appInfo);
             $ua['application'] = $appInfo;
         }
 
-        $defaultHeaders = array(
+        $defaultHeaders = [
             'X-Stripe-Client-User-Agent' => json_encode($ua),
             'User-Agent' => $uaString,
             'Authorization' => 'Bearer ' . $apiKey,
-        );
+        ];
         return $defaultHeaders;
     }
 
@@ -193,9 +220,17 @@ class ApiRequestor
             throw new Error\Authentication($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')) {
+            $clientUAInfo = $this->httpClient()->getUserAgentInfo();
+        }
+
         $absUrl = $this->_apiBase.$url;
         $params = self::_encodeObjects($params);
-        $defaultHeaders = $this->_defaultHeaders($myApiKey);
+        $defaultHeaders = $this->_defaultHeaders($myApiKey, $clientUAInfo);
         if (Stripe::$apiVersion) {
             $defaultHeaders['Stripe-Version'] = Stripe::$apiVersion;
         }
@@ -222,7 +257,7 @@ class ApiRequestor
         }
 
         $combinedHeaders = array_merge($defaultHeaders, $headers);
-        $rawHeaders = array();
+        $rawHeaders = [];
 
         foreach ($combinedHeaders as $header => $value) {
             $rawHeaders[] = $header . ': ' . $value;
@@ -235,7 +270,7 @@ class ApiRequestor
             $params,
             $hasFile
         );
-        return array($rbody, $rcode, $rheaders, $myApiKey);
+        return [$rbody, $rcode, $rheaders, $myApiKey];
     }
 
     private function _processResourceParam($resource, $hasCurlFile)
@@ -272,7 +307,7 @@ class ApiRequestor
         }
 
         if ($rcode < 200 || $rcode >= 300) {
-            $this->handleApiError($rbody, $rcode, $rheaders, $resp);
+            $this->handleErrorResponse($rbody, $rcode, $rheaders, $resp);
         }
         return $resp;
     }
diff --git a/htdocs/includes/stripe/lib/ApiResource.php b/htdocs/includes/stripe/lib/ApiResource.php
index 0c03d49c3b9..f73b22c9663 100644
--- a/htdocs/includes/stripe/lib/ApiResource.php
+++ b/htdocs/includes/stripe/lib/ApiResource.php
@@ -9,11 +9,42 @@ namespace Stripe;
  */
 abstract class ApiResource extends StripeObject
 {
-    private static $HEADERS_TO_PERSIST = array('Stripe-Account' => true, 'Stripe-Version' => true);
+    use ApiOperations\Request;
 
-    public static function baseUrl()
+    /**
+     * @return \Stripe\Util\Set A list of fields that can be their own type of
+     * API resource (say a nested card under an account for example), and if
+     * that resource is set, it should be transmitted to the API on a create or
+     * update. Doing so is not the default behavior because API resources
+     * should normally be persisted on their own RESTful endpoints.
+     */
+    public static function getSavedNestedResources()
     {
-        return Stripe::$apiBase;
+        static $savedNestedResources = null;
+        if ($savedNestedResources === null) {
+            $savedNestedResources = new Util\Set();
+        }
+        return $savedNestedResources;
+    }
+
+    /**
+     * @var boolean 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,
+     * replacing a customer's source for example, where this is allowed.
+     */
+    public $saveWithParent = false;
+
+    public function __set($k, $v)
+    {
+        parent::__set($k, $v);
+        $v = $this->$k;
+        if ((static::getSavedNestedResources()->includes($k)) &&
+            ($v instanceof ApiResource)) {
+            $v->saveWithParent = true;
+        }
+        return $v;
     }
 
     /**
@@ -59,6 +90,14 @@ abstract class ApiResource extends StripeObject
         return $name;
     }
 
+    /**
+     * @return string The base URL for the given class.
+     */
+    public static function baseUrl()
+    {
+        return Stripe::$apiBase;
+    }
+
     /**
      * @return string The endpoint URL for the given class.
      */
@@ -92,112 +131,4 @@ abstract class ApiResource extends StripeObject
     {
         return static::resourceUrl($this['id']);
     }
-
-    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 "
-               . "would be: \"Stripe\\Charge::create(array('amount' => 100, "
-               . "'currency' => 'usd', 'card' => array('number' => "
-               . "4242424242424242, 'exp_month' => 5, 'exp_year' => 2015)))\")";
-            throw new Error\Api($message);
-        }
-    }
-
-    protected function _request($method, $url, $params = array(), $options = null)
-    {
-        $opts = $this->_opts->merge($options);
-        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts);
-        $this->setLastResponse($resp);
-        return array($resp->json, $options);
-    }
-
-    protected static function _staticRequest($method, $url, $params, $options)
-    {
-        $opts = Util\RequestOptions::parse($options);
-        $requestor = new ApiRequestor($opts->apiKey, static::baseUrl());
-        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers);
-        foreach ($opts->headers as $k => $v) {
-            if (!array_key_exists($k, self::$HEADERS_TO_PERSIST)) {
-                unset($opts->headers[$k]);
-            }
-        }
-        return array($response, $opts);
-    }
-
-    protected static function _retrieve($id, $options = null)
-    {
-        $opts = Util\RequestOptions::parse($options);
-        $instance = new static($id, $opts);
-        $instance->refresh();
-        return $instance;
-    }
-
-    protected static function _all($params = null, $options = null)
-    {
-        self::_validateParams($params);
-        $url = static::classUrl();
-
-        list($response, $opts) = static::_staticRequest('get', $url, $params, $options);
-        $obj = 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 Error\Api($message);
-        }
-        $obj->setLastResponse($response);
-        $obj->setRequestParams($params);
-        return $obj;
-    }
-
-    protected static function _create($params = null, $options = null)
-    {
-        self::_validateParams($params);
-        $url = static::classUrl();
-
-        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response->json, $opts);
-        $obj->setLastResponse($response);
-        return $obj;
-    }
-
-    /**
-     * @param string $id The ID of the API resource to update.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource the updated API resource
-     */
-    protected static function _update($id, $params = null, $options = null)
-    {
-        self::_validateParams($params);
-        $url = static::resourceUrl($id);
-
-        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response->json, $opts);
-        $obj->setLastResponse($response);
-        return $obj;
-    }
-
-    protected function _save($options = null)
-    {
-        $params = $this->serializeParameters();
-        if (count($params) > 0) {
-            $url = $this->instanceUrl();
-            list($response, $opts) = $this->_request('post', $url, $params, $options);
-            $this->refreshFrom($response, $opts);
-        }
-        return $this;
-    }
-
-    protected function _delete($params = null, $options = null)
-    {
-        self::_validateParams($params);
-
-        $url = $this->instanceUrl();
-        list($response, $opts) = $this->_request('delete', $url, $params, $options);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
 }
diff --git a/htdocs/includes/stripe/lib/ApplePayDomain.php b/htdocs/includes/stripe/lib/ApplePayDomain.php
index 8c522c8b933..124c5dc0632 100644
--- a/htdocs/includes/stripe/lib/ApplePayDomain.php
+++ b/htdocs/includes/stripe/lib/ApplePayDomain.php
@@ -9,7 +9,11 @@ namespace Stripe;
  */
 class ApplePayDomain extends ApiResource
 {
-    
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+
     /**
      * @return string The class URL for this resource. It needs to be special
      *    cased because it doesn't fit into the standard resource pattern.
@@ -18,48 +22,4 @@ class ApplePayDomain extends ApiResource
     {
         return '/v1/apple_pay/domains';
     }
-
-    /**
-     * @param string $id The ID of the domain to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return ApplePayDomain
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApplePayDomain The created domain.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApplePayDomain The deleted domain.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of ApplePayDomains
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/ApplicationFee.php b/htdocs/includes/stripe/lib/ApplicationFee.php
index 8145541c17e..05b94ea9235 100644
--- a/htdocs/includes/stripe/lib/ApplicationFee.php
+++ b/htdocs/includes/stripe/lib/ApplicationFee.php
@@ -5,10 +5,31 @@ 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
  */
 class ApplicationFee extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\NestedResource;
+    use ApiOperations\Retrieve;
+
+    const PATH_REFUNDS = '/refunds';
+
     /**
      * This is a special case because the application fee endpoint has an
      *    underscore in it. The parent `className` function strips underscores.
@@ -20,40 +41,6 @@ class ApplicationFee extends ApiResource
         return 'application_fee';
     }
 
-    /**
-     * @param string $id The ID of the application fee to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return ApplicationFee
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the application fee to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return ApplicationFee The updated application fee.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of ApplicationFees
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -66,4 +53,54 @@ class ApplicationFee extends ApiResource
         $this->refresh();
         return $this;
     }
+
+    /**
+     * @param array|null $id The ID of the application fee on which to create the refund.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFeeRefund
+     */
+    public static function createRefund($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_REFUNDS, $params, $opts);
+    }
+
+    /**
+     * @param array|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
+     *
+     * @return ApplicationFeeRefund
+     */
+    public static function retrieveRefund($id, $refundId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_REFUNDS, $refundId, $params, $opts);
+    }
+
+    /**
+     * @param array|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
+     *
+     * @return ApplicationFeeRefund
+     */
+    public static function updateRefund($id, $refundId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_REFUNDS, $refundId, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the application fee on which to retrieve the refunds.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFeeRefund
+     */
+    public static function allRefunds($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_REFUNDS, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
index 44695ef88cd..4b1c425a8ee 100644
--- a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
+++ b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
@@ -5,10 +5,23 @@ namespace Stripe;
 /**
  * Class ApplicationFeeRefund
  *
+ * @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
+ *
  * @package Stripe
  */
 class ApplicationFeeRefund extends ApiResource
 {
+    use ApiOperations\Update {
+        save as protected _save;
+    }
+
     /**
      * @return string The API URL for this Stripe refund.
      */
diff --git a/htdocs/includes/stripe/lib/AttachedObject.php b/htdocs/includes/stripe/lib/AttachedObject.php
index 489517d6693..6a8951788ed 100644
--- a/htdocs/includes/stripe/lib/AttachedObject.php
+++ b/htdocs/includes/stripe/lib/AttachedObject.php
@@ -2,6 +2,8 @@
 
 namespace Stripe;
 
+use Countable;
+
 /**
  * Class AttachedObject
  *
@@ -9,7 +11,7 @@ namespace Stripe;
  *
  * @package Stripe
  */
-class AttachedObject extends StripeObject
+class AttachedObject extends StripeObject implements Countable
 {
     /**
      * Updates this object.
@@ -28,4 +30,14 @@ class AttachedObject extends StripeObject
             $this->$k = $v;
         }
     }
+
+    /**
+     * Counts the number of elements in the AttachedObject instance.
+     *
+     * @return int the number of elements
+     */
+    public function count()
+    {
+        return count($this->_values);
+    }
 }
diff --git a/htdocs/includes/stripe/lib/Balance.php b/htdocs/includes/stripe/lib/Balance.php
index 3b551eb84df..115307f843b 100644
--- a/htdocs/includes/stripe/lib/Balance.php
+++ b/htdocs/includes/stripe/lib/Balance.php
@@ -6,9 +6,9 @@ namespace Stripe;
  * Class Balance
  *
  * @property string $object
- * @property mixed $available
- * @property bool $livedmode
- * @property mixed $pending
+ * @property array $available
+ * @property bool $livemode
+ * @property array $pending
  *
  * @package Stripe
  */
diff --git a/htdocs/includes/stripe/lib/BalanceTransaction.php b/htdocs/includes/stripe/lib/BalanceTransaction.php
index b84619ece81..f82888ab1dd 100644
--- a/htdocs/includes/stripe/lib/BalanceTransaction.php
+++ b/htdocs/includes/stripe/lib/BalanceTransaction.php
@@ -12,11 +12,11 @@ namespace Stripe;
  * @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 mixed $sourced_transfers
  * @property string $status
  * @property string $type
  *
@@ -24,6 +24,9 @@ namespace Stripe;
  */
 class BalanceTransaction extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
     /**
      * @return string The class URL for this resource. It needs to be special
      *    cased because it doesn't fit into the standard resource pattern.
@@ -32,26 +35,4 @@ class BalanceTransaction extends ApiResource
     {
         return "/v1/balance/history";
     }
-
-    /**
-     * @param string $id The ID of the balance transaction to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return BalanceTransaction
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of BalanceTransactions
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/BankAccount.php b/htdocs/includes/stripe/lib/BankAccount.php
index 2f11c067c36..2afc312d003 100644
--- a/htdocs/includes/stripe/lib/BankAccount.php
+++ b/htdocs/includes/stripe/lib/BankAccount.php
@@ -5,11 +5,82 @@ namespace Stripe;
 /**
  * Class BankAccount
  *
+ * @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
+ *
  * @package Stripe
  */
-class BankAccount extends ExternalAccount
+class BankAccount extends ApiResource
 {
+    use ApiOperations\Delete;
+    use ApiOperations\Update;
+
     /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        if ($this['customer']) {
+            $base = Customer::classUrl();
+            $parent = $this['customer'];
+            $path = 'sources';
+        } elseif ($this['account']) {
+            $base = Account::classUrl();
+            $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);
+        }
+        $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
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    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);
+    }
+
+    /**
+     * @param string $_id
+     * @param array|null $_params
+     * @param array|string|null $_options
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    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);
+    }
+
+   /**
      * @param array|null $params
      * @param array|string|null $options
      *
diff --git a/htdocs/includes/stripe/lib/BitcoinReceiver.php b/htdocs/includes/stripe/lib/BitcoinReceiver.php
index 3f2c835b96f..8d04256b5db 100644
--- a/htdocs/includes/stripe/lib/BitcoinReceiver.php
+++ b/htdocs/includes/stripe/lib/BitcoinReceiver.php
@@ -6,9 +6,15 @@ namespace Stripe;
  * Class BitcoinReceiver
  *
  * @package Stripe
+ *
+ * @deprecated Bitcoin receivers are deprecated. Please use the sources API instead.
+ * @link https://stripe.com/docs/sources/bitcoin
  */
-class BitcoinReceiver extends ExternalAccount
+class BitcoinReceiver extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
     /**
      * @return string The class URL for this resource. It needs to be special
      *    cased because it doesn't fit into the standard resource pattern.
@@ -24,62 +30,17 @@ class BitcoinReceiver extends ExternalAccount
      */
     public function instanceUrl()
     {
-        $result = parent::instanceUrl();
-        if ($result) {
-            return $result;
+        if ($this['customer']) {
+            $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 {
-            $id = $this['id'];
-            $id = Util\Util::utf8($id);
-            $extn = urlencode($id);
             $base = BitcoinReceiver::classUrl();
+            $extn = urlencode(Util\Util::utf8($this['id']));
             return "$base/$extn";
         }
     }
-
-    /**
-     * @param string $id The ID of the Bitcoin Receiver to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return BitcoinReceiver
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of BitcoinReceivers
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return BitcoinReceiver The created Bitcoin Receiver item.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return BitcoinReceiver The refunded Bitcoin Receiver item.
-     */
-    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;
-    }
 }
diff --git a/htdocs/includes/stripe/lib/Card.php b/htdocs/includes/stripe/lib/Card.php
index 227bee13873..7e57423601a 100644
--- a/htdocs/includes/stripe/lib/Card.php
+++ b/htdocs/includes/stripe/lib/Card.php
@@ -5,9 +5,93 @@ namespace Stripe;
 /**
  * Class Card
  *
+ * @property string $id
+ * @property string $object
+ * @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 $brand
+ * @property string $country
+ * @property string $customer
+ * @property string $cvc_check
+ * @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 $tokenization_method
+ *
  * @package Stripe
  */
-class Card extends ExternalAccount
+class Card extends ApiResource
 {
+    use ApiOperations\Delete;
+    use ApiOperations\Update;
 
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because cards are nested resources that may belong to different
+     *    top-level resources.
+     */
+    public function instanceUrl()
+    {
+        if ($this['customer']) {
+            $base = Customer::classUrl();
+            $parent = $this['customer'];
+            $path = 'sources';
+        } elseif ($this['account']) {
+            $base = Account::classUrl();
+            $parent = $this['account'];
+            $path = 'external_accounts';
+        } elseif ($this['recipient']) {
+            $base = Recipient::classUrl();
+            $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);
+        }
+        $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
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    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);
+    }
+
+    /**
+     * @param string $_id
+     * @param array|null $_params
+     * @param array|string|null $_options
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    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);
+    }
 }
diff --git a/htdocs/includes/stripe/lib/Charge.php b/htdocs/includes/stripe/lib/Charge.php
index ab1d5a33f8a..6d448022877 100644
--- a/htdocs/includes/stripe/lib/Charge.php
+++ b/htdocs/includes/stripe/lib/Charge.php
@@ -9,91 +9,47 @@ namespace Stripe;
  * @property string $object
  * @property int $amount
  * @property int $amount_refunded
- * @property mixed $application_fee
+ * @property string $application
+ * @property string $application_fee
  * @property string $balance_transaction
  * @property bool $captured
  * @property int $created
  * @property string $currency
  * @property string $customer
- * @property mixed $description
- * @property mixed $destination
- * @property string|null $dispute
- * @property mixed $failure_code
- * @property mixed $failure_message
+ * @property string $description
+ * @property string $destination
+ * @property string $dispute
+ * @property string $failure_code
+ * @property string $failure_message
  * @property mixed $fraud_details
- * @property mixed $invoice
+ * @property string $invoice
  * @property bool $livemode
- * @property mixed $metadata
- * @property mixed $order
+ * @property StripeObject $metadata
+ * @property string $on_behalf_of
+ * @property string $order
+ * @property mixed $outcome
  * @property bool $paid
- * @property mixed $receipt_email
- * @property mixed $receipt_number
+ * @property string $receipt_email
+ * @property string $receipt_number
  * @property bool $refunded
- * @property mixed $refunds
+ * @property Collection $refunds
+ * @property string $review
  * @property mixed $shipping
  * @property mixed $source
- * @property mixed $source_transfer
- * @property mixed $statement_descriptor
+ * @property string $source_transfer
+ * @property string $statement_descriptor
  * @property string $status
+ * @property string $transfer
+ * @property string $transfer_group
  *
  * @package Stripe
  */
 class Charge extends ApiResource
 {
-    /**
-     * @param string $id The ID of the charge to retrieve.
-     * @param array|string|null $options
-     *
-     * @return Charge
-     */
-    public static function retrieve($id, $options = null)
-    {
-        return self::_retrieve($id, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Collection of Charges
-     */
-    public static function all($params = null, $options = null)
-    {
-        return self::_all($params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Charge The created charge.
-     */
-    public static function create($params = null, $options = null)
-    {
-        return self::_create($params, $options);
-    }
-
-    /**
-     * @param string $id The ID of the charge to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Charge The updated charge.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $options
-     *
-     * @return Charge The saved charge.
-     */
-    public function save($options = null)
-    {
-        return $this->_save($options);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
      * @param array|null $params
@@ -135,7 +91,7 @@ class Charge extends ApiResource
     {
         $url = $this->instanceUrl() . '/dispute';
         list($response, $opts) = $this->_request('post', $url, $params, $options);
-        $this->refreshFrom(array('dispute' => $response), $opts, true);
+        $this->refreshFrom(['dispute' => $response], $opts, true);
         return $this->dispute;
     }
 
@@ -161,7 +117,7 @@ class Charge extends ApiResource
      */
     public function markAsFraudulent($opts = null)
     {
-        $params = array('fraud_details' => array('user_report' => 'fraudulent'));
+        $params = ['fraud_details' => ['user_report' => 'fraudulent']];
         $url = $this->instanceUrl();
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
@@ -175,7 +131,7 @@ class Charge extends ApiResource
      */
     public function markAsSafe($opts = null)
     {
-        $params = array('fraud_details' => array('user_report' => 'safe'));
+        $params = ['fraud_details' => ['user_report' => 'safe']];
         $url = $this->instanceUrl();
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
diff --git a/htdocs/includes/stripe/lib/Collection.php b/htdocs/includes/stripe/lib/Collection.php
index 0beb3a18918..cfb4014a0fe 100644
--- a/htdocs/includes/stripe/lib/Collection.php
+++ b/htdocs/includes/stripe/lib/Collection.php
@@ -12,9 +12,19 @@ namespace Stripe;
  *
  * @package Stripe
  */
-class Collection extends ApiResource
+class Collection extends StripeObject
 {
-    protected $_requestParams = array();
+    use ApiOperations\Request;
+
+    protected $_requestParams = [];
+
+    /**
+     * @return string The base URL for the given class.
+     */
+    public static function baseUrl()
+    {
+        return Stripe::$apiBase;
+    }
 
     public function setRequestParams($params)
     {
@@ -56,7 +66,7 @@ class Collection extends ApiResource
     }
 
     /**
-     * @return AutoPagingIterator An iterator that can be used to iterate
+     * @return Util\AutoPagingIterator An iterator 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.
@@ -76,12 +86,11 @@ class Collection extends ApiResource
         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 = array();
+            $query = [];
             parse_str($url['query'], $query);
-            // PHP 5.2 doesn't support the ?: operator :(
-            $params = array_merge($params ? $params : array(), $query);
+            $params = array_merge($params ?: [], $query);
         }
 
-        return array($url['path'], $params);
+        return [$url['path'], $params];
     }
 }
diff --git a/htdocs/includes/stripe/lib/CountrySpec.php b/htdocs/includes/stripe/lib/CountrySpec.php
index dabb88b4522..cdaa4e84d89 100644
--- a/htdocs/includes/stripe/lib/CountrySpec.php
+++ b/htdocs/includes/stripe/lib/CountrySpec.php
@@ -5,10 +5,21 @@ namespace Stripe;
 /**
  * Class CountrySpec
  *
+ * @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 mixed $verification_fields
+ *
  * @package Stripe
  */
 class CountrySpec extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
     /**
      * This is a special case because the country specs endpoint has an
      *    underscore in it. The parent `className` function strips underscores.
@@ -19,26 +30,4 @@ class CountrySpec extends ApiResource
     {
         return 'country_spec';
     }
-
-    /**
-     * @param string $country The ISO country code of the country we retrieve the CountrySpec for.
-     * @param array|string|null $opts
-     *
-     * @return CountrySpec
-     */
-    public static function retrieve($country, $opts = null)
-    {
-        return self::_retrieve($country, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of CountrySpecs
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/Coupon.php b/htdocs/includes/stripe/lib/Coupon.php
index 079cc10b478..a2d44443ce5 100644
--- a/htdocs/includes/stripe/lib/Coupon.php
+++ b/htdocs/includes/stripe/lib/Coupon.php
@@ -5,73 +5,28 @@ namespace Stripe;
 /**
  * Class Coupon
  *
+ * @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 int $percent_off
+ * @property int $redeem_by
+ * @property int $times_redeemed
+ * @property bool $valid
+ *
  * @package Stripe
  */
 class Coupon extends ApiResource
 {
-    /**
-     * @param string $id The ID of the coupon to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Coupon
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Coupon The created coupon.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the coupon to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Coupon The updated coupon.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Coupon The deleted coupon.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Coupon The saved coupon.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Coupons
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/Customer.php b/htdocs/includes/stripe/lib/Customer.php
index 1dfbfc6a16b..8d31b5ac0aa 100644
--- a/htdocs/includes/stripe/lib/Customer.php
+++ b/htdocs/includes/stripe/lib/Customer.php
@@ -17,7 +17,7 @@ namespace Stripe;
  * @property mixed $discount
  * @property string $email
  * @property bool $livemode
- * @property array $metadata
+ * @property StripeObject $metadata
  * @property mixed $shipping
  * @property Collection $sources
  * @property Collection $subscriptions
@@ -26,71 +26,25 @@ namespace Stripe;
  */
 class Customer extends ApiResource
 {
-    /**
-     * @param string $id The ID of the customer to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Customer
-     */
-    public static function retrieve($id, $opts = null)
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\NestedResource;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+
+    public static function getSavedNestedResources()
     {
-        return self::_retrieve($id, $opts);
+        static $savedNestedResources = null;
+        if ($savedNestedResources === null) {
+            $savedNestedResources = new Util\Set([
+                'source',
+            ]);
+        }
+        return $savedNestedResources;
     }
 
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Customers
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Customer The created customer.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the customer to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Customer The updated customer.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Customer The saved customer.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Customer The deleted customer.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
+    const PATH_SOURCES = '/sources';
 
     /**
      * @param array|null $params
@@ -99,9 +53,7 @@ class Customer extends ApiResource
      */
     public function addInvoiceItem($params = null)
     {
-        if (!$params) {
-            $params = array();
-        }
+        $params = $params ?: [];
         $params['customer'] = $this->id;
         $ii = InvoiceItem::create($params, $this->_opts);
         return $ii;
@@ -114,9 +66,7 @@ class Customer extends ApiResource
      */
     public function invoices($params = null)
     {
-        if (!$params) {
-            $params = array();
-        }
+        $params = $params ?: [];
         $params['customer'] = $this->id;
         $invoices = Invoice::all($params, $this->_opts);
         return $invoices;
@@ -129,9 +79,7 @@ class Customer extends ApiResource
      */
     public function invoiceItems($params = null)
     {
-        if (!$params) {
-            $params = array();
-        }
+        $params = $params ?: [];
         $params['customer'] = $this->id;
         $iis = InvoiceItem::all($params, $this->_opts);
         return $iis;
@@ -144,9 +92,7 @@ class Customer extends ApiResource
      */
     public function charges($params = null)
     {
-        if (!$params) {
-            $params = array();
-        }
+        $params = $params ?: [];
         $params['customer'] = $this->id;
         $charges = Charge::all($params, $this->_opts);
         return $charges;
@@ -161,7 +107,7 @@ class Customer extends ApiResource
     {
         $url = $this->instanceUrl() . '/subscription';
         list($response, $opts) = $this->_request('post', $url, $params);
-        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        $this->refreshFrom(['subscription' => $response], $opts, true);
         return $this->subscription;
     }
 
@@ -174,7 +120,7 @@ class Customer extends ApiResource
     {
         $url = $this->instanceUrl() . '/subscription';
         list($response, $opts) = $this->_request('delete', $url, $params);
-        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        $this->refreshFrom(['subscription' => $response], $opts, true);
         return $this->subscription;
     }
 
@@ -185,6 +131,69 @@ class Customer extends ApiResource
     {
         $url = $this->instanceUrl() . '/discount';
         list($response, $opts) = $this->_request('delete', $url);
-        $this->refreshFrom(array('discount' => null), $opts, true);
+        $this->refreshFrom(['discount' => null], $opts, true);
+    }
+
+    /**
+     * @param array|null $id The ID of the customer on which to create the source.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function createSource($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_SOURCES, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the customer to which the source belongs.
+     * @param array|null $sourceId The ID of the source to retrieve.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function retrieveSource($id, $sourceId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the customer to which the source belongs.
+     * @param array|null $sourceId The ID of the source to update.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function updateSource($id, $sourceId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the customer to which the source belongs.
+     * @param array|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 array|null $id The ID of the customer on which to retrieve the sources.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function allSources($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_SOURCES, $params, $opts);
     }
 }
diff --git a/htdocs/includes/stripe/lib/Dispute.php b/htdocs/includes/stripe/lib/Dispute.php
index ce70d499b35..7f4c233b009 100644
--- a/htdocs/includes/stripe/lib/Dispute.php
+++ b/htdocs/includes/stripe/lib/Dispute.php
@@ -16,7 +16,7 @@ namespace Stripe;
  * @property mixed $evidence_details
  * @property bool $is_charge_refundable
  * @property bool $livemode
- * @property mixed $metadata
+ * @property StripeObject $metadata
  * @property string $reason
  * @property string $status
  *
@@ -24,49 +24,40 @@ namespace Stripe;
  */
 class Dispute extends ApiResource
 {
-    /**
-     * @param string $id The ID of the dispute to retrieve.
-     * @param array|string|null $options
-     *
-     * @return Dispute
-     */
-    public static function retrieve($id, $options = null)
-    {
-        return self::_retrieve($id, $options);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return array An array of Disputes.
+     * Possible string representations of dispute reasons.
+     * @link https://stripe.com/docs/api#dispute_object
      */
-    public static function all($params = null, $options = null)
-    {
-        return self::_all($params, $options);
-    }
+    const REASON_BANK_CANNOT_PROCESS       = 'bank_cannot_process';
+    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';
 
     /**
-     * @param string $id The ID of the dispute to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Dispute The updated dispute.
+     * Possible string representations of dispute statuses.
+     * @link https://stripe.com/docs/api#dispute_object
      */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $options
-     *
-     * @return Dispute The saved charge.
-     */
-    public function save($options = null)
-    {
-        return $this->_save($options);
-    }
+    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';
 
     /**
      * @param array|string|null $options
diff --git a/htdocs/includes/stripe/lib/EphemeralKey.php b/htdocs/includes/stripe/lib/EphemeralKey.php
new file mode 100644
index 00000000000..5bbef09165d
--- /dev/null
+++ b/htdocs/includes/stripe/lib/EphemeralKey.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class EphemeralKey
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $created
+ * @property int $expires
+ * @property bool $livemode
+ * @property string $secret
+ * @property array $associated_objects
+ *
+ * @package Stripe
+ */
+class EphemeralKey extends ApiResource
+{
+    use ApiOperations\Create {
+        create as protected _create;
+    }
+    use ApiOperations\Delete;
+
+    /**
+     * This is a special case because the ephemeral key endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'ephemeral_key';
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return 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');
+        }
+        return self::_create($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Event.php b/htdocs/includes/stripe/lib/Event.php
index 6a1ed6c44ba..2add5ce11be 100644
--- a/htdocs/includes/stripe/lib/Event.php
+++ b/htdocs/includes/stripe/lib/Event.php
@@ -12,32 +12,103 @@ namespace Stripe;
  * @property mixed $data
  * @property bool $livemode
  * @property int $pending_webhooks
- * @property string $request
+ * @property mixed $request
  * @property string $type
  *
  * @package Stripe
  */
 class Event extends ApiResource
 {
-    /**
-     * @param string $id The ID of the event to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Event
+     /**
+     * Possible string representations of event types.
+     * @link https://stripe.com/docs/api#event_types
      */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
+    const ACCOUNT_UPDATED                      = 'account.updated';
+    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_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 COUPON_CREATED                       = 'coupon.created';
+    const COUPON_DELETED                       = 'coupon.deleted';
+    const COUPON_UPDATED                       = 'coupon.updated';
+    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_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 INVOICEITEM_CREATED                  = 'invoiceitem.created';
+    const INVOICEITEM_DELETED                  = 'invoiceitem.deleted';
+    const INVOICEITEM_UPDATED                  = 'invoiceitem.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 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 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 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_TRANSACTION_CREATED           = 'source.transaction.created';
+    const TOPUP_CREATED                        = 'topup.created';
+    const TOPUP_FAILED                         = 'topup.failed';
+    const TOPUP_SUCCEEDED                      = 'topup.succeeded';
+    const TRANSFER_CREATED                     = 'transfer.created';
+    const TRANSFER_REVERSED                    = 'transfer.reversed';
+    const TRANSFER_UPDATED                     = 'transfer.updated';
 
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Events
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
 }
diff --git a/htdocs/includes/stripe/lib/ExchangeRate.php b/htdocs/includes/stripe/lib/ExchangeRate.php
new file mode 100644
index 00000000000..40763261834
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ExchangeRate.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ExchangeRate
+ *
+ * @package Stripe
+ */
+class ExchangeRate extends ApiResource
+{
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
+    /**
+     * This is a special case because the exchange rates endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'exchange_rate';
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ExternalAccount.php b/htdocs/includes/stripe/lib/ExternalAccount.php
index 23ddf9b2e82..fba03075d86 100644
--- a/htdocs/includes/stripe/lib/ExternalAccount.php
+++ b/htdocs/includes/stripe/lib/ExternalAccount.php
@@ -5,6 +5,9 @@ namespace Stripe;
 /**
  * Class ExternalAccount
  *
+ * @property string $id
+ * @property string $object
+ *
  * @package Stripe
  */
 abstract class ExternalAccount extends ApiResource
diff --git a/htdocs/includes/stripe/lib/FileUpload.php b/htdocs/includes/stripe/lib/FileUpload.php
index 7dc98c78d1c..aa0b733959c 100644
--- a/htdocs/includes/stripe/lib/FileUpload.php
+++ b/htdocs/includes/stripe/lib/FileUpload.php
@@ -16,6 +16,10 @@ namespace Stripe;
  */
 class FileUpload extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+
     public static function baseUrl()
     {
         return Stripe::$apiUploadBase;
@@ -25,37 +29,4 @@ class FileUpload extends ApiResource
     {
         return 'file';
     }
-
-    /**
-     * @param string $id The ID of the file upload to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return FileUpload
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return FileUpload The created file upload.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of FileUploads
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/Invoice.php b/htdocs/includes/stripe/lib/Invoice.php
index e994566cd96..07d67f74a8a 100644
--- a/htdocs/includes/stripe/lib/Invoice.php
+++ b/htdocs/includes/stripe/lib/Invoice.php
@@ -5,54 +5,52 @@ namespace Stripe;
 /**
  * Class Invoice
  *
+ * @property string $id
+ * @property string $object
+ * @property int $amount_due
+ * @property int $amount_paid
+ * @property int $amount_remaining
+ * @property int $application_fee
+ * @property int $attempt_count
+ * @property bool $attempted
+ * @property string $billing
+ * @property string $charge
+ * @property bool $closed
+ * @property string $currency
+ * @property string $customer
+ * @property int $date
+ * @property string $description
+ * @property mixed $discount
+ * @property int $due_date
+ * @property int $ending_balance
+ * @property bool $forgiven
+ * @property Collection $lines
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property int $next_payment_attempt
+ * @property string $number
+ * @property bool $paid
+ * @property int $period_end
+ * @property int $period_start
+ * @property string $receipt_number
+ * @property int $starting_balance
+ * @property string $statement_descriptor
+ * @property string $subscription
+ * @property int $subscription_proration_date
+ * @property int $subtotal
+ * @property int $tax
+ * @property float $tax_percent
+ * @property int $total
+ * @property int $webhooks_delivered_at
+ *
  * @package Stripe
  */
 class Invoice extends ApiResource
 {
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Invoice The created invoice.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the invoice to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Invoice
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Invoices
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the invoice to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Invoice The updated invoice.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
      * @param array|null $params
@@ -69,23 +67,13 @@ class Invoice extends ApiResource
         return $obj;
     }
 
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Invoice The saved invoice.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
     /**
      * @return Invoice The paid invoice.
      */
-    public function pay($opts = null)
+    public function pay($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/pay';
-        list($response, $opts) = $this->_request('post', $url, null, $opts);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
         return $this;
     }
diff --git a/htdocs/includes/stripe/lib/InvoiceItem.php b/htdocs/includes/stripe/lib/InvoiceItem.php
index ab9c4ba3327..37e39f3e105 100644
--- a/htdocs/includes/stripe/lib/InvoiceItem.php
+++ b/htdocs/includes/stripe/lib/InvoiceItem.php
@@ -5,73 +5,31 @@ namespace Stripe;
 /**
  * Class InvoiceItem
  *
+ * @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
+ *
  * @package Stripe
  */
 class InvoiceItem extends ApiResource
 {
-    /**
-     * @param string $id The ID of the invoice item to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return InvoiceItem
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of InvoiceItems
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return InvoiceItem The created invoice item.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the invoice item to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return InvoiceItem The updated invoice item.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return InvoiceItem The saved invoice item.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return InvoiceItem The deleted invoice item.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/LoginLink.php b/htdocs/includes/stripe/lib/LoginLink.php
new file mode 100644
index 00000000000..7f01ae20950
--- /dev/null
+++ b/htdocs/includes/stripe/lib/LoginLink.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class LoginLink
+ *
+ * @package Stripe
+ */
+class LoginLink extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/OAuth.php b/htdocs/includes/stripe/lib/OAuth.php
new file mode 100644
index 00000000000..416ce49854d
--- /dev/null
+++ b/htdocs/includes/stripe/lib/OAuth.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Stripe;
+
+abstract class OAuth
+{
+    /**
+     * Generates a URL to Stripe's OAuth form.
+     *
+     * @param array|null $params
+     * @param array|null $opts
+     *
+     * @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;
+
+        $params['client_id'] = self::_getClientId($params);
+        if (!array_key_exists('response_type', $params)) {
+            $params['response_type'] = 'code';
+        }
+        $query = Util\Util::urlEncode($params);
+
+        return $base . '/oauth/authorize?' . $query;
+    }
+
+    /**
+     * 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
+     *
+     * @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;
+        $requestor = new ApiRequestor(null, $base);
+        list($response, $apiKey) = $requestor->request(
+            'post',
+            '/oauth/token',
+            $params,
+            null
+        );
+        return Util\Util::convertToStripeObject($response->json, $opts);
+    }
+
+    /**
+     * Disconnects an account from your platform.
+     *
+     * @param array|null $params
+     * @param array|null $opts
+     *
+     * @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;
+        $requestor = new ApiRequestor(null, $base);
+        $params['client_id'] = self::_getClientId($params);
+        list($response, $apiKey) = $requestor->request(
+            'post',
+            '/oauth/deauthorize',
+            $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 = Stripe::getClientId();
+        }
+        if ($clientId === null) {
+            $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 '
+              . '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 Error\Authentication($msg);
+        }
+        return $clientId;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Order.php b/htdocs/includes/stripe/lib/Order.php
index 9fc65e2e166..14215bc9ee3 100644
--- a/htdocs/includes/stripe/lib/Order.php
+++ b/htdocs/includes/stripe/lib/Order.php
@@ -5,64 +5,38 @@ namespace Stripe;
 /**
  * Class Order
  *
+ * @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 mixed $items
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property Collection $returns
+ * @property string $selected_shipping_method
+ * @property mixed $shipping
+ * @property mixed $shipping_methods
+ * @property string $status
+ * @property mixed $status_transitions
+ * @property int $updated
+ * @property string $upstream_id
+ *
  * @package Stripe
  */
 class Order extends ApiResource
 {
-    /**
-     * @param string $id The ID of the Order to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Order
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Order The created Order.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the order to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Order The updated order.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Order The saved Order.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Orders
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
      * @return Order The paid order.
diff --git a/htdocs/includes/stripe/lib/OrderReturn.php b/htdocs/includes/stripe/lib/OrderReturn.php
index aa7fd4e9b99..45a69e37835 100644
--- a/htdocs/includes/stripe/lib/OrderReturn.php
+++ b/htdocs/includes/stripe/lib/OrderReturn.php
@@ -9,25 +9,17 @@ namespace Stripe;
  */
 class OrderReturn extends ApiResource
 {
-    /**
-     * @param string $id The ID of the OrderReturn to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Order
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * This is a special case because the order returns endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
      *
-     * @return Collection of OrderReturns
+     * @return string The name of the class.
      */
-    public static function all($params = null, $opts = null)
+    public static function className()
     {
-        return self::_all($params, $opts);
+        return 'order_return';
     }
 }
diff --git a/htdocs/includes/stripe/lib/Payout.php b/htdocs/includes/stripe/lib/Payout.php
index 90dd0fcecc3..0849cae3f61 100644
--- a/htdocs/includes/stripe/lib/Payout.php
+++ b/htdocs/includes/stripe/lib/Payout.php
@@ -17,7 +17,7 @@ namespace Stripe;
  * @property string $failure_code
  * @property string $failure_message
  * @property bool $livemode
- * @property mixed $metadata
+ * @property StripeObject $metadata
  * @property string $method
  * @property string $recipient
  * @property string $source_type
@@ -29,50 +29,10 @@ namespace Stripe;
  */
 class Payout extends ApiResource
 {
-    /**
-     * @param string $id The ID of the payout to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Payout
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Payouts
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Payout The created payout.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the payout to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Payout The updated payout.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
      * @return Payout The canceled payout.
@@ -84,14 +44,4 @@ class Payout extends ApiResource
         $this->refreshFrom($response, $opts);
         return $this;
     }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Payout The saved payout.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/Plan.php b/htdocs/includes/stripe/lib/Plan.php
index b911e17cbe6..8b0126b6f2d 100644
--- a/htdocs/includes/stripe/lib/Plan.php
+++ b/htdocs/includes/stripe/lib/Plan.php
@@ -7,84 +7,24 @@ namespace Stripe;
  *
  * @package Stripe
  *
- * @property $id
- * @property $object
- * @property $amount
- * @property $created
- * @property $currency
- * @property $interval
- * @property $interval_count
- * @property $livemode
- * @property AttachedObject $metadata
- * @property $name
- * @property $statement_descriptor
- * @property $trial_period_days
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @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 int $trial_period_days
  */
 class Plan extends ApiResource
 {
-    /**
-     * @param string $id The ID of the plan to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Plan
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Plan The created plan.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the plan to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Plan The updated plan.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Plan The deleted plan.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Plan The saved plan.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Plans
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/Product.php b/htdocs/includes/stripe/lib/Product.php
index 2fdd22a0827..20bd4e1ae44 100644
--- a/htdocs/includes/stripe/lib/Product.php
+++ b/htdocs/includes/stripe/lib/Product.php
@@ -5,73 +5,33 @@ namespace Stripe;
 /**
  * Class Product
  *
+ * @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 array $images
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property string $name
+ * @property mixed $package_dimensions
+ * @property bool $shippable
+ * @property Collection $skus
+ * @property string $statement_descriptor
+ * @property string $type
+ * @property int $updated
+ * @property string $url
+ *
  * @package Stripe
  */
 class Product extends ApiResource
 {
-    /**
-     * @param string $id The ID of the Product to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Product
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Product The created Product.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the product to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Product The updated product.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Product The saved Product.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Products
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Product The deleted product.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/Recipient.php b/htdocs/includes/stripe/lib/Recipient.php
index 04bcb7bb289..9ec6a1ec847 100644
--- a/htdocs/includes/stripe/lib/Recipient.php
+++ b/htdocs/includes/stripe/lib/Recipient.php
@@ -9,71 +9,11 @@ namespace Stripe;
  */
 class Recipient extends ApiResource
 {
-    /**
-     * @param string $id The ID of the recipient to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Recipient
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Recipients
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Recipient The created recipient.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the recipient to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Recipient The updated recipient.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Recipient The saved recipient.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return Recipient The deleted recipient.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
      * @param array|null $params
@@ -82,9 +22,7 @@ class Recipient extends ApiResource
      */
     public function transfers($params = null)
     {
-        if ($params === null) {
-            $params = array();
-        }
+        $params = $params ?: [];
         $params['recipient'] = $this->id;
         $transfers = Transfer::all($params, $this->_opts);
         return $transfers;
diff --git a/htdocs/includes/stripe/lib/RecipientTransfer.php b/htdocs/includes/stripe/lib/RecipientTransfer.php
index f4e46db38dd..610514dc329 100644
--- a/htdocs/includes/stripe/lib/RecipientTransfer.php
+++ b/htdocs/includes/stripe/lib/RecipientTransfer.php
@@ -20,7 +20,7 @@ namespace Stripe;
  * @property string $failure_code
  * @property string $failure_message
  * @property bool $livemode
- * @property mixed $metadata
+ * @property StripeObject $metadata
  * @property string $method
  * @property string $recipient
  * @property mixed $reversals
diff --git a/htdocs/includes/stripe/lib/Refund.php b/htdocs/includes/stripe/lib/Refund.php
index b4e0e76a7b0..0288895d68d 100644
--- a/htdocs/includes/stripe/lib/Refund.php
+++ b/htdocs/includes/stripe/lib/Refund.php
@@ -8,11 +8,13 @@ namespace Stripe;
  * @property string $id
  * @property string $object
  * @property int $amount
- * @property mixed $balance_transaction
+ * @property string $balance_transaction
  * @property string $charge
  * @property int $created
  * @property string $currency
- * @property mixed $metadata
+ * @property string $failure_balance_transaction
+ * @property string failure_reason
+ * @property StripeObject $metadata
  * @property mixed $reason
  * @property mixed $receipt_number
  * @property string $status
@@ -21,59 +23,8 @@ namespace Stripe;
  */
 class Refund extends ApiResource
 {
-
-    /**
-     * @param string $id The ID of the refund to retrieve.
-     * @param array|string|null $options
-     *
-     * @return Refund
-     */
-    public static function retrieve($id, $options = null)
-    {
-        return self::_retrieve($id, $options);
-    }
-
-    /**
-     * @param string $id The ID of the refund to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Refund The updated refund.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Collection of Refunds
-     */
-    public static function all($params = null, $options = null)
-    {
-        return self::_all($params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Refund The created refund.
-     */
-    public static function create($params = null, $options = null)
-    {
-        return self::_create($params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Refund The saved refund.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/SKU.php b/htdocs/includes/stripe/lib/SKU.php
index 7089604e62a..1f35da4c759 100644
--- a/htdocs/includes/stripe/lib/SKU.php
+++ b/htdocs/includes/stripe/lib/SKU.php
@@ -5,73 +5,28 @@ namespace Stripe;
 /**
  * Class SKU
  *
+ * @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
+ *
  * @package Stripe
  */
 class SKU extends ApiResource
 {
-    /**
-     * @param string $id The ID of the SKU to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return SKU
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return SKU The created SKU.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the SKU to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return SKU The updated SKU.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return SKU The saved SKU.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of SKUs
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return SKU The deleted sku.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/lib/Source.php b/htdocs/includes/stripe/lib/Source.php
index 946586dec45..4a889c5a4e5 100644
--- a/htdocs/includes/stripe/lib/Source.php
+++ b/htdocs/includes/stripe/lib/Source.php
@@ -5,72 +5,39 @@ namespace Stripe;
 /**
  * Class Source
  *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $client_secret
+ * @property mixed $code_verification
+ * @property int $created
+ * @property string $currency
+ * @property string $flow
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property mixed $owner
+ * @property mixed $receiver
+ * @property mixed $redirect
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ * @property string $usage
+ *
  * @package Stripe
  */
 class Source extends ApiResource
 {
-    /**
-     * @param string $id The ID of the Source to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Source
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Sources
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Source The created Source.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the source to update.
      * @param array|null $params
      * @param array|string|null $options
      *
-     * @return Source The updated source.
+     * @return Source The detached source.
      */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Source The saved source.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Source The deleted source.
-     */
-    public function delete($params = null, $options = null)
+    public function detach($params = null, $options = null)
     {
         self::_validateParams($params);
 
@@ -92,9 +59,8 @@ class Source extends ApiResource
             $this->refreshFrom($response, $opts);
             return $this;
         } else {
-            $message = "Source objects cannot be deleted, they can only be "
-               . "detached from customer objects. This source object does not "
-               . "appear to be currently attached to a customer object.";
+            $message = "This source object does not appear to be currently attached "
+               . "to a customer object.";
             throw new Error\Api($message);
         }
     }
@@ -103,7 +69,35 @@ class Source extends ApiResource
      * @param array|null $params
      * @param array|string|null $options
      *
-     * @return BankAccount The verified bank account.
+     * @return Source The detached source.
+     *
+     * @deprecated Use the `detach` method instead.
+     */
+    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)
+    {
+        $url = $this->instanceUrl() . '/source_transactions';
+        list($response, $opts) = $this->_request('get', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Source The verified source.
      */
     public function verify($params = null, $options = null)
     {
diff --git a/htdocs/includes/stripe/lib/SourceTransaction.php b/htdocs/includes/stripe/lib/SourceTransaction.php
new file mode 100644
index 00000000000..a0c8d776b9a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SourceTransaction.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SourceTransaction
+ *
+ * @package Stripe
+ */
+class SourceTransaction extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Stripe.php b/htdocs/includes/stripe/lib/Stripe.php
index 9c85c08ea04..8b7b51b15ca 100644
--- a/htdocs/includes/stripe/lib/Stripe.php
+++ b/htdocs/includes/stripe/lib/Stripe.php
@@ -12,9 +12,15 @@ class Stripe
     // @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.
+    public static $clientId;
+
     // @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.
+    public static $connectBase = 'https://connect.stripe.com';
+
     // @var string The base URL for the Stripe API uploads endpoint.
     public static $apiUploadBase = 'https://uploads.stripe.com';
 
@@ -24,13 +30,29 @@ class Stripe
     // @var string|null The account ID for connected accounts requests.
     public static $accountId = null;
 
+    // @var string Path to the CA bundle used to verify SSL certificates
+    public static $caBundlePath = null;
+
     // @var boolean Defaults to true.
     public static $verifySslCerts = true;
 
     // @var array The application's information (name, version, URL)
     public static $appInfo = null;
 
-    const VERSION = '4.7.0';
+    // @var Util\LoggerInterface|null The logger to which the library will
+    //   produce messages.
+    public static $logger = null;
+
+    // @var int Maximum number of request retries
+    public static $maxNetworkRetries = 0;
+
+    // @var float Maximum delay between retries, in seconds
+    private static $maxNetworkRetryDelay = 2.0;
+
+    // @var float Initial delay between retries, in seconds
+    private static $initialNetworkRetryDelay = 0.5;
+
+    const VERSION = '6.4.1';
 
     /**
      * @return string The API key used for requests.
@@ -40,6 +62,35 @@ class Stripe
         return self::$apiKey;
     }
 
+    /**
+     * @return string The client_id used for Connect requests.
+     */
+    public static function getClientId()
+    {
+        return self::$clientId;
+    }
+
+    /**
+     * @return Util\LoggerInterface The logger to which the library will
+     *   produce messages.
+     */
+    public static function getLogger()
+    {
+        if (self::$logger == null) {
+            return new Util\DefaultLogger();
+        }
+        return self::$logger;
+    }
+
+    /**
+     * @param Util\LoggerInterface $logger The logger to which the library
+     *   will produce messages.
+     */
+    public static function setLogger($logger)
+    {
+        self::$logger = $logger;
+    }
+
     /**
      * Sets the API key to be used for requests.
      *
@@ -50,6 +101,16 @@ class Stripe
         self::$apiKey = $apiKey;
     }
 
+    /**
+     * Sets the client_id to be used for Connect requests.
+     *
+     * @param string $clientId
+     */
+    public static function setClientId($clientId)
+    {
+        self::$clientId = $clientId;
+    }
+
     /**
      * @return string The API version used for requests. null if we're using the
      *    latest version.
@@ -67,6 +128,30 @@ class Stripe
         self::$apiVersion = $apiVersion;
     }
 
+    /**
+     * @return string
+     */
+    private static function getDefaultCABundlePath()
+    {
+        return realpath(dirname(__FILE__) . '/../data/ca-certificates.crt');
+    }
+
+    /**
+     * @return string
+     */
+    public static function getCABundlePath()
+    {
+        return self::$caBundlePath ?: self::getDefaultCABundlePath();
+    }
+
+    /**
+     * @param string $caBundlePath
+     */
+    public static function setCABundlePath($caBundlePath)
+    {
+        self::$caBundlePath = $caBundlePath;
+    }
+
     /**
      * @return boolean
      */
@@ -116,11 +201,41 @@ class Stripe
      */
     public static function setAppInfo($appName, $appVersion = null, $appUrl = null)
     {
-        if (self::$appInfo === null) {
-            self::$appInfo = array();
-        }
+        self::$appInfo = self::$appInfo ?: [];
         self::$appInfo['name'] = $appName;
         self::$appInfo['version'] = $appVersion;
         self::$appInfo['url'] = $appUrl;
     }
+
+    /**
+     * @return int Maximum number of request retries
+     */
+    public static function getMaxNetworkRetries()
+    {
+        return self::$maxNetworkRetries;
+    }
+
+    /**
+     * @param int $maxNetworkRetries Maximum number of request retries
+     */
+    public static function setMaxNetworkRetries($maxNetworkRetries)
+    {
+        self::$maxNetworkRetries = $maxNetworkRetries;
+    }
+
+    /**
+     * @return float Maximum delay between retries, in seconds
+     */
+    public static function getMaxNetworkRetryDelay()
+    {
+        return self::$maxNetworkRetryDelay;
+    }
+
+    /**
+     * @return float Initial delay between retries, in seconds
+     */
+    public static function getInitialNetworkRetryDelay()
+    {
+        return self::$initialNetworkRetryDelay;
+    }
 }
diff --git a/htdocs/includes/stripe/lib/StripeObject.php b/htdocs/includes/stripe/lib/StripeObject.php
index 42e37f694e8..dfff2c5dc6f 100644
--- a/htdocs/includes/stripe/lib/StripeObject.php
+++ b/htdocs/includes/stripe/lib/StripeObject.php
@@ -2,38 +2,425 @@
 
 namespace Stripe;
 
-use ArrayAccess;
-use InvalidArgumentException;
-
 /**
  * Class StripeObject
  *
  * @package Stripe
  */
-class StripeObject implements ArrayAccess, JsonSerializable
+class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
 {
-    /**
-     * @var Util\Set Attributes that should not be sent to the API because
-     *    they're not updatable (e.g. API key, ID).
-     */
-    public static $permanentAttributes;
-    /**
-     * @var Util\Set Attributes that are nested but still updatable from
-     *    the parent class's URL (e.g. metadata).
-     */
-    public static $nestedUpdatableAttributes;
+    protected $_opts;
+    protected $_originalValues;
+    protected $_values;
+    protected $_unsavedValues;
+    protected $_transientValues;
+    protected $_retrieveOptions;
+    protected $_lastResponse;
 
-    public static function init()
+    /**
+     * @return Util\Set Attributes that should not be sent to the API because
+     *    they're not updatable (e.g. ID).
+     */
+    public static function getPermanentAttributes()
     {
-        self::$permanentAttributes = new Util\Set(array('_opts', 'id'));
-        self::$nestedUpdatableAttributes = new Util\Set(array(
-            'metadata', 'legal_entity', 'address', 'dob', 'transfer_schedule', 'verification',
-            'tos_acceptance', 'personal_address',
-            // will make the array into an AttachedObject: weird, but works for now
-            'additional_owners', 0, 1, 2, 3, 4, // Max 3, but leave the 4th so errors work properly
-            'inventory',
-            'owner',
-        ));
+        static $permanentAttributes = null;
+        if ($permanentAttributes === null) {
+            $permanentAttributes = new Util\Set([
+                'id',
+            ]);
+        }
+        return $permanentAttributes;
+    }
+
+    public function __construct($id = null, $opts = null)
+    {
+        list($id, $this->_retrieveOptions) = Util\Util::normalizeId($id);
+        $this->_opts = Util\RequestOptions::parse($opts);
+        $this->_originalValues = [];
+        $this->_values = [];
+        $this->_unsavedValues = new Util\Set();
+        $this->_transientValues = new Util\Set();
+        if ($id !== null) {
+            $this->_values['id'] = $id;
+        }
+    }
+
+    // Standard accessor magic methods
+    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())
+            );
+        }
+
+        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'
+            );
+        }
+
+        $this->_values[$k] = Util\Util::convertToStripeObject($v, $this->_opts);
+        $this->dirtyValue($this->_values[$k]);
+        $this->_unsavedValues->add($k);
+    }
+
+    public function __isset($k)
+    {
+        return isset($this->_values[$k]);
+    }
+
+    public function __unset($k)
+    {
+        unset($this->_values[$k]);
+        $this->_transientValues->add($k);
+        $this->_unsavedValues->discard($k);
+    }
+
+    public function &__get($k)
+    {
+        // 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)) {
+            return $this->_values[$k];
+        } else if (!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 "
+                    . "with the result returned by Stripe's API, "
+                    . "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;
+        }
+    }
+
+    // Magic method for var_dump output. Only works with PHP >= 5.6
+    public function __debugInfo()
+    {
+        return $this->_values;
+    }
+
+    // ArrayAccess methods
+    public function offsetSet($k, $v)
+    {
+        $this->$k = $v;
+    }
+
+    public function offsetExists($k)
+    {
+        return array_key_exists($k, $this->_values);
+    }
+
+    public function offsetUnset($k)
+    {
+        unset($this->$k);
+    }
+
+    public function offsetGet($k)
+    {
+        return array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
+    }
+
+    // Countable method
+    public function count()
+    {
+        return count($this->_values);
+    }
+
+    public function keys()
+    {
+        return array_keys($this->_values);
+    }
+
+    public function values()
+    {
+        return array_values($this->_values);
+    }
+
+    /**
+     * This unfortunately needs to be public to be used in Util\Util
+     *
+     * @param array $values
+     * @param null|string|array|Util\RequestOptions $opts
+     *
+     * @return StripeObject 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;
+    }
+
+    /**
+     * Refreshes this object using the provided values.
+     *
+     * @param array $values
+     * @param null|string|array|Util\RequestOptions $opts
+     * @param boolean $partial Defaults to false.
+     */
+    public function refreshFrom($values, $opts, $partial = false)
+    {
+        $this->_opts = Util\RequestOptions::parse($opts);
+
+        $this->_originalValues = self::deepCopy($values);
+
+        if ($values instanceof StripeObject) {
+            $values = $values->__toArray(true);
+        }
+
+        // Wipe old state before setting new.  This is useful for e.g. updating a
+        // customer, where there is no persistent card parameter.  Mark those values
+        // which don't persist as transient
+        if ($partial) {
+            $removed = new Util\Set();
+        } else {
+            $removed = new Util\Set(array_diff(array_keys($this->_values), array_keys($values)));
+        }
+
+        foreach ($removed->toArray() as $k) {
+            unset($this->$k);
+        }
+
+        $this->updateAttributes($values, $opts, false);
+        foreach ($values as $k => $v) {
+            $this->_transientValues->discard($k);
+            $this->_unsavedValues->discard($k);
+        }
+    }
+
+    /**
+     * Mass assigns attributes on the model.
+     *
+     * @param array $values
+     * @param null|string|array|Util\RequestOptions $opts
+     * @param boolean $dirty Defaults to true.
+     */
+    public function updateAttributes($values, $opts = null, $dirty = true)
+    {
+        foreach ($values as $k => $v) {
+            // Special-case metadata to always be cast as a StripeObject
+            // 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") {
+                $this->_values[$k] = StripeObject::constructFrom($v, $opts);
+            } else {
+                $this->_values[$k] = Util\Util::convertToStripeObject($v, $opts);
+            }
+            if ($dirty) {
+                $this->dirtyValue($this->_values[$k]);
+            }
+            $this->_unsavedValues->add($k);
+        }
+    }
+
+    /**
+     * @return array A recursive mapping of attributes to values for this object,
+     *    including the proper value for deleted attributes.
+     */
+    public function serializeParameters($force = false)
+    {
+        $updateParams = [];
+
+        foreach ($this->_values as $k => $v) {
+            // There are a few reasons that we may want to add in a parameter for
+            // update:
+            //
+            //   1. The `$force` option has been set.
+            //   2. We know that it was modified.
+            //   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;
+            $unsaved = $this->_unsavedValues->includes($k);
+            if ($force || $unsaved || $v instanceof StripeObject) {
+                $updateParams[$k] = $this->serializeParamsValue(
+                    $this->_values[$k],
+                    $original,
+                    $unsaved,
+                    $force,
+                    $k
+                );
+            }
+        }
+
+        // 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(
+            $updateParams,
+            function ($v) {
+                return $v !== null;
+            }
+        );
+
+        return $updateParams;
+    }
+
+
+    public function serializeParamsValue($value, $original, $unsaved, $force, $key = null)
+    {
+        // The logic here is that essentially any object embedded in another
+        // object that had a `type` is actually an API resource of a different
+        // type that's been included in the response. These other resources must
+        // be updated from their proper endpoints, and therefore they are not
+        // included when serializing even if they've been modified.
+        //
+        // There are _some_ known exceptions though.
+        //
+        // For example, if the value is unsaved (meaning the user has set it), and
+        // it looks like the API resource is persisted with an ID, then we include
+        // the object so that parameters are serialized with a reference to its
+        // ID.
+        //
+        // Another example is that on save API calls it's sometimes desirable to
+        // update a customer's default source by setting a new card (or other)
+        // object with `->source=` and then saving the customer. The
+        // `saveWithParent` flag to override the default behavior allows us to
+        // handle these exceptions.
+        //
+        // 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 (!$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 (Util\Util::isList($value)) {
+                // Sequential array, i.e. a list
+                $update = [];
+                foreach ($value as $v) {
+                    array_push($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)) {
+                    return $update;
+                }
+            } else {
+                // Associative array, i.e. a map
+                return Util\Util::convertToStripeObject($value, $this->_opts)->serializeParameters();
+            }
+        } elseif ($value instanceof StripeObject) {
+            $update = $value->serializeParameters($force);
+            if ($original && $unsaved) {
+                $update = array_merge(self::emptyValues($original), $update);
+            }
+            return $update;
+        } else {
+            return $value;
+        }
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->__toArray(true);
+    }
+
+    public function __toJSON()
+    {
+        return json_encode($this->__toArray(true), JSON_PRETTY_PRINT);
+    }
+
+    public function __toString()
+    {
+        $class = get_class($this);
+        return $class . ' JSON: ' . $this->__toJSON();
+    }
+
+    public function __toArray($recursive = false)
+    {
+        if ($recursive) {
+            return Util\Util::convertStripeObjectToArray($this->_values);
+        } else {
+            return $this->_values;
+        }
+    }
+
+    /**
+     * Sets all keys within the StripeObject as unsaved so that they will be
+     * included with an update when `serializeParameters` is called. This
+     * method is also recursive, so any StripeObjects contained as values or
+     * which are values in a tenant array are also marked as dirty.
+     */
+    public function dirty()
+    {
+        $this->_unsavedValues = new Util\Set(array_keys($this->_values));
+        foreach ($this->_values as $k => $v) {
+            $this->dirtyValue($v);
+        }
+    }
+
+    protected function dirtyValue($value)
+    {
+        if (is_array($value)) {
+            foreach ($value as $v) {
+                $this->dirtyValue($v);
+            }
+        } elseif ($value instanceof StripeObject) {
+            $value->dirty();
+        }
+    }
+
+    /**
+     * Produces a deep copy of the given object including support for arrays
+     * and StripeObjects.
+     */
+    protected static function deepCopy($obj)
+    {
+        if (is_array($obj)) {
+            $copy = [];
+            foreach ($obj as $k => $v) {
+                $copy[$k] = self::deepCopy($v);
+            }
+            return $copy;
+        } elseif ($obj instanceof StripeObject) {
+            return $obj::constructFrom(
+                self::deepCopy($obj->_values),
+                clone $obj->_opts
+            );
+        } else {
+            return $obj;
+        }
+    }
+
+    /**
+     * Returns a hash of empty values for all the values that are in the given
+     * StripeObject.
+     */
+    public static function emptyValues($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)
+            );
+        }
+        $update = array_fill_keys(array_keys($values), "");
+        return $update;
     }
 
     /**
@@ -53,242 +440,4 @@ class StripeObject implements ArrayAccess, JsonSerializable
     {
         $this->_lastResponse = $resp;
     }
-
-    protected $_opts;
-    protected $_values;
-    protected $_unsavedValues;
-    protected $_transientValues;
-    protected $_retrieveOptions;
-    protected $_lastResponse;
-
-    public function __construct($id = null, $opts = null)
-    {
-        $this->_opts = $opts ? $opts : new Util\RequestOptions();
-        $this->_values = array();
-        $this->_unsavedValues = new Util\Set();
-        $this->_transientValues = new Util\Set();
-
-        $this->_retrieveOptions = array();
-        if (is_array($id)) {
-            foreach ($id as $key => $value) {
-                if ($key != 'id') {
-                    $this->_retrieveOptions[$key] = $value;
-                }
-            }
-            $id = $id['id'];
-        }
-
-        if ($id !== null) {
-            $this->id = $id;
-        }
-    }
-
-    // Standard accessor magic methods
-    public function __set($k, $v)
-    {
-        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 (self::$nestedUpdatableAttributes->includes($k)
-                && isset($this->$k) && $this->$k instanceof AttachedObject && is_array($v)) {
-            $this->$k->replaceWith($v);
-        } else {
-            // TODO: may want to clear from $_transientValues (Won't be user-visible).
-            $this->_values[$k] = $v;
-        }
-        if (!self::$permanentAttributes->includes($k)) {
-            $this->_unsavedValues->add($k);
-        }
-    }
-
-    public function __isset($k)
-    {
-        return isset($this->_values[$k]);
-    }
-    public function __unset($k)
-    {
-        unset($this->_values[$k]);
-        $this->_transientValues->add($k);
-        $this->_unsavedValues->discard($k);
-    }
-    public function &__get($k)
-    {
-        // 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)) {
-            return $this->_values[$k];
-        } else if (!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 "
-                    . "with the result returned by Stripe's API, "
-                    . "probably as a result of a save(). The attributes currently "
-                    . "available on this object are: $attrs";
-            error_log($message);
-            return $nullval;
-        } else {
-            $class = get_class($this);
-            error_log("Stripe Notice: Undefined property of $class instance: $k");
-            return $nullval;
-        }
-    }
-
-    // ArrayAccess methods
-    public function offsetSet($k, $v)
-    {
-        $this->$k = $v;
-    }
-
-    public function offsetExists($k)
-    {
-        return array_key_exists($k, $this->_values);
-    }
-
-    public function offsetUnset($k)
-    {
-        unset($this->$k);
-    }
-    public function offsetGet($k)
-    {
-        return array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
-    }
-
-    public function keys()
-    {
-        return array_keys($this->_values);
-    }
-
-    /**
-     * This unfortunately needs to be public to be used in Util\Util
-     *
-     * @param array $values
-     * @param array $opts
-     *
-     * @return StripeObject The object constructed from the given values.
-     */
-    public static function constructFrom($values, $opts)
-    {
-        $obj = new static(isset($values['id']) ? $values['id'] : null);
-        $obj->refreshFrom($values, $opts);
-        return $obj;
-    }
-
-    /**
-     * Refreshes this object using the provided values.
-     *
-     * @param array $values
-     * @param array|Util\RequestOptions $opts
-     * @param boolean $partial Defaults to false.
-     */
-    public function refreshFrom($values, $opts, $partial = false)
-    {
-        if (is_array($opts)) {
-            $opts = Util\RequestOptions::parse($opts);
-        }
-
-        $this->_opts = $opts;
-
-        // Wipe old state before setting new.  This is useful for e.g. updating a
-        // customer, where there is no persistent card parameter.  Mark those values
-        // which don't persist as transient
-        if ($partial) {
-            $removed = new Util\Set();
-        } else {
-            $removed = array_diff(array_keys($this->_values), array_keys($values));
-        }
-
-        foreach ($removed as $k) {
-            if (self::$permanentAttributes->includes($k)) {
-                continue;
-            }
-
-            unset($this->$k);
-        }
-
-        foreach ($values as $k => $v) {
-            if (self::$permanentAttributes->includes($k) && isset($this[$k])) {
-                continue;
-            }
-
-            if (self::$nestedUpdatableAttributes->includes($k) && is_array($v)) {
-                $this->_values[$k] = AttachedObject::constructFrom($v, $opts);
-            } else {
-                $this->_values[$k] = Util\Util::convertToStripeObject($v, $opts);
-            }
-
-            $this->_transientValues->discard($k);
-            $this->_unsavedValues->discard($k);
-        }
-    }
-
-    /**
-     * @return array A recursive mapping of attributes to values for this object,
-     *    including the proper value for deleted attributes.
-     */
-    public function serializeParameters()
-    {
-        $params = array();
-        if ($this->_unsavedValues) {
-            foreach ($this->_unsavedValues->toArray() as $k) {
-                $v = $this->$k;
-                if ($v === null) {
-                    $v = '';
-                }
-
-                $params[$k] = $v;
-            }
-        }
-
-        // Get nested updates.
-        foreach (self::$nestedUpdatableAttributes->toArray() as $property) {
-            if (isset($this->$property)) {
-                if ($this->$property instanceof StripeObject) {
-                    $serialized = $this->$property->serializeParameters();
-                    if ($serialized) {
-                        $params[$property] = $serialized;
-                    }
-                }
-            }
-        }
-
-        return $params;
-    }
-
-    public function jsonSerialize()
-    {
-        return $this->__toArray(true);
-    }
-
-    public function __toJSON()
-    {
-        if (defined('JSON_PRETTY_PRINT')) {
-            return json_encode($this->__toArray(true), JSON_PRETTY_PRINT);
-        } else {
-            return json_encode($this->__toArray(true));
-        }
-    }
-
-    public function __toString()
-    {
-        $class = get_class($this);
-        return $class . ' JSON: ' . $this->__toJSON();
-    }
-
-    public function __toArray($recursive = false)
-    {
-        if ($recursive) {
-            return Util\Util::convertStripeObjectToArray($this->_values);
-        } else {
-            return $this->_values;
-        }
-    }
 }
-
-StripeObject::init();
diff --git a/htdocs/includes/stripe/lib/Subscription.php b/htdocs/includes/stripe/lib/Subscription.php
index a95ab0911c9..a5a8da1beb5 100644
--- a/htdocs/includes/stripe/lib/Subscription.php
+++ b/htdocs/includes/stripe/lib/Subscription.php
@@ -5,10 +5,42 @@ namespace Stripe;
 /**
  * Class Subscription
  *
+ * @property string $id
+ * @property string $object
+ * @property float $application_fee_percent
+ * @property string $billing
+ * @property bool $cancel_at_period_end
+ * @property int $canceled_at
+ * @property int $created
+ * @property int current_period_end
+ * @property int current_period_start
+ * @property string $customer
+ * @property int $days_until_due
+ * @property mixed $discount
+ * @property int $ended_at
+ * @property Collection $items
+ * @property boolean $livemode
+ * @property StripeObject $metadata
+ * @property Plan $plan
+ * @property int $quantity
+ * @property int $start
+ * @property string $status
+ * @property float $tax_percent
+ * @property int $trial_end
+ * @property int $trial_start
+ *
  * @package Stripe
  */
 class Subscription extends ApiResource
 {
+    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.
      *
@@ -20,49 +52,15 @@ class Subscription extends ApiResource
     const STATUS_TRIALING = 'trialing';
     const STATUS_UNPAID = 'unpaid';
 
-    /**
-     * @param string $id The ID of the subscription to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Subscription
-     */
-    public static function retrieve($id, $opts = null)
+    public static function getSavedNestedResources()
     {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Subscriptions
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Subscription The created subscription.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the subscription to retrieve.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Subscription The updated subscription.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
+        static $savedNestedResources = null;
+        if ($savedNestedResources === null) {
+            $savedNestedResources = new Util\Set([
+                'source',
+            ]);
+        }
+        return $savedNestedResources;
     }
 
     /**
@@ -75,16 +73,6 @@ class Subscription extends ApiResource
         return $this->_delete($params, $opts);
     }
 
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Subscription The saved subscription.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
     /**
      * @return Subscription The updated subscription.
      */
@@ -92,6 +80,15 @@ class Subscription extends ApiResource
     {
         $url = $this->instanceUrl() . '/discount';
         list($response, $opts) = $this->_request('delete', $url);
-        $this->refreshFrom(array('discount' => null), $opts, true);
+        $this->refreshFrom(['discount' => null], $opts, true);
+    }
+
+    public function serializeParameters($force = false)
+    {
+        $update = parent::serializeParameters($force);
+        if ($this->_unsavedValues->includes('items')) {
+            $update['items'] = $this->serializeParamsValue($this->items, null, true, $force, 'items');
+        }
+        return $update;
     }
 }
diff --git a/htdocs/includes/stripe/lib/SubscriptionItem.php b/htdocs/includes/stripe/lib/SubscriptionItem.php
index 947d83fcb5f..9efc726aa66 100644
--- a/htdocs/includes/stripe/lib/SubscriptionItem.php
+++ b/htdocs/includes/stripe/lib/SubscriptionItem.php
@@ -5,10 +5,24 @@ namespace Stripe;
 /**
  * Class SubscriptionItem
  *
+ * @property string $id
+ * @property string $object
+ * @property int $created
+ * @property StripeObject $metadata
+ * @property Plan $plan
+ * @property int $quantity
+ * @property string $subscription
+ *
  * @package Stripe
  */
 class SubscriptionItem extends ApiResource
 {
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Delete;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+
     /**
      * This is a special case because the subscription items endpoint has an
      *    underscore in it. The parent `className` function strips underscores.
@@ -19,70 +33,4 @@ class SubscriptionItem extends ApiResource
     {
         return 'subscription_item';
     }
-
-    /**
-     * @param string $id The ID of the subscription item to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return SubscriptionItem
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of SubscriptionItems
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return SubscriptionItem The created subscription item.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the subscription item to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return SubscriptionItem The updated subscription item.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return SubscriptionItem The saved subscription item.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return SubscriptionItem The deleted subscription item.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/ThreeDSecure.php b/htdocs/includes/stripe/lib/ThreeDSecure.php
index 1f189b7daeb..7210bfd1f71 100644
--- a/htdocs/includes/stripe/lib/ThreeDSecure.php
+++ b/htdocs/includes/stripe/lib/ThreeDSecure.php
@@ -4,6 +4,9 @@ namespace Stripe;
 
 class ThreeDSecure extends ApiResource
 {
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+
     /**
      * @return string The endpoint URL for the given class.
      */
@@ -11,26 +14,4 @@ class ThreeDSecure extends ApiResource
     {
         return "/v1/3d_secure";
     }
-
-    /**
-     * @param string $id The ID of the 3DS auth to retrieve.
-     * @param array|string|null $options
-     *
-     * @return ThreeDSecure
-     */
-    public static function retrieve($id, $options = null)
-    {
-        return self::_retrieve($id, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ThreeDSecure The created 3D Secure object.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/Token.php b/htdocs/includes/stripe/lib/Token.php
index d3e5a4bcef9..fbf19bbf7b1 100644
--- a/htdocs/includes/stripe/lib/Token.php
+++ b/htdocs/includes/stripe/lib/Token.php
@@ -9,7 +9,7 @@ namespace Stripe;
  * @property string $object
  * @property mixed $bank_account
  * @property mixed $card
- * @property mixed $client_ip
+ * @property string $client_ip
  * @property int $created
  * @property bool $livemode
  * @property string $type
@@ -19,25 +19,6 @@ namespace Stripe;
  */
 class Token extends ApiResource
 {
-    /**
-     * @param string $id The ID of the token to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Token
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Token The created token.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
 }
diff --git a/htdocs/includes/stripe/lib/Topup.php b/htdocs/includes/stripe/lib/Topup.php
new file mode 100644
index 00000000000..33d081e3191
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Topup.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Topup
+ *
+ * @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
+ *
+ * @package Stripe
+ */
+class Topup extends ApiResource
+{
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+}
diff --git a/htdocs/includes/stripe/lib/Transfer.php b/htdocs/includes/stripe/lib/Transfer.php
index 2f483f30169..87d8b79cbf3 100644
--- a/htdocs/includes/stripe/lib/Transfer.php
+++ b/htdocs/includes/stripe/lib/Transfer.php
@@ -12,63 +12,27 @@ namespace Stripe;
  * @property string $balance_transaction
  * @property int $created
  * @property string $currency
- * @property int $date
- * @property mixed $destination
- * @property mixed $destination_payment
+ * @property string $destination
+ * @property string $destination_payment
  * @property bool $livemode
- * @property mixed $metadata
- * @property mixed $reversals
+ * @property StripeObject $metadata
+ * @property Collection $reversals
  * @property bool $reversed
- * @property mixed $source_transaction
+ * @property string $source_transaction
+ * @property string $source_type
+ * @property string $transfer_group
  *
  * @package Stripe
  */
 class Transfer extends ApiResource
 {
-    /**
-     * @param string $id The ID of the transfer to retrieve.
-     * @param array|string|null $opts
-     *
-     * @return Transfer
-     */
-    public static function retrieve($id, $opts = null)
-    {
-        return self::_retrieve($id, $opts);
-    }
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\NestedResource;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
 
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection of Transfers
-     */
-    public static function all($params = null, $opts = null)
-    {
-        return self::_all($params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Transfer The created transfer.
-     */
-    public static function create($params = null, $opts = null)
-    {
-        return self::_create($params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the transfer to update.
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Transfer The updated transfer.
-     */
-    public static function update($id, $params = null, $options = null)
-    {
-        return self::_update($id, $params, $options);
-    }
+    const PATH_REVERSALS = '/reversals';
 
     /**
      * @return TransferReversal The created transfer reversal.
@@ -93,12 +57,52 @@ class Transfer extends ApiResource
     }
 
     /**
+     * @param array|null $id The ID of the transfer on which to create the reversal.
+     * @param array|null $params
      * @param array|string|null $opts
      *
-     * @return Transfer The saved transfer.
+     * @return TransferReversal
      */
-    public function save($opts = null)
+    public static function createReversal($id, $params = null, $opts = null)
     {
-        return $this->_save($opts);
+        return self::_createNestedResource($id, static::PATH_REVERSALS, $params, $opts);
+    }
+
+    /**
+     * @param array|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
+     *
+     * @return TransferReversal
+     */
+    public static function retrieveReversal($id, $reversalId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_REVERSALS, $reversalId, $params, $opts);
+    }
+
+    /**
+     * @param array|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
+     *
+     * @return TransferReversal
+     */
+    public static function updateReversal($id, $reversalId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_REVERSALS, $reversalId, $params, $opts);
+    }
+
+    /**
+     * @param array|null $id The ID of the transfer on which to retrieve the reversals.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return TransferReversal
+     */
+    public static function allReversals($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_REVERSALS, $params, $opts);
     }
 }
diff --git a/htdocs/includes/stripe/lib/TransferReversal.php b/htdocs/includes/stripe/lib/TransferReversal.php
index 33948c93e14..cf2a3946d85 100644
--- a/htdocs/includes/stripe/lib/TransferReversal.php
+++ b/htdocs/includes/stripe/lib/TransferReversal.php
@@ -11,13 +11,17 @@ namespace Stripe;
  * @property string $balance_transaction
  * @property int $created
  * @property string $currency
- * @property mixed $metadata
+ * @property StripeObject $metadata
  * @property string $transfer
  *
  * @package Stripe
  */
 class TransferReversal extends ApiResource
 {
+    use ApiOperations\Update {
+        save as protected _save;
+    }
+
     /**
      * @return string The API URL for this Stripe transfer reversal.
      */
diff --git a/htdocs/includes/stripe/lib/Webhook.php b/htdocs/includes/stripe/lib/Webhook.php
new file mode 100644
index 00000000000..e0ab3021a89
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Webhook.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Stripe;
+
+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.
+     *
+     * @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.
+     * @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.
+     */
+    public static function constructEvent($payload, $sigHeader, $secret, $tolerance = self::DEFAULT_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);
+
+        WebhookSignature::verifyHeader($payload, $sigHeader, $secret, $tolerance);
+
+        return $event;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/WebhookSignature.php b/htdocs/includes/stripe/lib/WebhookSignature.php
new file mode 100644
index 00000000000..73e70dbd7de
--- /dev/null
+++ b/htdocs/includes/stripe/lib/WebhookSignature.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Stripe;
+
+abstract class WebhookSignature
+{
+    const EXPECTED_SCHEME = "v1";
+
+    /**
+     * Verifies the signature header sent by Stripe. Throws a
+     * SignatureVerification exception if the verification fails for any
+     * reason.
+     *
+     * @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.
+     * @param int $tolerance maximum difference allowed between the header's
+     *  timestamp and the current time
+     * @throws \Stripe\Error\SignatureVerification if the verification fails.
+     * @return bool
+     */
+    public static function verifyHeader($payload, $header, $secret, $tolerance = null)
+    {
+        // 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 (empty($signatures)) {
+            throw new Error\SignatureVerification(
+                "No signatures found with expected scheme",
+                $header,
+                $payload
+            );
+        }
+
+        // Check if expected signature is found in list of signatures from
+        // header
+        $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
+            );
+        }
+
+        // Check if timestamp is within tolerance
+        if (($tolerance > 0) && ((time() - $timestamp) > $tolerance)) {
+            throw new Error\SignatureVerification(
+                "Timestamp outside the tolerance zone",
+                $header,
+                $payload
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * 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);
+
+        foreach ($items as $item) {
+            $itemParts = explode("=", $item, 2);
+            if ($itemParts[0] == "t") {
+                if (!is_numeric($itemParts[1])) {
+                    return -1;
+                }
+                return intval($itemParts[1]);
+            }
+        }
+
+        return -1;
+    }
+
+    /**
+     * 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.
+     */
+    private static function getSignatures($header, $scheme)
+    {
+        $signatures = [];
+        $items = explode(",", $header);
+
+        foreach ($items as $item) {
+            $itemParts = explode("=", $item, 2);
+            if ($itemParts[0] == $scheme) {
+                array_push($signatures, $itemParts[1]);
+            }
+        }
+
+        return $signatures;
+    }
+
+    /**
+     * Computes the signature for a given payload and secret.
+     *
+     * 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.
+     */
+    private static function computeSignature($payload, $secret)
+    {
+        return hash_hmac("sha256", $payload, $secret);
+    }
+}

From 382fe4f13cbb976d49f1ef32c396ad7346344191 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 16:29:43 +0100
Subject: [PATCH 329/386] FIX group account settings

transfert bank settinds to account setting et let only general common online payment settings
---
 htdocs/stripe/admin/stripe.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index e25a84ee6a6..fca7c4a22fb 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -203,6 +203,20 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>'.$langs->trans("STRIPECONNECT").'</td>';
 print '<td>Ce module est configuré en mode marketplace</td></tr>';
 }
+
+if (! empty($conf->banque->enabled))
+{
+print '<tr class="oddeven"><td>';
+print $langs->trans("BankAccount").'</td><td>';
+print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+print '</td></tr>';
+  
+print '<tr class="oddeven"><td>';
+print $langs->trans("BankAccount").'</td><td>';
+print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+print '</td></tr>';
+}
+
 print '</table>';
 
 print '<br>';
@@ -219,19 +233,6 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-if (! empty($conf->banque->enabled))
-{
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
-	print '</td></tr>';
-  
-  print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-	print '</td></tr>';
-}
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';

From b8f88ea315614c6ae157766e1c5f2e5c3bc41da6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Tue, 6 Mar 2018 20:45:05 +0100
Subject: [PATCH 330/386] ADD stock decrement

---
 htdocs/stripe/admin/stripe.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index fca7c4a22fb..391dbabd576 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2017		Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
+ * Copyright (C) 2018		ptibogxiv				<support@ptibogxiv.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
@@ -27,6 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 $servicename='Stripe';
 
@@ -77,6 +79,9 @@ if (empty($conf->stripeconnect->enabled)) {
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
+  // Stock decrement
+  $result=dolibarr_set_const($db,"ONLINE_PAYMENT_WAREHOUSE",(GETPOST('ONLINE_PAYMENT_WAREHOUSE','alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity);
+  if (! $result > 0) $error++;
 	// Payment token for URL
 	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -116,6 +121,7 @@ if ($action=="setlive")
  */
 
 $form=new Form($db);
+$formproduct=new FormProduct($db);
 
 llxHeader('',$langs->trans("StripeSetup"));
 
@@ -263,6 +269,12 @@ print '<input size="32" type="email" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$c
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
 print '</td></tr>';
 
+// stock for automatic decrement
+print '<tr class="oddeven"><td>';
+print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>'; 
+print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
+print '</td></tr>';
+
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
@@ -309,3 +321,4 @@ if (! empty($conf->use_javascript_ajax))
 
 llxFooter();
 $db->close();
+

From fab007ad8301f95f50e5ab45f67439282f01436c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 09:41:27 +0100
Subject: [PATCH 331/386] Remove deprecated option dolibarr_pdf_force_fpdf Fix
 view of dolibarr setup config file

---
 htdocs/admin/pdf.php             | 17 -----------------
 htdocs/admin/system/dolibarr.php | 13 +++++++------
 htdocs/langs/en_US/admin.lang    |  1 -
 htdocs/langs/en_US/other.lang    |  4 ++--
 htdocs/langs/fr_FR/other.lang    |  4 ++--
 5 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 8028c81cf04..2f1ae179948 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -611,18 +611,6 @@ else	// Show
 	print '<td>'.$langs->trans("Value").'</td>'."\n";
 	print "</tr>\n";
 
-	if (! empty($dolibarr_pdf_force_fpdf))
-	{
-
-		print '<tr class="oddeven">'."\n";
-		print '<td>dolibarr_pdf_force_fpdf</td>'."\n";
-		print '<td>';
-		print $dolibarr_pdf_force_fpdf;
-		print '</td>';
-		print '</tr>';
-	}
-
-
 	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
 	print '<td>';
@@ -663,11 +651,6 @@ else	// Show
 	print "</table>\n";
 	print '</div>';
 
-	if (! empty($dolibarr_pdf_force_fpdf))
-	{
-		print info_admin($langs->trans("WarningUsingFPDF")).'<br>';
-	}
-
     print '<div class="tabsAction">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index c36db521f70..468a2c493a7 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -116,7 +116,7 @@ if (function_exists('curl_init'))
     }
     else
     {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a>';
+        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">' .$langs->trans("Check").'</a>';
     }
 }
 
@@ -325,13 +325,14 @@ $configfileparameters=array(
 		'?dolibarr_font_DOL_DEFAULT_TTF_BOLD' => 'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 		'separator4' => '',
 		'dolibarr_main_prod' => 'Production mode (Hide all error messages)',
+		'dolibarr_main_restrict_os_commands' => 'Restrict CLI commands for backups',
+		'dolibarr_main_restrict_ip' => 'Restrict access to some IPs only',
 		'?dolibarr_mailing_limit_sendbyweb' => 'Limit nb of email sent by page',
 		'?dolibarr_mailing_limit_sendbycli' => 'Limit nb of email sent by cli',
-        '?dolibarr_strict_mode' => 'Strict mode is on/off',
-		'?dolibarr_pdf_force_fpdf' => 'Force fpdf usage to generate PDF'
+		'?dolibarr_strict_mode' => 'Strict mode is on/off',
+		'?dolibarr_nocsrfcheck' => 'Disable CSRF security checks'
 );
 
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -441,8 +442,8 @@ if ($resql)
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
-		print '<td class="tdoverflow">'.$obj->name.'</td>'."\n";
-		print '<td class="tdoverflow">'.$obj->value.'</td>'."\n";
+		print '<td class="tdoverflowmax300">'.$obj->name.'</td>'."\n";
+		print '<td class="tdoverflowmax300">'.dol_escape_htmltag($obj->value).'</td>'."\n";
 		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td align="center" width="80px">'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
 		print "</tr>\n";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0c5962c1183..d6514db4d2c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -420,7 +420,6 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_n
 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
 LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>   
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for 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)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index d90bfb35032..066f761bb32 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -80,8 +80,8 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 610a4f59ab3..d34ca3c3498 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -78,8 +78,8 @@ LinkedObject=Objet lié
 NbOfActiveNotifications=Nombre de notifications (nb de destinataires emails)
 PredefinedMailTest=__(Hello)__,\nCeci est un mail de test envoyé à __EMAIL__.\nLes deux lignes sont séparées par un saut de ligne.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nCeci est un message de <b>test</b> (le mot test doit être en gras).<br>Les 2 lignes sont séparées par un retour à la ligne.<br><br>__SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous voulons porter à votre connaissance le fait que la facture __REF__ semble non payée. Aussi, voici la facture à nouveau en pièce jointe pour rappel.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\nVoici le lien pour un paiement en ligne au cas ou celle-ci n'aurait pas encore été payé:\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous voulons porter à votre connaissance le fait que la facture __REF__ semble non payée. Aussi, voici la facture à nouveau en pièce jointe pour rappel.\n\nVoici le lien pour un paiement en ligne:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, la proposition commerciale __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, une demande de prix avec la référence __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nVeuillez trouver, ci-joint, la commande __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__

From 1a5cc4e516b623d98139faba0c0bcaac9ade5b2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 11:06:14 +0100
Subject: [PATCH 332/386] Fix in edit mode, title of event is required

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 2f59df43803..d0d97f83435 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1044,7 +1044,7 @@ if ($id > 0)
 		}
 
 		// Title
-		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
+		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>';

From f800d50fec63bef20cc8f97595e556463c63ea89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 11:53:30 +0100
Subject: [PATCH 333/386] WIP to show event per hours

---
 htdocs/comm/action/class/actioncomm.class.php |  15 +-
 htdocs/comm/action/index.php                  | 137 +++++++++++++-----
 htdocs/theme/eldy/style.css.php               |  11 +-
 htdocs/theme/md/style.css.php                 |   9 +-
 4 files changed, 126 insertions(+), 46 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index f0bb9f92e22..6452e3ca922 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1236,8 +1236,12 @@ class ActionComm extends CommonObject
 
 		$result='';
 
-		// Set label of typ
-		$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+		// Set label of type
+		$labeltype = '';
+		if ($this->type_code)
+		{
+			$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+		}
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
 		    if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
@@ -1289,7 +1293,7 @@ class ActionComm extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		//print 'rrr'.$this->libelle.'-'.$withpicto;
+		//print 'rrr'.$this->libelle.'rrr'.$this->label.'rrr'.$withpicto;
 
         if ($withpicto == 2)
         {
@@ -1309,7 +1313,10 @@ class ActionComm extends CommonObject
         {
             if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
             {
-                $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
+            	if ($labeltype)
+            	{
+                	$libelle.=(preg_match('/'.preg_quote($labeltype,'/').'/', $libelle)?'':' ('.$langs->transnoentities("Action".$this->type_code).')');
+            	}
             }
         }
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index efdad6a3738..a042007f54f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -589,6 +589,7 @@ if ($resql)
         $event->type_color=$obj->type_color;
 
         $event->libelle=$obj->label;
+        $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
@@ -601,7 +602,9 @@ if ($resql)
         $event->elementtype=$obj->elementtype;
 
         $event->societe->id=$obj->fk_soc;
+        $event->thirdparty_id=$obj->fk_soc;
         $event->contact->id=$obj->fk_contact;
+        $event->contact_id=$obj->fk_contact;
 
         // 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.
@@ -1176,19 +1179,72 @@ else    // View by day
     $timestamp=dol_mktime(12,0,0,$month,$day,$year);
     $arraytimestamp=dol_getdate($timestamp);
 
-    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
-    echo '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
-    echo ' <tr class="liste_titre">';
-    echo '  <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
-    echo " </tr>\n";
-    echo " <tr>\n";
-    echo '  <td class="'.$style.'" width="14%" valign="top">';
-    $maxnbofchar=80;
-    show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
-    echo "</td>\n";
-    echo " </tr>\n";
+    //echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month">';
+    echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month noborderbottom" style="margin-bottom: 5px !important;">';
+
+    echo ' <tr class="tagtr liste_titre">';
+    echo '  <td class="tagtd width100"></td>';
+    echo '  <td class="tagtd center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
+    echo " </td>\n";
+
+    /*
+    echo ' <div class="tagtr">';
+    echo '  <div class="tagtd width100"></div>';
+    echo '  <div class="tagtd center">';
+    echo show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, -1);
+    echo '  </div>'."\n";
+    echo " </div>\n";
+	*/
+
     echo '</table>';
-    print '</div>';
+
+    /* WIP View per hour */
+    $useviewhour = 0;
+    if ($useviewhour)
+    {
+    	print '<div class="div-table-responsive-no-min borderbottom">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+
+    	$maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500)?($_SESSION["dol_screenheight"]-200):660;	// Also into index.php file
+
+	    echo '<div style="max-height: '.$maxheightwin.'px;">';
+		echo '<div class="tagtable centpercent calendarviewcontainer">';
+
+	    $maxnbofchar=80;
+
+	    $tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
+	    $minhour = round($tmp[0],0);
+	    $maxhour = round($tmp[1],0);
+	    if ($minhour > 23) $minhour = 23;
+	    if ($maxhour < 1)  $maxhour = 1;
+	    if ($maxhour <= $minhour) { $maxhour = $minhour + 1; }
+
+	    $i = 0;
+	    $j = 0;
+		while ($i < 24)
+		{
+		    echo ' <div class="tagtr calendarviewcontainertr">'."\n";
+		    echo '  <div class="tagtd width100 tdtop">'.dol_print_date($i*3600, 'hour', 'gmt').'</div>';
+		    echo '  <div class="tagtd '.$style.' tdtop">';
+		    echo "  </div>\n";
+		    echo " </div>\n";
+		    $i++;
+		    $j++;
+		}
+
+		echo '</div></div>';
+
+		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1);
+
+		print '</div>';
+    }
+    else
+    {
+    	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
+
+    	show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
+
+    	print '</div>';
+    }
 }
 
 print "\n".'</form>';
@@ -1213,9 +1269,10 @@ $db->close();
  * @param   string	$newparam        Parameters on current URL
  * @param   int		$showinfo        Add extended information (used by day and week view)
  * @param   int		$minheight       Minimum height for each event. 60px by default.
+ * @param	string	$nonew			 0=Add "new entry button", 1=No "new entry button", -1=Only "new entry button"
  * @return	void
  */
-function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60)
+function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $nonew=0)
 {
     global $user, $conf, $langs;
     global $action, $filter, $filtert, $status, $actioncode;	// Filters used into search form
@@ -1230,26 +1287,35 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
     $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
     print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";
 
-    print '<div class="tagtr"><div class="nowrap float">';
-    print '<a 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 '">';
-    if ($showinfo) print dol_print_date($curtime,'daytextshort');
-    else print dol_print_date($curtime,'%d');
-    print '</a>';
-    print '</div><div class="floatright nowrap">';
-    if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+    if ($nonew <= 0)
     {
-    	$newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
+	    print '<div class="tagtr"><div class="nowrap float">';
+	    print '<a 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 '">';
+	    if ($showinfo) print dol_print_date($curtime,'daytextshort');
+	    else print dol_print_date($curtime,'%d');
+	    print '</a>';
+	    print '</div><div class="floatright nowrap">';
+	    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 img_picto($langs->trans("NewAction"),'edit_add.png');
-        print '</a>';
+	        //$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 img_picto($langs->trans("NewAction"),'edit_add.png');
+	        print '</a>';
+	    }
+	    print '</div></div>'."\n";
+    }
+
+    if ($nonew < 0)
+    {
+    	print '</div>';
+    	return;
     }
-    print '</div></div>'."\n";
 
     // Line with td contains all div of each events
     print '<div class="tagtr">';
@@ -1390,6 +1456,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     //print ' position: absolute; top: 40px; width: 50%;';
                     //print '"';
                     print '>';
+
                     //var_dump($event->userassigned);
                     //var_dump($event->transparency);
                     print '<table class="centpercent cal_event'.(empty($event->transparency)?' cal_event_notbusy':' cal_event_busy').'" style="'.$h;
@@ -1475,10 +1542,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         if ($event->type_code == 'ICALEVENT') print $titletoshow;
                         else
                         {
-                            $savlabel=$event->libelle;
-                            $event->libelle=$titletoshow;
-                            print $event->getNomUrl(0,$maxnbofchar,'cal_event','',0,1);
-                            $event->libelle=$savlabel;
+                        	$savlabel=$event->label?$event->label:$event->libelle;
+                        	$event->label=$titletoshow;
+                        	$event->libelle=$titletoshow;
+                        	print $event->getNomUrl(0,$maxnbofchar,'cal_event','',0,1);
+                        	$event->label=$savlabel;
+                        	$event->libelle=$savlabel;
                         }
 
                         // Loop on each assigned user
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bfd1b75ac91..c0b279be052 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3768,13 +3768,16 @@ table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
 table.cal_event td.cal_event_right { padding: 4px 4px !important; }
-.cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event_busy a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event              { font-size: 1em; }
+.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_busy a:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
 .cal_event_busy      { }
 .cal_peruserviewname { max-width: 140px; height: 22px; }
 
+.calendarviewcontainertr { height: 100px; }
+
 
 /* ============================================================================== */
 /*  Ajax - Liste deroulante de l'autocompletion                                   */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5b4040b0501..5f38ebcd323 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3734,10 +3734,11 @@ table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
 table.cal_event td.cal_event_right { padding: 4px 4px !important; }
-.cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event_busy a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event              { font-size: 1em; }
+.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_busy a:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
 .cal_event_busy      { }
 .cal_peruserviewname { max-width: 140px; height: 22px; }
 

From 7e3b1182570976ac35078bc1b27a46934755261e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 12:03:40 +0100
Subject: [PATCH 334/386] Standardize output

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

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 54da96d7be0..6f938f3d6bd 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -331,13 +331,9 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
-	/*$title=$langs->trans("DoneAndToDoActions");
-	if ($status == 'done') $title=$langs->trans("DoneActions");
-	if ($status == 'todo') $title=$langs->trans("ToDoActions");
-	*/
-	$title=$langs->trans("ListOfEvents");
-
-	$newtitle=$langs->trans($title);
+	// Local calendar
+	$newtitle ='<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+	//$newtitle=$langs->trans($title);
 
 	$tabactive='cardlist';
 

From c1c6720edcf33f0ba1350ca32f29efa0aa51ef42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 12:27:31 +0100
Subject: [PATCH 335/386] Fix look and feel v7

---
 htdocs/admin/taxes.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 5899f1877fa..684577a6d6d 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -43,6 +43,7 @@ $list = array (
 		'ACCOUNTING_VAT_PAY_ACCOUNT'
 );
 
+
 /*
  * Actions
  */
@@ -114,18 +115,20 @@ if ($action == 'update') {
 }
 
 
+
 /*
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("TaxSetup"));
+
 $form=new Form($db);
 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();
+//dol_fiche_head(null, '', '', -1);
 
 if (empty($mysoc->tva_assuj))
 {
@@ -245,7 +248,7 @@ foreach ($list as $key)
 	print '<tr class="oddeven value">';
 
 	// Param
-	$label = $langs->trans($key); 
+	$label = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$label.'</label></td>';
 
 	// Value
@@ -263,7 +266,9 @@ foreach ($list as $key)
 
 print '</table>';
 
-dol_fiche_end();
+
+//dol_fiche_end();
+
 
 print '<div class="center">';
 print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '" name="button">';

From d07cd8c04b09e055dce8da9468ebe6dbaa721ec7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 13:11:18 +0100
Subject: [PATCH 336/386] Update 7.0.0-8.0.0.sql

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

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 74909c7a649..bab5306137c 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
@@ -56,8 +56,8 @@ insert into llx_c_type_container (code,label,module,active) values ('blogpost',
 insert into llx_c_type_container (code,label,module,active) values ('other',    'Other',    'system', 1);
 
 -- For supplier product buy price in multicurency
-ALTER TABLE `llx_product_fournisseur_price` CHANGE `multicurrency_price_ttc` `multicurrency_unitprice` DOUBLE(24,8) NULL DEFAULT NULL;
-ALTER TABLE `llx_product_fournisseur_price_log` CHANGE `multicurrency_price_ttc` `multicurrency_unitprice` DOUBLE(24,8) NULL DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price CHANGE COLUMN multicurrency_price_ttc multicurrency_unitprice DOUBLE(24,8) NULL DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price_log CHANGE COLUMN multicurrency_price_ttc multicurrency_unitprice DOUBLE(24,8) NULL DEFAULT NULL;
 
 ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_expensereport;
 

From 3ebf01e0c61119ec6f53f501f6e6451871da76c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 13:21:07 +0100
Subject: [PATCH 337/386] Update .travis.yml

---
 htdocs/includes/stripe/.travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
index d575ed51a7d..16526d9f853 100644
--- a/htdocs/includes/stripe/.travis.yml
+++ b/htdocs/includes/stripe/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 language: php
 
 php:
+  - 5.3
   - 5.4
   - 5.5
   - 5.6

From 62a339e58256a1f4f8b8fc3fd82db5b1b7e1024e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 14:13:46 +0100
Subject: [PATCH 338/386] Minor fix in multicurrency for supplier prices

---
 .../core/modules/modMultiCurrency.class.php   |  2 +-
 htdocs/product/fournisseurs.php               | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 0dbfe3380cf..7908f203c69 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -59,7 +59,7 @@ class modMultiCurrency 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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Module to enter elements with a foreign currency";
+		$this->description = "Module to manage several foreign currencies in prices and documents";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 462be52b082..a2f79e4c402 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -552,19 +552,22 @@ if ($id > 0 || $ref)
                     // Currency
                     print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
                     print '<td>';
-                    print $form->selectMultiCurrency(GETPOST('multicurrency_code')?GETPOST('multicurrency_code'):(isset($object->fourn_multicurrency_code)?$object->fourn_multicurrency_code:''), "multicurrency_code", 1);
+                    $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>';
 
                     // Currency tx
                     print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
-                    print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.(GETPOST('multicurrency_tx')?GETPOST('multicurrency_tx'):(isset($object->fourn_multicurrency_tx)?$object->fourn_multicurrency_tx:'')).'">';
+                    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>';
-                    print '<td><input class="flat" name="multicurrency_price" size="8" value="'.(GETPOST('multicurrency_price')?GETPOST('multicurrency_price'):(isset($object->fourn_multicurrency_price)?$object->fourn_multicurrency_price:'')).'">';
+                    $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="'.$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>';
@@ -602,7 +605,7 @@ if ($id > 0 || $ref)
             $('input[name="disabled_price"]').prop('disabled', true);
             $('select[name="disabled_price_base_type"]').prop('disabled', true);
             update_price_from_multicurrency();
-            
+
             $('input[name="multicurrency_price"]').keyup(function () {
                 update_price_from_multicurrency();
             }).change(function () {
@@ -610,7 +613,7 @@ if ($id > 0 || $ref)
             }).on('paste', function () {
                 update_price_from_multicurrency();
             });
-            
+
             $('input[name="multicurrency_tx"]').keyup(function () {
                 update_price_from_multicurrency();
             }).change(function () {
@@ -618,12 +621,12 @@ if ($id > 0 || $ref)
             }).on('paste', function () {
                 update_price_from_multicurrency();
             });
-            
+
             $('select[name="multicurrency_price_base_type"]').change(function () {
                 $('input[name="price_base_type"]').val($(this).val());
                 $('select[name="disabled_price_base_type"]').val($(this).val());
             });
-            
+
             var currencies_array = $currencies;
             $('select[name="multicurrency_code"]').change(function () {
                 $('input[name="multicurrency_tx"]').val(currencies_array[$(this).val()]);
@@ -844,7 +847,7 @@ SCRIPT;
 						}
 
 						// Modify-Remove
-						print '<td align="center">';
+						print '<td class="center nowraponall">';
 						if ($user->rights->produit->creer || $user->rights->service->creer)
 						{
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=add_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";

From c1497b065cc79fe067aa3d62edd212e9f60fce14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 14:13:55 +0100
Subject: [PATCH 339/386] CSS

---
 htdocs/compta/facture/list.php  | 12 ++++++------
 htdocs/projet/list.php          | 16 ++++++++--------
 htdocs/theme/eldy/style.css.php |  9 ++++-----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 625336a0fe4..c09621db71c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -702,18 +702,18 @@ if ($resql)
 	if (! empty($arrayfields['f.date']['checked']))
 	{
 		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-		$formother->select_year($year?$year:-1,'year',1, 20, 5, 0, 0, '', 'width75');
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
+		$formother->select_year($year?$year:-1,'year',1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 		print '</td>';
 	}
 	// Date due
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
 		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.dol_escape_htmltag($month_lim).'">';
-		$formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5, 0, 0, '', 'width75');
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_lim" value="'.dol_escape_htmltag($month_lim).'">';
+		$formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 		print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
 		print '</td>';
 	}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6b3613a7b0a..e148caeb328 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -508,19 +508,19 @@ if (! empty($arrayfields['commercial']['checked']))
 // Start date
 if (! empty($arrayfields['p.dateo']['checked']))
 {
-	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.dol_escape_htmltag($search_sday).'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.dol_escape_htmltag($search_smonth).'">';
-	$formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
+	print '<td class="liste_titre center nowraponall">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_sday" value="'.dol_escape_htmltag($search_sday).'">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_smonth" value="'.dol_escape_htmltag($search_smonth).'">';
+	$formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
 }
 // End date
 if (! empty($arrayfields['p.datee']['checked']))
 {
-	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.dol_escape_htmltag($search_eday).'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.dol_escape_htmltag($search_emonth).'">';
-	$formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
+	print '<td class="liste_titre center nowraponall">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_eday" value="'.dol_escape_htmltag($search_eday).'">';
+	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_emonth" value="'.dol_escape_htmltag($search_emonth).'">';
+	$formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
 }
 if (! empty($arrayfields['p.public']['checked']))
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4843ef11013..c7b00629b3b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -295,12 +295,12 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 }
 
 input {
-    line-height: 17px;
-	padding: 6px;
+    line-height: 1.3em;
+	padding: 5px;
 	padding-left: 5px;
 }
 select {
-	padding: 4px;
+	padding: 5px;
 	padding-left: 2px;
 }
 input, select {
@@ -419,7 +419,6 @@ td.actionbuttons a {
 select.flat, form.flat select {
 	font-weight: normal;
 	font-size: unset;
-    height: 2em;
 }
 .optionblue {
 	color: rgb(<?php echo $colortextlink; ?>);
@@ -992,7 +991,7 @@ select.selectarrowonleft option {
 	input, input[type=text], input[type=password], select, textarea     {
 		min-width: 20px;
     	min-height: 1.4em;
-    	line-height: 1.4em;
+    	/* line-height: 1.4em; */
     	/* padding: .4em .1em; */
     	/* border-bottom: 1px solid #BBB; */
     	/* max-width: inherit; why this ? */

From 64b0d1d3904031f6568a319a557cf525a25857e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 14:33:29 +0100
Subject: [PATCH 340/386] Fix by adding a redirect to avoid the order2billing
 being done twice.

---
 htdocs/commande/list.php                |  2 +-
 htdocs/core/actions_massactions.inc.php | 29 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 793fb2cf708..784f44aad4c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -670,7 +670,7 @@ if ($resql)
 	// Status billed
 	if (! empty($arrayfields['c.facture']['checked']))
 	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectyesno('billed', $billed, 1, 0, 1);
 		print '</td>';
 	}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index fae976dec80..5a713168c48 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -686,6 +686,35 @@ if ($massaction == 'confirm_createbills')
 	{
 		$db->commit();
 		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+
+		// Make a redirect to avoid to bill twice if we make a refresh or back
+		$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 ($socid > 0)             $param.='&socid='.urlencode($socid);
+		if ($viewstatut != '')      $param.='&viewstatut='.urlencode($viewstatut);
+		if ($search_orderday)      		$param.='&search_orderday='.urlencode($search_orderday);
+		if ($search_ordermonth)      		$param.='&search_ordermonth='.urlencode($search_ordermonth);
+		if ($search_orderyear)       		$param.='&search_orderyear='.urlencode($search_orderyear);
+		if ($search_deliveryday)   		$param.='&search_deliveryday='.urlencode($search_deliveryday);
+		if ($search_deliverymonth)   		$param.='&search_deliverymonth='.urlencode($search_deliverymonth);
+		if ($search_deliveryyear)    		$param.='&search_deliveryyear='.urlencode($search_deliveryyear);
+		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);
+		if ($search_user > 0) 		$param.='&search_user='.urlencode($search_user);
+		if ($search_sale > 0) 		$param.='&search_sale='.urlencode($search_sale);
+		if ($search_total_ht != '') $param.='&search_total_ht='.urlencode($search_total_ht);
+		if ($search_total_vat != '') $param.='&search_total_vat='.urlencode($search_total_vat);
+		if ($search_total_ttc != '') $param.='&search_total_ttc='.urlencode($search_total_ttc);
+		if ($search_project_ref >= 0)  	$param.="&search_project_ref=".urlencode($search_project_ref);
+		if ($show_files)            $param.='&show_files=' .urlencode($show_files);
+		if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
+		if ($billed != '')			$param.='&billed='.urlencode($billed);
+
+		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
+		exit;
 	}
 	else
 	{

From e242dbad88a2100d3582d07705b00a7cbcdabbf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 14:44:32 +0100
Subject: [PATCH 341/386] Debug stripe

---
 htdocs/langs/en_US/stripe.lang |  3 ++
 htdocs/stripe/admin/stripe.php | 52 ++++++++++++++++------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 2b5823c28fb..23473304bdf 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -35,8 +35,11 @@ NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
 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 payment online payment is done (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)
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 544764b4c11..bc098fb15ac 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -49,26 +49,26 @@ if ($action == 'setvalue' && $user->admin)
 
   $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
   if (! $result > 0) $error++;
-if (empty($conf->stripeconnect->enabled)) {  
+if (empty($conf->stripeconnect->enabled)) {
 	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY",GETPOST('STRIPE_TEST_WEBHOOK_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;  
+	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
  	$result=dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY",GETPOST('STRIPE_LIVE_WEBHOOK_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++; 
-}  
+	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, "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_BANK_ACCOUNT_FOR_BANKTRANSFERS",GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS','int'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;  
+	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, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM','alpha'),'chaine',0,'',$conf->entity);
@@ -180,10 +180,10 @@ print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';  
+print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
+print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
@@ -201,7 +201,7 @@ print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
+print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
@@ -210,19 +210,6 @@ print '<tr class="oddeven"><td>'.$langs->trans("STRIPECONNECT").'</td>';
 print '<td>Ce module est configuré en mode marketplace</td></tr>';
 }
 
-if (! empty($conf->banque->enabled))
-{
-print '<tr class="oddeven"><td>';
-print $langs->trans("BankAccount").'</td><td>';
-print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
-print '</td></tr>';
-  
-print '<tr class="oddeven"><td>';
-print $langs->trans("BankAccount").'</td><td>';
-print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-print '</td></tr>';
-}
-
 print '</table>';
 
 print '<br>';
@@ -245,6 +232,23 @@ if (! empty($conf->banque->enabled))
 	print $langs->trans("BankAccount").'</td><td>';
 	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
+
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
+	{
+		print '<tr class="oddeven"><td>';
+		print $langs->trans("BankAccountForBankTransfer").'</td><td>';
+		print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+		print '</td></tr>';
+	}
+}
+
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
+{
+	// Stock for automatic decrement
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
+	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
+	print '</td></tr>';
 }
 
 print '<tr class="oddeven"><td>';
@@ -277,12 +281,6 @@ print '<input size="32" type="email" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$c
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
 print '</td></tr>';
 
-// stock for automatic decrement
-print '<tr class="oddeven"><td>';
-print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>'; 
-print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
-print '</td></tr>';
-
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';

From 1419eaf15fedb4eda22dafba382cb100d6608c75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 15:05:49 +0100
Subject: [PATCH 342/386] Debug last stripe PR

---
 htdocs/core/lib/company.lib.php               |  15 +-
 htdocs/langs/en_US/banks.lang                 |   1 +
 htdocs/langs/en_US/stripe.lang                |   3 +-
 .../societe/{gateway.php => paymentmodes.php} | 266 ++++++++++--------
 4 files changed, 157 insertions(+), 128 deletions(-)
 rename htdocs/societe/{gateway.php => paymentmodes.php} (83%)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 38b59876494..023729e680d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -175,14 +175,21 @@ function societe_prepare_head(Societe $object)
         $h++;
     }
 
-    // Bank accounrs
+    // Bank accounts
     if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
     {
-        $langs->load("banks");
+    	$langs->load("banks");
+
+        $title = $langs->trans("BankAccounts");
+		if (! empty($conf->stripe->enabled))
+		{
+			$langs->load("stripe");
+			$title = $langs->trans("BankAccountsAndGateways");
+		}
 
         $nbBankAccount=0;
-        $head[$h][0] = DOL_URL_ROOT .'/societe/gateway.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Gateways");
+        $head[$h][0] = DOL_URL_ROOT .'/societe/paymentmodes.php?socid='.$object->id;
+        $head[$h][1] = $title;
         $sql = "SELECT COUNT(n.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
         $sql.= " WHERE fk_soc = ".$object->id;
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 78ac859e706..93fea797c81 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -7,6 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 23473304bdf..9bc202685dd 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -42,4 +42,5 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when payment online payment is done (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)
\ No newline at end of file
+ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways
\ No newline at end of file
diff --git a/htdocs/societe/gateway.php b/htdocs/societe/paymentmodes.php
similarity index 83%
rename from htdocs/societe/gateway.php
rename to htdocs/societe/paymentmodes.php
index 79a9a60bb96..33db57b2ac4 100644
--- a/htdocs/societe/gateway.php
+++ b/htdocs/societe/paymentmodes.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 $langs->load("companies");
 $langs->load("commercial");
@@ -331,25 +331,28 @@ if (empty($reshook))
 	$id = $savid;
 }
 
-$stripeconnect=new StripeConnexion($db);
-$customer=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
-if ($customer->id) {
-$cu = \Stripe\Customer::retrieve("".$customer->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
-$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
-if ($action == 'setasdefault')
+if (class_exists('StripeConnexion'))
 {
-$cu->default_source = "$source"; // obtained with Stripe.js
-$cu->save();
+	$stripeconnect=new StripeConnexion($db);
+	$customerstripe=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
+	if ($customerstripe->id) {
+	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
+	$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
+	if ($action == 'setasdefault')
+	{
+	$cu->default_source = "$source"; // obtained with Stripe.js
+	$cu->save();
 
-header('Location: '.$url);
-exit;
-}
-elseif ($action == 'delete')
-{
-$cu->sources->retrieve("$source")->delete();
+	header('Location: '.$url);
+	exit;
+	}
+	elseif ($action == 'delete')
+	{
+	$cu->sources->retrieve("$source")->delete();
 
-header('Location: '.$url);
-exit;
+	header('Location: '.$url);
+	exit;
+	}
 }
 
 
@@ -403,115 +406,132 @@ if ($socid && $action != 'edit' && $action != "create")
 
 	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-if (! (empty($conf->stripe->enabled))){
-print '<tr><td class="titlefield">';
-print $langs->trans('StripeGateways').'</td><td colspan="3">';
-if ($stripeconnect->GetStripeAccount($conf->entity)) {
-$customer=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
-}
 
-if ($customer->id) {
-$input=$customer->sources->data;
-}
-print '<table class="liste" width="100%">'."\n";
-print '<tr class="liste_titre">';
-print '<td align="left">'.$langs->trans('Type').'</td>';
-print '<td align="left">'.$langs->trans('Informations').'</td>';
-print '<td align="left"></td>';
-print '<td align="center">'.$langs->trans('Default').'</td>';
-print "<td></td></tr>\n";
-    
-foreach ($input as $src) {
-print '<tr>';
-print '<td>';
-if ($src->object=='card'){
-if ($src->brand == 'Visa') {$brand='cc-visa';}
-elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
-elseif ($src->brand == 'American Express') {$brand='cc-amex';}
-elseif ($src->brand == 'Discover') {$brand='cc-discover';}
-elseif ($src->brand == 'JCB') {$brand='cc-jcb';}
-elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
-else {$brand='credit-card';}
-print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
-}
-elseif ($src->object=='source' && $src->type=='card'){
-if ($src->card->brand == 'Visa') {$brand='cc-visa';}
-elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
-elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
-elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
-elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
-elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
-else {$brand='credit-card';}
+	if (! (empty($conf->stripe->enabled)))
+	{
+		print load_fiche_titre($langs->trans('StripeGateways'), '', '');
 
-print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
-}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
-print '<span class="fa fa-university fa-3x fa-fw"></span>';
-}
-print'</td><td valign="middle">';
-if ($src->object=='card'){
-print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
-print '</td><td>';
- if ($src->country)
-	{
-		$img=picto_from_langcode($src->country);
-		print $img?$img.' ':'';
-		print getCountry($src->country,1);
+		if (is_object($stripeconnect) && $stripeconnect->GetStripeAccount($conf->entity))
+		{
+			$customerstripe=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
+		}
+
+		if ($customerstripe->id) {
+			$input=$customerstripe->sources->data;
+		}
+
+		print '<table class="liste" width="100%">'."\n";
+		print '<tr class="liste_titre">';
+		print '<td align="left">'.$langs->trans('Type').'</td>';
+		print '<td align="left">'.$langs->trans('Informations').'</td>';
+		print '<td align="left"></td>';
+		print '<td align="center">'.$langs->trans('Default').'</td>';
+		print "<td></td></tr>\n";
+
+		if (is_array($input))
+		{
+			foreach ($input as $src)
+			{
+				print '<tr>';
+				print '<td>';
+				if ($src->object=='card')
+				{
+					if ($src->brand == 'Visa') {$brand='cc-visa';}
+					elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
+					elseif ($src->brand == 'American Express') {$brand='cc-amex';}
+					elseif ($src->brand == 'Discover') {$brand='cc-discover';}
+					elseif ($src->brand == 'JCB') {$brand='cc-jcb';}
+					elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
+					else {$brand='credit-card';}
+					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+				}
+				elseif ($src->object=='source' && $src->type=='card')
+				{
+					if ($src->card->brand == 'Visa') {$brand='cc-visa';}
+					elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
+					elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
+					elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
+					elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
+					elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
+					else {$brand='credit-card';}
+					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+				}
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
+					print '<span class="fa fa-university fa-3x fa-fw"></span>';
+				}
+
+				print'</td><td valign="middle">';
+				if ($src->object=='card')
+				{
+					print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
+					print '</td><td>';
+					if ($src->country)
+					{
+						$img=picto_from_langcode($src->country);
+						print $img?$img.' ':'';
+						print getCountry($src->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				elseif ($src->object=='source' && $src->type=='card')
+				{
+					print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
+					print '</td><td>';
+
+				 	if ($src->card->country)
+					{
+						$img=picto_from_langcode($src->card->country);
+						print $img?$img.' ':'';
+						print getCountry($src->card->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
+					print 'info sepa';
+					print '</td><td>';
+					if ($src->sepa_debit->country)
+					{
+							$img=picto_from_langcode($src->sepa_debit->country);
+							print $img?$img.' ':'';
+							print getCountry($src->sepa_debit->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				print '</td>';
+				// Default
+				print '<td align="center" width="50">';
+				if (($cu->default_source!=$src->id))
+				{
+				                print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
+				                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
+				                print '</a>';
+				} else {
+				                print "<SPAN class=' fa fa-check-circle  fa-2x'></SPAN>";
+				}
+				print '</td>';
+				print '<td align="center">';
+				if ($user->rights->societe->creer)
+				{
+				//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
+				//            	print img_picto($langs->trans("Modify"),'edit');
+				//            	print '</a>';
+				//           		print '&nbsp;';
+				           		print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=delete">';
+				           		print "<SPAN class='fa fa-trash fa-2x'></SPAN>";
+				           		print '</a>';
+				}
+				print '</td></tr>';
+			}
+		}
+		if (empty($input))
+		{
+			print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
+		}
+		print "</table>";
 	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-elseif ($src->object=='source' && $src->type=='card'){
-print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
-print '</td><td>';
- if ($src->card->country)
-	{
-		$img=picto_from_langcode($src->card->country);
-		print $img?$img.' ':'';
-		print getCountry($src->card->country,1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
-print 'info sepa';
-print '</td><td>';
- if ($src->sepa_debit->country)
-	{
-		$img=picto_from_langcode($src->sepa_debit->country);
-		print $img?$img.' ':'';
-		print getCountry($src->sepa_debit->country,1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-print '</td>';
-            // Default
-            print '<td align="center" width="50">';
-            if (($cu->default_source!=$src->id)) {
-                print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
-                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
-                print '</a>';
-            } else {
-                print "<SPAN class=' fa fa-check-circle  fa-2x'></SPAN>";
-            }
-            print '</td>';
-print '<td align="center">';
-            if ($user->rights->societe->creer)
-            {
-//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
-//            	print img_picto($langs->trans("Modify"),'edit');
-//            	print '</a>';
-//           		print '&nbsp;';
-           		print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=delete">';
-           		print "<SPAN class='fa fa-trash fa-2x'></SPAN>";
-           		print '</a>';
-            }
-print '</td></tr>';
-}
-if (empty($input))
-{
-print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
-}	
-print "</table>";
-}
+
 
 	// List of bank accounts
 

From 05c1150477a6c6084a64d30436d6bb013b62659f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 15:13:22 +0100
Subject: [PATCH 343/386] Fix bad links

---
 htdocs/core/modules/modStripe.class.php | 79 +++++++++++++------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 90a712fdbd8..8a11d6884db 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -106,47 +106,48 @@ class modStripe extends DolibarrModules
 	        'user'=>2
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;
-	    
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=bank',
-		'type'=>'left',
-		'titre'=>'StripeAccount',
-		'mainmenu'=>'bank',
-		'leftmenu'=>'stripe',
-		'url' => '/stripe/charge.php',
-		'langs' => 'stripe',
-		'position' => 100,
-		'enabled' => '1',
-		'perms' => '$user->rights->banque->configurer',
-		'target' => '',
-		'user' => 0
+
+        $this->menu[$r] = array(
+        	'fk_menu'=>'fk_mainmenu=bank',
+			'type'=>'left',
+			'titre'=>'StripeAccount',
+			'mainmenu'=>'bank',
+			'leftmenu'=>'stripe',
+			'url' => '/stripe/charge.php',
+			'langs' => 'stripe',
+			'position' => 100,
+			'enabled' => '$conf->global->MAIN_FEATURES_LEVEL >= 2',
+			'perms' => '$user->rights->banque->configurer',
+			'target' => '',
+			'user' => 0
 		);
-    
-        $r ++;
-	$this->menu[$r] = array(
-		'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
-		'type' => 'left',
-		'titre' => 'StripeChargeList',
-		'url' => '/stripe/charge.php',
-		'langs' => 'stripe',
-		'position' => 102,
-		'enabled' => '$conf->stripe->enabled && $conf->banque->enabled',
-		'perms' => '$user->rights->banque->configurer',
-		'target' => '',
-		'user' => 0
-		);
-    
-        $r ++;
+
+        $r++;
 		$this->menu[$r] = array(
-		'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
-		'type' => 'left',
-		'titre' => 'StripeTransactionList',
-		'url' => '/stripe/transaction.php',
-		'langs' => 'stripe',
-		'position' => 102,
-		'enabled' => '$conf->stripe->enabled && $conf->banque->enabled',
-		'perms' => '$user->rights->banque->configurer',
-		'target' => '',
-		'user' => 0
+			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
+			'type' => 'left',
+			'titre' => 'StripeChargeList',
+			'url' => '/stripe/charge.php',
+			'langs' => 'stripe',
+			'position' => 102,
+			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',
+			'perms' => '$user->rights->banque->configurer',
+			'target' => '',
+			'user' => 0
+		);
+
+        $r++;
+		$this->menu[$r] = array(
+			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
+			'type' => 'left',
+			'titre' => 'StripeTransactionList',
+			'url' => '/stripe/transaction.php',
+			'langs' => 'stripe',
+			'position' => 102,
+			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',
+			'perms' => '$user->rights->banque->configurer',
+			'target' => '',
+			'user' => 0
 		);
 
         // Exports

From 94140b04ca2b51dd16d2ef9c8eaa06e343b16a70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 15:28:50 +0100
Subject: [PATCH 344/386] FIX Missing primary key on payment modes

---
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql     | 4 ++++
 htdocs/install/mysql/tables/llx_c_paiement.key.sql | 2 ++
 htdocs/install/mysql/tables/llx_c_paiement.sql     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

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 73e1ec4cab9..76695e9edfe 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
@@ -70,3 +70,7 @@ ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_exp
 
 ALTER TABLE llx_website_page ADD COLUMN aliasalt varchar(255) after pageurl;
 
+-- Add missing primary key
+ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;
+
+
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.key.sql b/htdocs/install/mysql/tables/llx_c_paiement.key.sql
index ad1930fba2e..1e22789d7bf 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.key.sql
@@ -18,3 +18,5 @@
 -- ========================================================================
 
 ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement(id, entity, code);
+
+ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 55cb44fb257..1c26cb7aaeb 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -21,7 +21,7 @@
 
 create table llx_c_paiement
 (
-  id					integer,
+  id					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer	DEFAULT 1 NOT NULL,	-- multi company id
   code       		varchar(6)  NOT NULL,
   libelle    		varchar(62),

From 39749a0a2ce890022277b725b46b2fa9eba9e3af Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Wed, 7 Mar 2018 16:13:49 +0100
Subject: [PATCH 345/386] NEW function and update comment

---
 htdocs/stripe/admin/stripe.php | 61 +++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 544764b4c11..7a418a695dc 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -49,26 +49,26 @@ if ($action == 'setvalue' && $user->admin)
 
   $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
   if (! $result > 0) $error++;
-if (empty($conf->stripeconnect->enabled)) {  
+if (empty($conf->stripeconnect->enabled)) {
 	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY",GETPOST('STRIPE_TEST_WEBHOOK_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;  
+	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
  	$result=dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY",GETPOST('STRIPE_LIVE_WEBHOOK_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++; 
-}  
+	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, "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_BANK_ACCOUNT_FOR_BANKTRANSFERS",GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS','int'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;  
+	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, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM','alpha'),'chaine',0,'',$conf->entity);
@@ -114,7 +114,7 @@ if ($action=="setlive")
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
-
+//TODO: import script for stripe account saving in alone or connect mode for stripe.class.php
 
 /*
  *	View
@@ -180,10 +180,10 @@ print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';  
+print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
+print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
@@ -201,32 +201,36 @@ print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
+print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 } else {
-print '<tr class="oddeven"><td>'.$langs->trans("STRIPECONNECT").'</td>';
-print '<td>Ce module est configuré en mode marketplace</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
+print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
 }
 
-if (! empty($conf->banque->enabled))
+if (! empty($conf->banque->enabled))  //deplace here for separate stripe setting of general and common online payment settings
 {
-print '<tr class="oddeven"><td>';
-print $langs->trans("BankAccount").'</td><td>';
-print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
-print '</td></tr>';
-  
-print '<tr class="oddeven"><td>';
-print $langs->trans("BankAccount").'</td><td>';
-print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-print '</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccount").'</td><td>';
+	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '</td></tr>';
+
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// real bank account : automatic banktransfert with stripe webhook from stripe account (receiving funds, payment, debit fee/application fee, payment dispute) to real bank account
+	{
+		print '<tr class="oddeven"><td>';
+		print $langs->trans("BankAccountForBankTransfer").'</td><td>';
+		print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+		print '</td></tr>';
+	}
 }
 
 print '</table>';
 
 print '<br>';
 
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
@@ -239,11 +243,12 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-if (! empty($conf->banque->enabled))
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// autodecrement selected web stock when generate invoice or paid an order->generate linked invoice as in a POS module for a full automatic functionality (useful when there is a lot of payment)
 {
+	// Stock for automatic decrement
 	print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
+	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
 	print '</td></tr>';
 }
 
@@ -275,13 +280,7 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
-print '</td></tr>';
-
-// stock for automatic decrement
-print '<tr class="oddeven"><td>';
-print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>'; 
-print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
-print '</td></tr>';
+print '</td></tr>'; 
 
 // Payment token for URL
 print '<tr class="oddeven"><td>';

From d791b014a5089833400f2c3eb2da390a6064ca03 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Wed, 7 Mar 2018 16:17:25 +0100
Subject: [PATCH 346/386] update comment and class

---
 htdocs/societe/paymentmodes.php | 1006 +++++++++++++++++++++++++++++++
 1 file changed, 1006 insertions(+)
 create mode 100644 htdocs/societe/paymentmodes.php

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
new file mode 100644
index 00000000000..7f969f64e56
--- /dev/null
+++ b/htdocs/societe/paymentmodes.php
@@ -0,0 +1,1006 @@
+<?php
+/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
+ * Copyright (C) 2015-2016 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2018      ptibogxiv        <support@ptibogxiv.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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/societe/rib.php
+ *      \ingroup    societe
+ *		\brief      BAN tab for companies
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+
+$langs->load("companies");
+$langs->load("commercial");
+$langs->load("banks");
+$langs->load("bills");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe','','');
+
+$id=GETPOST("id","int");
+$source=GETPOST("source","alpha");
+$ribid=GETPOST("ribid","int");
+$action=GETPOST("action", 'alpha', 3);
+
+$object = new Societe($db);
+$object->fetch($socid);
+
+$account = new CompanyBankAccount($db);
+$prelevement = new BonPrelevement($db);
+
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$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('thirdpartybancard','globalcard'));
+
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('thirdpartybancard'));
+
+
+
+/*
+ *	Actions
+ */
+
+$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$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 ($cancel)
+	{
+		$action='';
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
+
+
+	if ($action == 'update' && ! $_POST["cancel"])
+	{
+		// Modification
+		if (! GETPOST('label'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$action='edit';
+			$error++;
+		}
+		if (! GETPOST('bank'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			$action='edit';
+			$error++;
+		}
+		if ($account->needIBAN() == 1)
+		{
+			if (! GETPOST('iban'))
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+				$action='edit';
+				$error++;
+			}
+			if (! GETPOST('bic'))
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+				$action='edit';
+				$error++;
+			}
+		}
+
+		$account->fetch($id);
+		if (! $error)
+		{
+			$account->socid           = $object->id;
+
+			$account->bank            = GETPOST('bank','alpha');
+			$account->label           = GETPOST('label','alpha');
+			$account->courant         = GETPOST('courant','alpha');
+			$account->clos            = GETPOST('clos','alpha');
+			$account->code_banque     = GETPOST('code_banque','alpha');
+			$account->code_guichet    = GETPOST('code_guichet','alpha');
+			$account->number          = GETPOST('number','alpha');
+			$account->cle_rib         = GETPOST('cle_rib','alpha');
+			$account->bic             = GETPOST('bic','alpha');
+			$account->iban            = GETPOST('iban','alpha');
+			$account->domiciliation   = GETPOST('domiciliation','alpha');
+			$account->proprio         = GETPOST('proprio','alpha');
+			$account->owner_address   = GETPOST('owner_address','alpha');
+			$account->frstrecur       = GETPOST('frstrecur','alpha');
+			$account->rum             = GETPOST('rum','alpha');
+			if (empty($account->rum))
+			{
+				$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+				$account->date_rum = dol_now();
+			}
+
+			$result = $account->update($user);
+			if (! $result)
+			{
+				setEventMessages($account->error, $account->errors, 'errors');
+			}
+			else
+			{
+				// If this account is the default bank account, we disable others
+				if ($account->default_rib)
+				{
+					$account->setAsDefault($id);	// This will make sure there is only one default rib
+				}
+
+				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+		}
+	}
+
+	if ($action == 'add' && ! $_POST["cancel"])
+	{
+		$error=0;
+
+		if (! GETPOST('label'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$action='create';
+			$error++;
+		}
+		if (! GETPOST('bank'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			$action='create';
+			$error++;
+		}
+
+		if (! $error)
+		{
+			// Ajout
+			$account = new CompanyBankAccount($db);
+
+			$account->socid           = $object->id;
+
+			$account->bank            = GETPOST('bank','alpha');
+			$account->label           = GETPOST('label','alpha');
+			$account->courant         = GETPOST('courant','alpha');
+			$account->clos            = GETPOST('clos','alpha');
+			$account->code_banque     = GETPOST('code_banque','alpha');
+			$account->code_guichet    = GETPOST('code_guichet','alpha');
+			$account->number          = GETPOST('number','alpha');
+			$account->cle_rib         = GETPOST('cle_rib','alpha');
+			$account->bic             = GETPOST('bic','alpha');
+			$account->iban            = GETPOST('iban','alpha');
+			$account->domiciliation   = GETPOST('domiciliation','alpha');
+			$account->proprio         = GETPOST('proprio','alpha');
+			$account->owner_address   = GETPOST('owner_address','alpha');
+			$account->frstrecur       = GETPOST('frstrecur');
+			$account->rum             = GETPOST('rum','alpha');
+			$account->datec			  = dol_now();
+
+			$db->begin();
+
+			// This test can be done only once properties were set
+			if ($account->needIBAN() == 1)
+			{
+				if (! GETPOST('iban'))
+				{
+					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+					$action='create';
+					$error++;
+				}
+				if (! GETPOST('bic'))
+				{
+					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+					$action='create';
+					$error++;
+				}
+			}
+
+			if (! $error)
+			{
+				$result = $account->create($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($account->error, $account->errors, 'errors');
+					$action='create';     // Force chargement page création
+				}
+
+				if (empty($account->rum))
+				{
+					$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+					$account->date_rum = dol_now();
+				}
+			}
+
+			if (! $error)
+			{
+				$result = $account->update($user);	// This will set the UMR number.
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($account->error, $account->errors, 'errors');
+					$action='create';
+				}
+			}
+
+			if (! $error)
+			{
+				$db->commit();
+
+				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+			else
+			{
+				$db->rollback();
+			}
+		}
+	}
+
+	if ($action == 'setasdefault')
+	{
+		$account = new CompanyBankAccount($db);
+		$res = $account->setAsDefault(GETPOST('ribid','int'));
+		if ($res)
+		{
+			$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
+			header('Location: '.$url);
+			exit;
+		}
+		else
+		{
+			setEventMessages($db->lasterror, null, 'errors');
+		}
+	}
+
+	if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
+	{
+		$account = new CompanyBankAccount($db);
+		if ($account->fetch($ribid?$ribid:$id))
+		{
+			$result = $account->delete($user);
+			if ($result > 0)
+			{
+				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+				header('Location: '.$url);
+				exit;
+			}
+			else
+			{
+				setEventMessages($account->error, $account->errors, 'errors');
+			}
+		}
+		else
+		{
+			setEventMessages($account->error, $account->errors, 'errors');
+		}
+	}
+
+	$savid=$id;
+
+	// Actions to build doc
+	if ($action == 'builddocrib')
+	{
+		$action = 'builddoc';
+		$moreparams = array(
+			'use_companybankid'=>GETPOST('companybankid'),
+			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
+		);
+		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
+		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
+	}
+	$id = $socid;
+	$upload_dir = $conf->societe->multidir_output[$object->entity];
+	$permissioncreate=$user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	$id = $savid;
+}
+
+if (class_exists('Stripe'))
+{
+	$stripe=new Stripe($db);
+	$customerstripe=$stripe->CustomerStripe($socid,$stripe->GetStripeAccount($conf->entity));
+	if ($customerstripe->id) {
+	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."",array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));}
+	$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+	if ($action == 'setasdefault')
+	{
+	$cu->default_source = "$source"; // obtained with Stripe.js
+	$cu->save();
+
+	header('Location: '.$url);
+	exit;
+	}
+	elseif ($action == 'delete')
+	{
+	$cu->sources->retrieve("$source")->delete();
+
+	header('Location: '.$url);
+	exit;
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader();
+
+$head=societe_prepare_head($object);
+if (! $id)
+{
+	$account->fetch(0,$object->id);
+}
+else
+{
+	$account->fetch($id);
+}
+if (empty($account->socid)) $account->socid=$object->id;
+
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
+}
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+}
+
+
+// View
+if ($socid && $action != 'edit' && $action != "create")
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
+
+	// Confirm delete third party
+	if ($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
+	}
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+
+	if (! (empty($conf->stripe->enabled)))
+	{
+		print load_fiche_titre($langs->trans('StripeGateways'), '', '');
+
+		if (is_object($stripe) && $stripe->GetStripeAccount($conf->entity))
+		{
+			$customerstripe=$stripe->CustomerStripe($object->id,$stripe->GetStripeAccount($conf->entity));
+		}
+
+		if ($customerstripe->id) {
+			$input=$customerstripe->sources->data;
+		}
+
+		print '<table class="liste" width="100%">'."\n";
+		print '<tr class="liste_titre">';
+		print '<td align="left">'.$langs->trans('Type').'</td>';
+		print '<td align="left">'.$langs->trans('Informations').'</td>';
+		print '<td align="left"></td>';
+		print '<td align="center">'.$langs->trans('Default').'</td>';
+		print "<td></td></tr>\n";
+
+		if (is_array($input))
+		{
+			foreach ($input as $src)
+			{
+				print '<tr>';
+				print '<td>';
+				if ($src->object=='card')
+				{
+					if ($src->brand == 'Visa') {$brand='cc-visa';}
+					elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
+					elseif ($src->brand == 'American Express') {$brand='cc-amex';}
+					elseif ($src->brand == 'Discover') {$brand='cc-discover';}
+					elseif ($src->brand == 'JCB') {$brand='cc-jcb';}
+					elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
+					else {$brand='credit-card';}
+					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+				}
+				elseif ($src->object=='source' && $src->type=='card')
+				{
+					if ($src->card->brand == 'Visa') {$brand='cc-visa';}
+					elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
+					elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
+					elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
+					elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
+					elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
+					else {$brand='credit-card';}
+					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
+				}
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
+					print '<span class="fa fa-university fa-3x fa-fw"></span>';
+				}
+
+				print'</td><td valign="middle">';
+				if ($src->object=='card')
+				{
+					print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
+					print '</td><td>';
+					if ($src->country)
+					{
+						$img=picto_from_langcode($src->country);
+						print $img?$img.' ':'';
+						print getCountry($src->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				elseif ($src->object=='source' && $src->type=='card')
+				{
+					print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
+					print '</td><td>';
+
+				 	if ($src->card->country)
+					{
+						$img=picto_from_langcode($src->card->country);
+						print $img?$img.' ':'';
+						print getCountry($src->card->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
+					print 'info sepa';
+					print '</td><td>';
+					if ($src->sepa_debit->country)
+					{
+							$img=picto_from_langcode($src->sepa_debit->country);
+							print $img?$img.' ':'';
+							print getCountry($src->sepa_debit->country,1);
+					}
+					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				}
+				print '</td>';
+				// Default
+				print '<td align="center" width="50">';
+				if (($cu->default_source!=$src->id))
+				{
+				                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
+				                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
+				                print '</a>';
+				} else {
+				                print "<SPAN class=' fa fa-check-circle  fa-2x'></SPAN>";
+				}
+				print '</td>';
+				print '<td align="center">';
+				if ($user->rights->societe->creer)
+				{
+				//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
+				//            	print img_picto($langs->trans("Modify"),'edit');
+				//            	print '</a>';
+				//           		print '&nbsp;';
+				           		print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=delete">';
+				           		print "<SPAN class='fa fa-trash fa-2x'></SPAN>";
+				           		print '</a>';
+				}
+				print '</td></tr>';
+			}
+		}
+		if (empty($input))
+		{
+			print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
+		}
+		print "</table>";
+	}
+
+
+	// List of bank accounts
+
+	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+
+	print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
+
+	$rib_list = $object->get_all_rib();
+	$var = false;
+	if (is_array($rib_list))
+	{
+		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" width="100%">';
+
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("LabelRIB");
+		print_liste_field_titre("Bank");
+		print_liste_field_titre("RIB");
+		print_liste_field_titre("IBAN");
+		print_liste_field_titre("BIC");
+		if (! empty($conf->prelevement->enabled))
+		{
+			print print_liste_field_titre("RUM");
+			print print_liste_field_titre("WithdrawMode");
+		}
+		print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
+		print_liste_field_titre('', '', '', '', '', 'align="center"');
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print "</tr>\n";
+
+		foreach ($rib_list as $rib)
+		{
+			print '<tr class="oddeven">';
+			// Label
+			print '<td>'.$rib->label.'</td>';
+			// Bank name
+			print '<td>'.$rib->bank.'</td>';
+			// Account number
+			print '<td>';
+			$string='';
+			foreach ($rib->getFieldsToShow() as $val) {
+
+				if ($val == 'BankCode') {
+					$string .= $rib->code_banque.' ';
+				} elseif ($val == 'BankAccountNumber') {
+					$string .= $rib->number.' ';
+				} elseif ($val == 'DeskCode') {
+					$string .= $rib->code_guichet.' ';
+				} elseif ($val == 'BankAccountNumberKey') {
+					$string .= $rib->cle_rib.' ';
+				/* Already output after
+                }elseif ($val == 'BIC') {
+                    $string .= $rib->bic.' ';
+                }elseif ($val == 'IBAN') {
+                    $string .= $rib->iban.' ';*/
+				}
+			}
+			if (! empty($rib->label) && $rib->number) {
+				if (! checkBanForAccount($rib)) {
+					$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
+				} else {
+					$string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
+				}
+			}
+
+			print $string;
+			print '</td>';
+			// IBAN
+			print '<td>'.$rib->iban;
+   			if (! empty($rib->iban)) {
+				if (! checkIbanForAccount($rib)) {
+					print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
+				} else {
+					print ' '.img_picto($langs->trans("IbanValid"),'info');
+				}
+			}
+			print '</td>';
+			// BIC
+			print '<td>'.$rib->bic;
+			if (! empty($rib->bic)) {
+				if (! checkSwiftForAccount($rib)) {
+					print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
+				} else {
+					print ' '.img_picto($langs->trans("SwiftValid"),'info');
+				}
+			}
+			print '</td>';
+
+			if (! empty($conf->prelevement->enabled))
+			{
+				// RUM
+				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
+				print '<td>'.$rib->rum.'</td>';
+
+				// FRSTRECUR
+				print '<td>'.$rib->frstrecur.'</td>';
+			}
+
+			// Default
+			print '<td align="center" width="70">';
+			if (!$rib->default_rib) {
+				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasdefault">';
+				print img_picto($langs->trans("Disabled"),'off');
+				print '</a>';
+			} else {
+				print img_picto($langs->trans("Enabled"),'on');
+			}
+			print '</td>';
+
+			// Generate doc
+			print '<td align="center">';
+
+			$buttonlabel = $langs->trans("BuildDoc");
+			$forname='builddocrib'.$rib->id;
+
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+			$modellist=ModeleBankAccountDoc::liste_modeles($db);
+
+			$out = '';
+			if (is_array($modellist) && count($modellist))
+			{
+				$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+				$out.= '<input type="hidden" name="action" value="builddocrib">';
+				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
+				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
+
+				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				{
+					$arraykeys=array_keys($modellist);
+					$modelselected=$arraykeys[0];
+				}
+				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
+
+				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out.= ajax_combobox('modelrib'.$rib->id);
+
+				// Language code (if multilang)
+				if ($conf->global->MAIN_MULTILANGS)
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+					$formadmin=new FormAdmin($db);
+					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+					$morecss='maxwidth150';
+					if (! empty($conf->browser->phone)) $morecss='maxwidth100';
+					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
+				}
+				// Button
+				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+				$genbutton.= '>';
+				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+				{
+					$langs->load("errors");
+					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+				}
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+				$out.= $genbutton;
+				$out.= '</form>';
+			}
+			print $out;
+			print '</td>';
+
+			// Edit/Delete
+			print '<td align="right">';
+			if ($user->rights->societe->creer)
+			{
+				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
+				print img_picto($langs->trans("Modify"),'edit');
+				print '</a>';
+
+		   		print '&nbsp;';
+
+		   		print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
+		   		print img_picto($langs->trans("Delete"),'delete');
+		   		print '</a>';
+			}
+			print '</td>';
+
+			print '</tr>';
+		}
+
+		if (count($rib_list) == 0)
+		{
+			$colspan=8;
+			if (! empty($conf->prelevement->enabled)) $colspan+=2;
+			print '<tr '.$bc[0].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
+		}
+
+		print '</table>';
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
+
+	dol_fiche_end();
+/*
+	if ($socid && $action != 'edit' && $action != 'create')
+	{
+		// Barre d'actions
+		print '<div class="tabsAction">';
+
+		if ($user->rights->societe->creer)
+		{
+			print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+		}
+
+		print '</div>';
+	}
+*/
+	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+	{
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		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;
+
+		$var=true;
+
+		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+		print '</div></div></div>';
+
+		print '<br>';
+	}
+	/*
+    include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+    $modellist=ModeleBankAccountDoc::liste_modeles($db);
+    //print '<td>';
+    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+    {
+        $arraykeys=array_keys($modellist);
+        $modelselected=$arraykeys[0];
+    }
+    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+    $out.= ajax_combobox('model');
+    //print $out;
+    $buttonlabel=$langs->trans("Generate");
+    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+    $genbutton.= '>';
+    print $genbutton;
+    //print '</td>';     // TODO Add link to generate doc
+    */
+}
+
+// Edit
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td><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>';
+
+	// Show fields of bank account
+	foreach ($account->getFieldsToShow(1) as $val) {
+
+		$require=false;
+		if ($val == 'BankCode') {
+			$name = 'code_banque';
+			$size = 8;
+			$content = $account->code_banque;
+		} elseif ($val == 'DeskCode') {
+			$name = 'code_guichet';
+			$size = 8;
+			$content = $account->code_guichet;
+		} elseif ($val == 'BankAccountNumber') {
+			$name = 'number';
+			$size = 18;
+			$content = $account->number;
+		} elseif ($val == 'BankAccountNumberKey') {
+			$name = 'cle_rib';
+			$size = 3;
+			$content = $account->cle_rib;
+		} elseif ($val == 'IBAN') {
+			$name = 'iban';
+			$size = 30;
+			$content = $account->iban;
+			if ($account->needIBAN()) $require=true;
+		} elseif ($val == 'BIC') {
+			$name = 'bic';
+			$size = 12;
+			$content = $account->bic;
+			if ($account->needIBAN()) $require=true;
+		}
+
+		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
+		print '</tr>';
+	}
+
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
+	print $account->domiciliation;
+	print "</textarea></td></tr>";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+	print "</td></tr>\n";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+	print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+	print $account->owner_address;
+	print "</textarea></td></tr>";
+
+	print '</table>';
+
+	if ($conf->prelevement->enabled)
+	{
+		print '<br>';
+
+		print '<table class="border" width="100%">';
+
+		if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+
+		// RUM
+		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
+		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
+
+		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
+		print '</td></tr>';
+
+		print '</table>';
+	}
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	print '<div align="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>';
+}
+
+
+// Create
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+	print '<div class="nofichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
+	print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
+
+	// Show fields of bank account
+	foreach ($account->getFieldsToShow(1) as $val) {
+
+		$require=false;
+		if ($val == 'BankCode') {
+			$name = 'code_banque';
+			$size = 8;
+		} elseif ($val == 'DeskCode') {
+			$name = 'code_guichet';
+			$size = 8;
+		} elseif ($val == 'BankAccountNumber') {
+			$name = 'number';
+			$size = 18;
+		} elseif ($val == 'BankAccountNumberKey') {
+			$name = 'cle_rib';
+			$size = 3;
+		} elseif ($val == 'IBAN') {
+			$name = 'iban';
+			$size = 30;
+			if ($account->needIBAN()) $require=true;
+		} elseif ($val == 'BIC') {
+			$name = 'bic';
+			$size = 12;
+			if ($account->needIBAN()) $require=true;
+		}
+
+		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
+		print '</tr>';
+	}
+
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+	print GETPOST('domiciliation');
+	print "</textarea></td></tr>";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
+	print "</td></tr>\n";
+
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+	print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+	print GETPOST('owner_address');
+	print "</textarea></td></tr>";
+
+	print '</table>';
+
+	if ($conf->prelevement->enabled)
+	{
+		print '<br>';
+
+		print '<table class="border" width="100%">';
+
+		// RUM
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
+		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+
+		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+		print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
+		print '</td></tr>';
+
+		print '</table>';
+	}
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	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 '</div>';
+}
+
+if ($socid && $action == 'edit' && $user->rights->societe->creer)
+{
+	print '</form>';
+}
+if ($socid && $action == 'create' && $user->rights->societe->creer)
+{
+	print '</form>';
+}
+
+
+llxFooter();
+
+$db->close();

From 6761a59acdc1fa040f2d17335df9156128bff5ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 17:22:38 +0100
Subject: [PATCH 347/386] Intorduce dolDecodeBlockedData

---
 htdocs/blockedlog/admin/blockedlog_list.php  |  2 +-
 htdocs/blockedlog/ajax/block-info.php        |  6 +++
 htdocs/blockedlog/class/blockedlog.class.php | 41 +++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 9410ef9be5e..e8b2dc8b73b 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -196,7 +196,7 @@ else if (GETPOST('downloadcsv','alpha'))
 				$block_static->user_fullname = $obj->user_fullname;
 				$block_static->fk_user = $obj->fk_user;
 				$block_static->signature = $obj->signature;
-				$block_static->object_data = unserialize($obj->object_data);
+				$block_static->object_data = $block_static->dolDecodeBlockedData($obj->object_data);
 
 				$checksignature = $block_static->checkSignature($previoushash);	// If $previoushash is not defined, checkSignature will search it
 
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index a092b13ca99..d4d4eef4e07 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -85,10 +85,16 @@ function formatObject($objtoshow, $prefix)
 		{
 			if (! is_object($val) && ! is_array($val))
 			{
+				// TODO $val can be '__PHP_Incomplete_Class', the is_object return false
 				$s.='<tr><td>'.($prefix?$prefix.' > ':'').$key.'</td>';
 				$s.='<td>';
 				if (in_array($key, array('date','datef','dateh','datec','datem','datep')))
 				{
+					/*var_dump(is_object($val));
+					var_dump(is_array($val));
+					var_dump(is_array($val));
+					var_dump(@get_class($val));
+					var_dump($val);*/
 					$s.=dol_print_date($val, 'dayhour');
 				}
 				else
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 1bddb23de1d..8b7a3c150cc 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -18,10 +18,23 @@
  * 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
  */
-
 class BlockedLog
 {
 	/**
@@ -636,7 +649,7 @@ class BlockedLog
 				$this->fk_user 			= $obj->fk_user;
 				$this->user_fullname	= $obj->user_fullname;
 
-				$this->object_data		= unserialize($obj->object_data);
+				$this->object_data		= $this->dolDecodeBlockedData($obj->object_data);
 
 				$this->signature		= $obj->signature;
 				$this->signature_line	= $obj->signature_line;
@@ -658,6 +671,30 @@ class BlockedLog
 
 	}
 
+
+	/**
+	 * Decode data
+	 *
+	 * @param	string	$mode	0=unserialize, 1=json_decode
+	 * @return string			Value unserialized
+	 */
+	public function dolDecodeBlockedData($data, $mode=0)
+	{
+		try
+		{
+			//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$aaa = unserialize($data);
+			//$aaa = unserialize($data);
+		}
+		catch(Exception $e)
+		{
+			//print $e->getErrs);
+		}
+		return $aaa;
+	}
+
+
 	/**
 	 *	Set block certified by authority
 	 *

From 1ba6de7ec7b5cda981578ee26ed1d4d5ad157a8f Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Wed, 7 Mar 2018 17:26:49 +0100
Subject: [PATCH 348/386] FIX call stripe.class.php

---
 htdocs/stripe/charge | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge
index 28b990fe811..aaa0b0475f8 100644
--- a/htdocs/stripe/charge
+++ b/htdocs/stripe/charge
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.net>
+/* Copyright (C) 2018 	PtibogXIV        <support@ptibogxiv.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
@@ -53,7 +53,7 @@ llxHeader('', $langs->trans("StripeChargeList"));
 $form = new Form($db);
 $societestatic = new societe($db);
 $acc = new Account($db);
-$stripeconnect=new StripeConnexion($db);
+$stripe=new Stripe($db);
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
@@ -86,7 +86,7 @@ if (!$rowid){
 
 	print "</TR>\n";
   
-$list=\Stripe\Charge::all(array("limit" => $limit),array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+$list=\Stripe\Charge::all(array("limit" => $limit),array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
 //print $list;
 foreach ($list->data as $charge) {
     print '<TR class="oddeven">';
@@ -131,7 +131,10 @@ $label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
     print "</TD>\n";
     // Type
     print '<TD>';
-if ($charge->source->type=='card'){
+if ($charge->source->object=='card'){
+    print $langs->trans("card");
+}   
+elseif ($charge->source->type=='card'){
     print $langs->trans("card");
 } elseif ($charge->source->type=='three_d_secure'){
     print $langs->trans("card3DS");

From 7edec37b286b4c10050a34ff2e2fc16acb7817e0 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Wed, 7 Mar 2018 17:27:45 +0100
Subject: [PATCH 349/386] FIx call stripe.class.php

---
 htdocs/stripe/transaction.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index b350154bee9..2a37b5a55a5 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.net>
+/* Copyright (C) 2018 	PtibogXIV        <support@ptibogxiv.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
@@ -53,7 +53,7 @@ llxHeader('', $langs->trans("StripeTransactionList"));
 $form = new Form($db);
 $societestatic = new societe($db);
 $acc = new Account($db);
-$stripeconnect=new StripeConnexion($db);
+$stripe=new Stripe($db);
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
@@ -87,7 +87,7 @@ if (!$rowid){
 
 	print "</TR>\n";      
     
-$txn=\Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+$txn=\Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
 foreach ($txn->data as $txn) {
     print '<TR class="oddeven">';
     $societestatic->fetch($charge->metadata->idcustomer);
@@ -119,16 +119,7 @@ $object->fetch($txn->metadata->idsource);
     print '<TD align="center">'.dol_print_date($txn->created,'%d/%m/%Y %H:%M')."</TD>\n";
     // Label payment
     print "<TD>";
-if ($charge->refunded=='1'){
-    print $langs->trans("refunded");
-} elseif ($charge->paid=='1'){
-    print $langs->trans("".$charge->status."");
-} else {
-$label="Message: ".$charge->failure_message."<BR>";
-$label.="Réseau: ".$charge->outcome->network_status."<BR>";
-$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
-   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
-}
+
     print "</TD>\n";
     // Type
     print '<TD>'.$txn->type.'</TD>';

From 78cbd92e988b632b9609002e1eb38eea3a0d4309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 18:30:39 +0100
Subject: [PATCH 350/386] Fix init data on table of payment mode

---
 htdocs/install/mysql/data/llx_c_paiement.sql   | 18 ++++++++----------
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql |  4 +++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql
index b192dd3c8b0..49da0b37952 100644
--- a/htdocs/install/mysql/data/llx_c_paiement.sql
+++ b/htdocs/install/mysql/data/llx_c_paiement.sql
@@ -30,16 +30,14 @@
 -- Types paiement
 --
 
-delete from llx_c_paiement;
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 0, '',    '-',                 3,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 1, 'TIP', 'TIP',               2,0);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 2, 'VIR', 'Virement',          2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 3, 'PRE', 'Prélèvement',       2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 4, 'LIQ', 'Espèces',           2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 6, 'CB',  'Carte Bancaire',    2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 7, 'CHQ', 'Chèque',            2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values (50, 'VAD', 'Paiement en ligne', 2,0);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 1, '', '-',                    2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 2, 'VIR', 'Transfer',          2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 3, 'PRE', 'Debit order',       2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 4, 'LIQ', 'Cash',              2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 6, 'CB',  'Credit card',       2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 7, 'CHQ', 'Cheque',            2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 8, 'TIP', 'TIP',               2,0);
+insert into llx_c_paiement (id,code,libelle,type,active) values (50, 'VAD', 'Online payment',    2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (51, 'TRA', 'Traite',            2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (52, 'LCR', 'LCR',               2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (53, 'FAC', 'Factor',            2,0);
---insert into llx_c_paiement (id,code,libelle,type,active) values (54, 'PRO', 'Proforma',          2,0);
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 76695e9edfe..4b224477940 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
@@ -70,7 +70,9 @@ ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_exp
 
 ALTER TABLE llx_website_page ADD COLUMN aliasalt varchar(255) after pageurl;
 
--- Add missing primary key
+-- Add missing keys and primary key
+ALTER TABLE llx_c_paiement DROP INDEX uk_c_paiement;
+ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
 ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;
 
 

From 3287c03e67987e1479c03115fe46e4bafb839822 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 18:32:25 +0100
Subject: [PATCH 351/386] Fix data on thirdparty tooltip

---
 htdocs/compta/paiement/card.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 6179fb9ac22..3a6727b4299 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -338,15 +338,18 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			print '<tr class="oddeven">';
+			$thirdpartystatic->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');
+
+			print '<tr class="oddeven">';
 
             // Invoice
 			print '<td>';
@@ -355,8 +358,6 @@ if ($resql)
 
 			// Third party
 			print '<td>';
-			$thirdpartystatic->id=$objp->socid;
-			$thirdpartystatic->name=$objp->name;
 			print $thirdpartystatic->getNomUrl(1);
 			print '</td>';
 

From 65c689cc812ec53926047a53465a7f8c1ee346ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 18:32:47 +0100
Subject: [PATCH 352/386] Clean code

---
 htdocs/compta/paiement/card.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 3a6727b4299..2a8267aefb5 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -332,8 +332,6 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
-
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);

From fe45e82e999d1f26a39579660d7d90ee363dcf92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 19:00:38 +0100
Subject: [PATCH 353/386] Fix use of table llx_c_paiement (param showempty was
 not used/set)

---
 htdocs/compta/bank/bankentries_list.php        |  4 ++--
 htdocs/compta/bank/various_payment/index.php   |  2 +-
 htdocs/compta/facture/invoicetemplate_list.php | 16 ++++++++--------
 htdocs/compta/facture/list.php                 |  6 +++---
 htdocs/compta/salaries/index.php               |  2 +-
 htdocs/compta/tva/reglement.php                |  2 +-
 htdocs/core/class/html.form.class.php          |  2 +-
 htdocs/fourn/facture/list.php                  |  2 +-
 htdocs/install/mysql/data/llx_c_paiement.sql   |  3 +--
 htdocs/install/mysql/migration/7.0.0-8.0.0.sql |  1 +
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 91e496d998c..56eb8beeca7 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -673,7 +673,7 @@ if ($resql)
 		print '</td>';
 		print '<td>&nbsp;</td>';
 		print '<td class="nowrap">';
-		$form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1);
+		$form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')), 'operation', '1,2', 2, 1);
 		print '</td>';
 		print '<td>';
 		print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq","alpha").'">';
@@ -852,7 +852,7 @@ if ($resql)
 	if (! empty($arrayfields['type']['checked']))
 	{
         print '<td class="liste_titre" align="center">';
-        $form->select_types_paiements(empty($search_type)?'':$search_type, 'search_type', '', 2, 0, 1, 0, 1, 'maxwidth100');
+        $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']))
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index d52cbeb7595..41c0baa61d5 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -187,7 +187,7 @@ if ($result)
 
 	// Type
 	print '<td class="liste_titre" align="left">';
-	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
+	$form->select_types_paiements($typeid,'typeid','',0,1,1,16);
 	print '</td>';
 
 	// Account
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 6cd80d8dff6..0a2b9f72d60 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -419,19 +419,19 @@ if ($resql)
 	// Date invoice
 	if (! empty($arrayfields['f.date_last_gen']['checked']))
 	{
-		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="search_day" value="'.$search_day.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-		$formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5);
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+		$formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
 		print '</td>';
 	}
 	// Date next generation
 	if (! empty($arrayfields['f.date_when']['checked']))
 	{
-		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="search_day_date_when" value="'.$search_day_date_when.'">';
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
-		$formother->select_year($search_year_date_when?$search_year_date_when:-1,'search_year_date_when',1, 20, 5);
+		print '<td class="liste_titre nowraponall" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
+		$formother->select_year($search_year_date_when?$search_year_date_when:-1,'search_year_date_when',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
 		print '</td>';
 	}
 	// Extra fields
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c09621db71c..8319f42bd97 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -756,7 +756,7 @@ if ($resql)
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ht']['checked']))
@@ -775,14 +775,14 @@ if ($resql)
 	}
 	if (! empty($arrayfields['f.total_localtax1']['checked']))
 	{
-		// Amount
+		// Localtax1
 		print '<td class="liste_titre" align="right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax2']['checked']))
 	{
-		// Amount
+		// Localtax2
 		print '<td class="liste_titre" align="right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
 		print '</td>';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 47cafad0f0a..f911636a7ef 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -179,7 +179,7 @@ if ($result)
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Type
 	print '<td class="liste_titre" align="left">';
-	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
+	$form->select_types_paiements($typeid,'typeid','',0,1,1,16);
 	print '</td>';
 	// Account
 	if (! empty($conf->banque->enabled))
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 66099cd63db..27e314762f8 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -173,7 +173,7 @@ if ($result)
 	print '</td>';
 	// Type
 	print '<td class="liste_titre" align="left">';
-	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
+	$form->select_types_paiements($typeid,'typeid','',0,1,1,16);
 	print '</td>';
 	// Account
 	if (! empty($conf->banque->enabled))
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7b74fc05850..61d21cec7e8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3100,7 +3100,7 @@ class Form
 	 *      @param  string  $morecss        Add more CSS on select tag
 	 * 		@return	void
 	 */
-	function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=0, $noadmininfo=0, $maxlength=0, $active=1, $morecss='')
+	function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=1, $noadmininfo=0, $maxlength=0, $active=1, $morecss='')
 	{
 		global $langs,$user;
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 083967935fa..f48f3d2c01d 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -655,7 +655,7 @@ if ($resql)
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ht']['checked']))
diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql
index 49da0b37952..2e459cd12a7 100644
--- a/htdocs/install/mysql/data/llx_c_paiement.sql
+++ b/htdocs/install/mysql/data/llx_c_paiement.sql
@@ -30,13 +30,12 @@
 -- Types paiement
 --
 
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 1, '', '-',                    2,1);
+insert into llx_c_paiement (id,code,libelle,type,active) values ( 1, 'TIP', 'TIP',               2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 2, 'VIR', 'Transfer',          2,1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 3, 'PRE', 'Debit order',       2,1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 4, 'LIQ', 'Cash',              2,1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 6, 'CB',  'Credit card',       2,1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 7, 'CHQ', 'Cheque',            2,1);
-insert into llx_c_paiement (id,code,libelle,type,active) values ( 8, 'TIP', 'TIP',               2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (50, 'VAD', 'Online payment',    2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (51, 'TRA', 'Traite',            2,0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (52, 'LCR', 'LCR',               2,0);
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 4b224477940..2b2bb6949d5 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
@@ -71,6 +71,7 @@ ALTER TABLE llx_expensereport_det ADD COLUMN docnumber varchar(128) after fk_exp
 ALTER TABLE llx_website_page ADD COLUMN aliasalt varchar(255) after pageurl;
 
 -- Add missing keys and primary key
+DELETE FROM llx_c_paiement WHERE code = '' or code = '-' or id = 0;
 ALTER TABLE llx_c_paiement DROP INDEX uk_c_paiement;
 ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
 ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;

From b9f1695b34875e0c2f4c26fa9b79dd47010a89d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 19:25:05 +0100
Subject: [PATCH 354/386] NEW Upgrade of Stripe lib to 6.4.1

---
 htdocs/includes/stripe/.travis.yml            |    1 -
 htdocs/includes/stripe/build.php              |    0
 .../includes/stripe/data/ca-certificates.crt  | 1113 +++++++----------
 htdocs/includes/stripe/data/test.png          |  Bin 95 -> 0 bytes
 htdocs/includes/stripe/lib/AttachedObject.php |   43 -
 htdocs/includes/stripe/lib/Error/Base.php     |    9 +
 htdocs/includes/stripe/lib/Error/Card.php     |   13 +-
 .../includes/stripe/lib/ExternalAccount.php   |   92 --
 .../stripe/lib/HttpClient/ClientInterface.php |    4 +-
 .../stripe/lib/HttpClient/CurlClient.php      |  208 +--
 .../includes/stripe/lib/JsonSerializable.php  |   18 -
 .../stripe/lib/Util/AutoPagingIterator.php    |    6 +-
 .../stripe/lib/Util/RequestOptions.php        |   28 +-
 htdocs/includes/stripe/lib/Util/Set.php       |    4 +-
 htdocs/includes/stripe/lib/Util/Util.php      |  134 +-
 htdocs/includes/stripe/tests/AccountTest.php  |  300 -----
 .../stripe/tests/ApiRequestorTest.php         |   68 -
 .../stripe/tests/ApplePayDomainTest.php       |   72 --
 .../stripe/tests/ApplicationFeeRefundTest.php |   18 -
 .../stripe/tests/ApplicationFeeTest.php       |   22 -
 .../stripe/tests/AuthenticationErrorTest.php  |   16 -
 htdocs/includes/stripe/tests/BalanceTest.php  |   15 -
 .../stripe/tests/BalanceTransactionTest.php   |   13 -
 .../includes/stripe/tests/BankAccountTest.php |   32 -
 .../stripe/tests/BitcoinReceiverTest.php      |  120 --
 .../includes/stripe/tests/CardErrorTest.php   |   41 -
 htdocs/includes/stripe/tests/ChargeTest.php   |  204 ---
 .../includes/stripe/tests/CollectionTest.php  |  105 --
 .../includes/stripe/tests/CountrySpecTest.php |   31 -
 htdocs/includes/stripe/tests/CouponTest.php   |   29 -
 .../includes/stripe/tests/CurlClientTest.php  |  100 --
 htdocs/includes/stripe/tests/CustomerTest.php |  278 ----
 htdocs/includes/stripe/tests/DiscountTest.php |   31 -
 htdocs/includes/stripe/tests/DisputeTest.php  |   96 --
 htdocs/includes/stripe/tests/ErrorTest.php    |   61 -
 .../stripe/tests/ExternalAccountTest.php      |   30 -
 .../includes/stripe/tests/FileUploadTest.php  |   44 -
 .../stripe/tests/InvalidRequestErrorTest.php  |   26 -
 htdocs/includes/stripe/tests/InvoiceTest.php  |   56 -
 htdocs/includes/stripe/tests/PayoutTest.php   |   94 --
 .../stripe/tests/PermissionsErrorTest.php     |   22 -
 htdocs/includes/stripe/tests/PlanTest.php     |   51 -
 htdocs/includes/stripe/tests/ProductTest.php  |  158 ---
 .../stripe/tests/RateLimitErrorTest.php       |   22 -
 .../includes/stripe/tests/RecipientTest.php   |  112 --
 htdocs/includes/stripe/tests/RefundTest.php   |  131 --
 .../stripe/tests/RequestOptionsTest.php       |   69 -
 htdocs/includes/stripe/tests/SourceTest.php   |  218 ----
 .../stripe/tests/StripeObjectTest.php         |  108 --
 .../stripe/tests/SubscriptionItemTest.php     |   38 -
 .../stripe/tests/SubscriptionTest.php         |  132 --
 htdocs/includes/stripe/tests/TestCase.php     |  398 +++---
 .../stripe/tests/ThreeDSecureTest.php         |   46 -
 htdocs/includes/stripe/tests/TokenTest.php    |   13 -
 .../stripe/tests/TransferReversalTest.php     |   19 -
 htdocs/includes/stripe/tests/TransferTest.php |   46 -
 htdocs/includes/stripe/tests/UtilTest.php     |   45 -
 .../stripe/tests/bootstrap.no_autoload.php    |    3 +-
 htdocs/includes/stripe/tests/bootstrap.php    |   40 +
 59 files changed, 903 insertions(+), 4343 deletions(-)
 mode change 100755 => 100644 htdocs/includes/stripe/build.php
 delete mode 100644 htdocs/includes/stripe/data/test.png
 delete mode 100644 htdocs/includes/stripe/lib/AttachedObject.php
 delete mode 100644 htdocs/includes/stripe/lib/ExternalAccount.php
 delete mode 100644 htdocs/includes/stripe/lib/JsonSerializable.php
 delete mode 100644 htdocs/includes/stripe/tests/AccountTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ApiRequestorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ApplePayDomainTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ApplicationFeeTest.php
 delete mode 100644 htdocs/includes/stripe/tests/AuthenticationErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/BalanceTest.php
 delete mode 100644 htdocs/includes/stripe/tests/BalanceTransactionTest.php
 delete mode 100644 htdocs/includes/stripe/tests/BankAccountTest.php
 delete mode 100644 htdocs/includes/stripe/tests/BitcoinReceiverTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CardErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ChargeTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CollectionTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CountrySpecTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CouponTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CurlClientTest.php
 delete mode 100644 htdocs/includes/stripe/tests/CustomerTest.php
 delete mode 100644 htdocs/includes/stripe/tests/DiscountTest.php
 delete mode 100644 htdocs/includes/stripe/tests/DisputeTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ExternalAccountTest.php
 delete mode 100644 htdocs/includes/stripe/tests/FileUploadTest.php
 delete mode 100644 htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/InvoiceTest.php
 delete mode 100644 htdocs/includes/stripe/tests/PayoutTest.php
 delete mode 100644 htdocs/includes/stripe/tests/PermissionsErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/PlanTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ProductTest.php
 delete mode 100644 htdocs/includes/stripe/tests/RateLimitErrorTest.php
 delete mode 100644 htdocs/includes/stripe/tests/RecipientTest.php
 delete mode 100644 htdocs/includes/stripe/tests/RefundTest.php
 delete mode 100644 htdocs/includes/stripe/tests/RequestOptionsTest.php
 delete mode 100644 htdocs/includes/stripe/tests/SourceTest.php
 delete mode 100644 htdocs/includes/stripe/tests/StripeObjectTest.php
 delete mode 100644 htdocs/includes/stripe/tests/SubscriptionItemTest.php
 delete mode 100644 htdocs/includes/stripe/tests/SubscriptionTest.php
 delete mode 100644 htdocs/includes/stripe/tests/ThreeDSecureTest.php
 delete mode 100644 htdocs/includes/stripe/tests/TokenTest.php
 delete mode 100644 htdocs/includes/stripe/tests/TransferReversalTest.php
 delete mode 100644 htdocs/includes/stripe/tests/TransferTest.php
 delete mode 100644 htdocs/includes/stripe/tests/UtilTest.php

diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
index 16526d9f853..d575ed51a7d 100644
--- a/htdocs/includes/stripe/.travis.yml
+++ b/htdocs/includes/stripe/.travis.yml
@@ -3,7 +3,6 @@ sudo: false
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/stripe/data/ca-certificates.crt b/htdocs/includes/stripe/data/ca-certificates.crt
index 1c4e5b22673..39ba33683c5 100644
--- a/htdocs/includes/stripe/data/ca-certificates.crt
+++ b/htdocs/includes/stripe/data/ca-certificates.crt
@@ -1,20 +1,20 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jan 22 20:39:57 2016
+## Certificate data from Mozilla as of: Wed Sep 20 03:12:05 2017 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
 ## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
 ##
 ## It contains the certificates in PEM format and therefore
 ## can be directly used with curl / libcurl / php_curl, or with
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
-## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: 0ab47e2f41518f8d223eab517cb799e5b071231e
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: 2b2dbe5244e0047e088c597998883a913f6c5fffd1cb5c0fe5a368c8466cb2ec
 ##
 
 
@@ -130,30 +130,6 @@ Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
 RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
 -----END CERTIFICATE-----
 
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
 AddTrust External Root
 ======================
 -----BEGIN CERTIFICATE-----
@@ -178,54 +154,6 @@ e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
 G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
 -----END CERTIFICATE-----
 
-AddTrust Public Services Root
-=============================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
-cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
-BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
-dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
-nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
-d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
-Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
-HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
-A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
-A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
-JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
-+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
-Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
-EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-AddTrust Qualified Certificates Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
-cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
-CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
-IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
-64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
-KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
-L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
-wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
-MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
-BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
-azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
-GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
-RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
-iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
------END CERTIFICATE-----
-
 Entrust Root Certification Authority
 ====================================
 -----BEGIN CERTIFICATE-----
@@ -252,27 +180,6 @@ W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
 tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
 -----END CERTIFICATE-----
 
-RSA Security 2048 v3
-====================
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
-MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
-Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
-WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
-KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
-+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
-FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
-v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
-0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
-VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
-nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
-pKnXwiJPZ9d37CAFYd4=
------END CERTIFICATE-----
-
 GeoTrust Global CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -294,27 +201,6 @@ XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
 Mw==
 -----END CERTIFICATE-----
 
-GeoTrust Global CA 2
-====================
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
-MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
-NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
-LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
-Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
-HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
-K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
-srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
-ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
-OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
-x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
-H4z1Ir+rzoPz4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
 GeoTrust Universal CA
 =====================
 -----BEGIN CERTIFICATE-----
@@ -440,56 +326,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
 -----END CERTIFICATE-----
 
-Comodo Secure Services root
-===========================
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
-MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
-Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
-BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
-9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
-rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
-oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
-p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
-FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
-YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
-aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
-4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
-DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
-pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
-RR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-Comodo Trusted Services root
-============================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
-MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
-bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
-IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
-3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
-/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
-juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
-ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
-DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
-ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
-cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
-uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
-BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
-R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
-9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
 QuoVadis Root CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -629,54 +465,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
 llpwrN9M
 -----END CERTIFICATE-----
 
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-UTN USERFirst Hardware Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
------END CERTIFICATE-----
-
 Camerfirma Chambers of Commerce Root
 ====================================
 -----BEGIN CERTIFICATE-----
@@ -731,41 +519,6 @@ IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
 t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
 -----END CERTIFICATE-----
 
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -909,38 +662,6 @@ CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
 +fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
 -----END CERTIFICATE-----
 
-Swisscom Root CA 1
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
-MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
-MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
-NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
-AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
-b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
-7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
-cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
-WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
-haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
-MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
-MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
-jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
-MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
-VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
-vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
-OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
-1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
-nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
-x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
-NY6E0F/6MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
 DigiCert Assured ID Root CA
 ===========================
 -----BEGIN CERTIFICATE-----
@@ -1298,33 +1019,6 @@ wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
 ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
 -----END CERTIFICATE-----
 
-WellsSecure Public Root Certificate Authority
-=============================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
-F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
-NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
-bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
-VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
-iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
-i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
-bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
-K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
-AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
-cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
-lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
-i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
-GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
-K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
-bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
-qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
-E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
-tylv2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
 COMODO ECC Certification Authority
 ==================================
 -----BEGIN CERTIFICATE-----
@@ -1342,30 +1036,6 @@ FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
 U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
 -----END CERTIFICATE-----
 
-IGC/A
-=====
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
-VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
-Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
-MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
-EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
-STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
-TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
-So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
-HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
-frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
-tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
-egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
-iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
-q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
-MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
-lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
-0mBWWg==
------END CERTIFICATE-----
-
 Security Communication EV RootCA1
 =================================
 -----BEGIN CERTIFICATE-----
@@ -1410,46 +1080,6 @@ hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
 okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
 -----END CERTIFICATE-----
 
-Microsec e-Szigno Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
-BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
-EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
-MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
-dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
-GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
-d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
-oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
-QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
-PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
-MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
-IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
-VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
-LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
-dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
-4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
-AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
-egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
-Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
-PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
-c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
-cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
-IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
-WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
-MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
-Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
-HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
-nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
-aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
-yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
-S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
 Certigna
 ========
 -----BEGIN CERTIFICATE-----
@@ -1575,58 +1205,6 @@ LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
 dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
 -----END CERTIFICATE-----
 
-Buypass Class 2 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
-MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
-cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
-0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
-0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
-uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
-1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
-7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
-fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
-wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
-==========================================================================
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
-QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
-Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
-IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
-X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
-gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
-eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
-TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
-Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
-uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
-qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
-ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
-Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
-Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
-FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
-zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
-XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
-bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
-RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
-1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
-2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
-Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
-AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
 certSIGN ROOT CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -1647,49 +1225,6 @@ vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
 TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
 -----END CERTIFICATE-----
 
-CNNIC ROOT
-==========
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
-ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
-OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
-o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
-VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
-VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
-czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
-y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
-wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
-lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
-Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
-O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
-BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
-G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
-mxE=
------END CERTIFICATE-----
-
-ApplicationCA - Japanese Government
-===================================
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
-SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
-MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
-cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
-fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
-wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
-jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
-nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
-WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
-BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
-vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
-o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
-/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
-io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
-dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
-
 GeoTrust Primary Certification Authority - G3
 =============================================
 -----BEGIN CERTIFICATE-----
@@ -1821,7 +1356,7 @@ AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
 -----END CERTIFICATE-----
 
 NetLock Arany (Class Gold) Főtanúsítvány
-============================================
+========================================
 -----BEGIN CERTIFICATE-----
 MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
 A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
@@ -1876,58 +1411,6 @@ IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
 66+KAQ==
 -----END CERTIFICATE-----
 
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-Juur-SK
-=======
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
-c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
-DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
-SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
-aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
-TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
-+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
-UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
-Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
-MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
-HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
-AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
-cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
-AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
-cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
-A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
-ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
-abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
-IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
-Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
-yyqcjg==
------END CERTIFICATE-----
-
 Hongkong Post Root CA 1
 =======================
 -----BEGIN CERTIFICATE-----
@@ -2361,7 +1844,7 @@ Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
 -----END CERTIFICATE-----
 
 Certinomis - Autorité Racine
-=============================
+============================
 -----BEGIN CERTIFICATE-----
 MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
 Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
@@ -2391,41 +1874,6 @@ wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
 vgt2Fl43N+bYdJeimUV5
 -----END CERTIFICATE-----
 
-Root CA Generalitat Valenciana
-==============================
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
-ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
-IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
-WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
-CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
-F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
-ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
-D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
-JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
-AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
-dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
-ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
-AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
-YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
-AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
-AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
-YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
-AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
-OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
-dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
-BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
-b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
-TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
-Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
-NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
-iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
-+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
 TWCA Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -2871,93 +2319,6 @@ poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
 eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
 -----END CERTIFICATE-----
 
-China Internet Network Information Center EV Certificates Root
-==============================================================
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
-BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
-aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
-Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
-A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
-PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
-cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
-jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
-98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
-klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
-KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
-7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
-glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
-0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
-7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
-ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
-5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
------END CERTIFICATE-----
-
-Swisscom Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2
-MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM
-LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo
-ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ
-wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH
-Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a
-SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS
-NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab
-mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY
-Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3
-qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
-BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu
-MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO
-v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ
-82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz
-o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs
-a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx
-OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW
-mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o
-+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC
-rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX
-5OfNeOI5wSsSnqaeG8XmDtkx2Q==
------END CERTIFICATE-----
-
-Swisscom Root EV CA 2
-=====================
------BEGIN CERTIFICATE-----
-MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE
-BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl
-cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN
-MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT
-HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg
-Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz
-o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy
-Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti
-GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li
-qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH
-Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG
-alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa
-m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox
-bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi
-xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/
-BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
-MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB
-bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL
-j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU
-wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7
-XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH
-59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/
-23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq
-J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA
-HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi
-uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW
-l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
------END CERTIFICATE-----
-
 CA Disig Root R1
 ================
 -----BEGIN CERTIFICATE-----
@@ -3756,7 +3117,7 @@ ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
 
 TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
-=========================================================
+====================================================
 -----BEGIN CERTIFICATE-----
 MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
 BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
@@ -3779,30 +3140,6 @@ lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
 B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
 -----END CERTIFICATE-----
 
-TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
-=========================================================
------BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
-MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
-BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
-aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
-aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
-2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
-wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
-HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
-+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
-9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
-fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
-o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
-hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
-O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
------END CERTIFICATE-----
-
 Certinomis - Root CA
 ====================
 -----BEGIN CERTIFICATE-----
@@ -3892,28 +3229,418 @@ Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
 a/GRspBl9JrmkO5K
 -----END CERTIFICATE-----
 
-================================================================
-C: US
-O: GTE Corporation
-OU: GTE CyberTrust Solutions, Inc.
-CN: GTE CyberTrust Global Root
---
-Not Before: 1998-08-13
-Not After:  2018-08-13
-Signature: md5WithRSAEncryption
-Key: RSA:1024
+SZAFIR ROOT CA2
+===============
 -----BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
-VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
-bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
-b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
-cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
-b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
-iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
-r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
-04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
-GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
-3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
-lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+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-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
 -----END CERTIFICATE-----
diff --git a/htdocs/includes/stripe/data/test.png b/htdocs/includes/stripe/data/test.png
deleted file mode 100644
index 1914264c08781d1f30ee0b8482bccf44586f2dc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?ju0VQumF+E%TuG2$FoVOh
l8)-lem#2$k2*>s01R$G<f$@>z9%CSj!PC{xWt~$(697H@6ZHT9

diff --git a/htdocs/includes/stripe/lib/AttachedObject.php b/htdocs/includes/stripe/lib/AttachedObject.php
deleted file mode 100644
index 6a8951788ed..00000000000
--- a/htdocs/includes/stripe/lib/AttachedObject.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Stripe;
-
-use Countable;
-
-/**
- * Class AttachedObject
- *
- * e.g. metadata on Stripe objects.
- *
- * @package Stripe
- */
-class AttachedObject extends StripeObject implements Countable
-{
-    /**
-     * Updates this object.
-     *
-     * @param array $properties A mapping of properties to update on this object.
-     */
-    public function replaceWith($properties)
-    {
-        $removed = array_diff(array_keys($this->_values), array_keys($properties));
-        // Don't unset, but rather set to null so we send up '' for deletion.
-        foreach ($removed as $k) {
-            $this->$k = null;
-        }
-
-        foreach ($properties as $k => $v) {
-            $this->$k = $v;
-        }
-    }
-
-    /**
-     * Counts the number of elements in the AttachedObject instance.
-     *
-     * @return int the number of elements
-     */
-    public function count()
-    {
-        return count($this->_values);
-    }
-}
diff --git a/htdocs/includes/stripe/lib/Error/Base.php b/htdocs/includes/stripe/lib/Error/Base.php
index 44106ecca50..c0051e6a416 100644
--- a/htdocs/includes/stripe/lib/Error/Base.php
+++ b/htdocs/includes/stripe/lib/Error/Base.php
@@ -20,11 +20,20 @@ abstract class Base extends Exception
         $this->httpHeaders = $httpHeaders;
         $this->requestId = null;
 
+        // TODO: make this a proper constructor argument in the next major
+        //       release.
+        $this->stripeCode = isset($jsonBody["error"]["code"]) ? $jsonBody["error"]["code"] : null;
+
         if ($httpHeaders && isset($httpHeaders['Request-Id'])) {
             $this->requestId = $httpHeaders['Request-Id'];
         }
     }
 
+    public function getStripeCode()
+    {
+        return $this->stripeCode;
+    }
+
     public function getHttpStatus()
     {
         return $this->httpStatus;
diff --git a/htdocs/includes/stripe/lib/Error/Card.php b/htdocs/includes/stripe/lib/Error/Card.php
index 9004db271e3..f3ff343d899 100644
--- a/htdocs/includes/stripe/lib/Error/Card.php
+++ b/htdocs/includes/stripe/lib/Error/Card.php
@@ -15,12 +15,16 @@ class Card extends Base
     ) {
         parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
         $this->stripeParam = $stripeParam;
+
+        // TODO: once Error\Base accepts the error code as an argument, pass it
+        //       in the call to parent::__construct() and stop setting it here.
         $this->stripeCode = $stripeCode;
 
         // This one is not like the others because it was added later and we're
         // trying to do our best not to change the public interface of this class'
-        // constructor. We should consider changing its implementation on the
-        // next major version bump of this library.
+        // constructor.
+        // TODO: make this a proper constructor argument in the next major
+        //       release.
         $this->declineCode = isset($jsonBody["error"]["decline_code"]) ? $jsonBody["error"]["decline_code"] : null;
     }
 
@@ -29,11 +33,6 @@ class Card extends Base
         return $this->declineCode;
     }
 
-    public function getStripeCode()
-    {
-        return $this->stripeCode;
-    }
-
     public function getStripeParam()
     {
         return $this->stripeParam;
diff --git a/htdocs/includes/stripe/lib/ExternalAccount.php b/htdocs/includes/stripe/lib/ExternalAccount.php
deleted file mode 100644
index fba03075d86..00000000000
--- a/htdocs/includes/stripe/lib/ExternalAccount.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Stripe;
-
-/**
- * Class ExternalAccount
- *
- * @property string $id
- * @property string $object
- *
- * @package Stripe
- */
-abstract class ExternalAccount extends ApiResource
-{
-    /**
-     * @return string The instance URL for this resource. It needs to be special
-     *    cased because it doesn't fit into the standard resource pattern.
-     */
-    public function instanceUrl()
-    {
-        $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);
-        }
-
-        if ($this['customer']) {
-            $parent = $this['customer'];
-            $base = Customer::classUrl();
-            $path = 'sources';
-        } elseif ($this['account']) {
-            $parent = $this['account'];
-            $base = Account::classUrl();
-            $path = 'external_accounts';
-        } elseif ($this['recipient']) {
-            $parent = $this['recipient'];
-            $base = Recipient::classUrl();
-            $path = 'cards';
-        } else {
-            return null;
-        }
-
-        $parent = Util\Util::utf8($parent);
-        $id = Util\Util::utf8($id);
-
-        $parentExtn = urlencode($parent);
-        $extn = urlencode($id);
-        return "$base/$parentExtn/$path/$extn";
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ExternalAccount The deleted external account.
-     */
-    public function delete($params = null, $opts = null)
-    {
-        return $this->_delete($params, $opts);
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return ExternalAccount The saved external account.
-     */
-    public function save($opts = null)
-    {
-        return $this->_save($opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ExternalAccount The verified (or not) external account.
-     */
-    public function verify($params = null, $opts = null)
-    {
-        if ($this['customer']) {
-            $url = $this->instanceUrl() . '/verify';
-            list($response, $options) = $this->_request('post', $url, $params, $opts);
-            $this->refreshFrom($response, $options);
-            return $this;
-        } else {
-            $message = 'Only customer external accounts can be verified in this manner.';
-            throw new Error\Api($message);
-        }
-    }
-}
diff --git a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
index dc4af5d1dc2..606ddb1a597 100644
--- a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
+++ b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
@@ -11,8 +11,8 @@ interface ClientInterface
      * @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)
-     * @throws Error\Api & Error\ApiConnection
-     * @return array($rawBody, $httpStatusCode, $httpHeader)
+     * @throws \Stripe\Error\Api & \Stripe\Error\ApiConnection
+     * @return [$rawBody, $httpStatusCode, $httpHeader]
      */
     public function request($method, $absUrl, $headers, $params, $hasFile);
 }
diff --git a/htdocs/includes/stripe/lib/HttpClient/CurlClient.php b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
index e070d324d72..6bc86e32b3a 100644
--- a/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
+++ b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
@@ -36,6 +36,8 @@ class CurlClient implements ClientInterface
 
     protected $defaultOptions;
 
+    protected $userAgentInfo;
+
     /**
      * CurlClient constructor.
      *
@@ -49,9 +51,20 @@ class CurlClient implements ClientInterface
      *
      * @param array|callable|null $defaultOptions
      */
-    public function __construct($defaultOptions = null)
+    public function __construct($defaultOptions = null, $randomGenerator = null)
     {
         $this->defaultOptions = $defaultOptions;
+        $this->randomGenerator = $randomGenerator ?: new Util\RandomGenerator();
+        $this->initUserAgentInfo();
+    }
+
+    public function initUserAgentInfo()
+    {
+        $curlVersion = curl_version();
+        $this->userAgentInfo = [
+            'httplib' =>  'curl ' . $curlVersion['version'],
+            'ssllib' => $curlVersion['ssl_version'],
+        ];
     }
 
     public function getDefaultOptions()
@@ -59,6 +72,11 @@ class CurlClient implements ClientInterface
         return $this->defaultOptions;
     }
 
+    public function getUserAgentInfo()
+    {
+        return $this->userAgentInfo;
+    }
+
     // USER DEFINED TIMEOUTS
 
     const DEFAULT_TIMEOUT = 80;
@@ -93,10 +111,9 @@ class CurlClient implements ClientInterface
 
     public function request($method, $absUrl, $headers, $params, $hasFile)
     {
-        $curl = curl_init();
         $method = strtolower($method);
 
-        $opts = array();
+        $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)) {
@@ -114,24 +131,32 @@ class CurlClient implements ClientInterface
             }
             $opts[CURLOPT_HTTPGET] = 1;
             if (count($params) > 0) {
-                $encoded = self::encode($params);
+                $encoded = Util\Util::urlEncode($params);
                 $absUrl = "$absUrl?$encoded";
             }
         } elseif ($method == 'post') {
             $opts[CURLOPT_POST] = 1;
-            $opts[CURLOPT_POSTFIELDS] = $hasFile ? $params : self::encode($params);
+            $opts[CURLOPT_POSTFIELDS] = $hasFile ? $params : Util\Util::urlEncode($params);
         } elseif ($method == 'delete') {
             $opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
             if (count($params) > 0) {
-                $encoded = self::encode($params);
+                $encoded = Util\Util::urlEncode($params);
                 $absUrl = "$absUrl?$encoded";
             }
         } else {
             throw new Error\Api("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 (!isset($headers['Idempotency-Key'])) {
+                array_push($headers, 'Idempotency-Key: ' . $this->randomGenerator->uuid());
+            }
+        }
+
         // Create a callback to capture HTTP headers for the response
-        $rheaders = array();
+        $rheaders = [];
         $headerCallback = function ($curl, $header_line) use (&$rheaders) {
             // Ignore the HTTP request line (HTTP/1.1 200 OK)
             if (strpos($header_line, ":") === false) {
@@ -163,50 +188,63 @@ class CurlClient implements ClientInterface
         $opts[CURLOPT_TIMEOUT] = $this->timeout;
         $opts[CURLOPT_HEADERFUNCTION] = $headerCallback;
         $opts[CURLOPT_HTTPHEADER] = $headers;
-        if (!Stripe::$verifySslCerts) {
+        $opts[CURLOPT_CAINFO] = Stripe::getCABundlePath();
+        if (!Stripe::getVerifySslCerts()) {
             $opts[CURLOPT_SSL_VERIFYPEER] = false;
         }
 
-        curl_setopt_array($curl, $opts);
-        $rbody = curl_exec($curl);
+        list($rbody, $rcode) = $this->executeRequestWithRetries($opts, $absUrl);
 
-        if (!defined('CURLE_SSL_CACERT_BADFILE')) {
-            define('CURLE_SSL_CACERT_BADFILE', 77);  // constant not defined in PHP
-        }
-
-        $errno = curl_errno($curl);
-        if ($errno == CURLE_SSL_CACERT ||
-            $errno == CURLE_SSL_PEER_CERTIFICATE ||
-            $errno == CURLE_SSL_CACERT_BADFILE
-        ) {
-            array_push(
-                $headers,
-                'X-Stripe-Client-Info: {"ca":"using Stripe-supplied CA bundle"}'
-            );
-            $cert = self::caBundle();
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-            curl_setopt($curl, CURLOPT_CAINFO, $cert);
-            $rbody = curl_exec($curl);
-        }
-
-        if ($rbody === false) {
-            $errno = curl_errno($curl);
-            $message = curl_error($curl);
-            curl_close($curl);
-            $this->handleCurlError($absUrl, $errno, $message);
-        }
-
-        $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        return array($rbody, $rcode, $rheaders);
+        return [$rbody, $rcode, $rheaders];
     }
 
     /**
-     * @param number $errno
+     * @param array $opts cURL options
+     */
+    private function executeRequestWithRetries($opts, $absUrl)
+    {
+        $numRetries = 0;
+
+        while (true) {
+            $rcode = 0;
+            $errno = 0;
+
+            $curl = curl_init();
+            curl_setopt_array($curl, $opts);
+            $rbody = curl_exec($curl);
+
+            if ($rbody === false) {
+                $errno = curl_errno($curl);
+                $message = curl_error($curl);
+            } else {
+                $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            }
+            curl_close($curl);
+
+            if ($this->shouldRetry($errno, $rcode, $numRetries)) {
+                $numRetries += 1;
+                $sleepSeconds = $this->sleepTime($numRetries);
+                usleep(intval($sleepSeconds * 1000000));
+            } else {
+                break;
+            }
+        }
+
+        if ($rbody === false) {
+            $this->handleCurlError($absUrl, $errno, $message, $numRetries);
+        }
+
+        return [$rbody, $rcode];
+    }
+
+    /**
+     * @param string $url
+     * @param int $errno
      * @param string $message
+     * @param int $numRetries
      * @throws Error\ApiConnection
      */
-    private function handleCurlError($url, $errno, $message)
+    private function handleCurlError($url, $errno, $message, $numRetries)
     {
         switch ($errno) {
             case CURLE_COULDNT_CONNECT:
@@ -231,52 +269,66 @@ class CurlClient implements ClientInterface
         $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.";
+        }
+
         throw new Error\ApiConnection($msg);
     }
 
-    private static function caBundle()
+    /**
+     * 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 int $numRetries
+     * @return bool
+     */
+    private function shouldRetry($errno, $rcode, $numRetries)
     {
-        return dirname(__FILE__) . '/../../data/ca-certificates.crt';
+        if ($numRetries >= Stripe::getMaxNetworkRetries()) {
+            return false;
+        }
+
+        // Retry on timeout-related problems (either on open or read).
+        if ($errno === CURLE_OPERATION_TIMEOUTED) {
+            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) {
+            return true;
+        }
+
+        // 409 conflict
+        if ($rcode === 409) {
+            return true;
+        }
+
+        return false;
     }
 
-    /**
-     * @param array $arr An map of param keys to values.
-     * @param string|null $prefix
-     *
-     * Only public for testability, should not be called outside of CurlClient
-     *
-     * @return string A querystring, essentially.
-     */
-    public static function encode($arr, $prefix = null)
+    private function sleepTime($numRetries)
     {
-        if (!is_array($arr)) {
-            return $arr;
-        }
+        // 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),
+            Stripe::getMaxNetworkRetryDelay()
+        );
 
-        $r = array();
-        foreach ($arr as $k => $v) {
-            if (is_null($v)) {
-                continue;
-            }
+        // Apply some jitter by randomizing the value in the range of
+        // ($sleepSeconds / 2) to ($sleepSeconds).
+        $sleepSeconds *= 0.5 * (1 + $this->randomGenerator->randFloat());
 
-            if ($prefix) {
-                if ($k !== null && (!is_int($k) || is_array($v))) {
-                    $k = $prefix."[".$k."]";
-                } else {
-                    $k = $prefix."[]";
-                }
-            }
+        // But never sleep less than the base sleep seconds.
+        $sleepSeconds = max(Stripe::getInitialNetworkRetryDelay(), $sleepSeconds);
 
-            if (is_array($v)) {
-                $enc = self::encode($v, $k);
-                if ($enc) {
-                    $r[] = $enc;
-                }
-            } else {
-                $r[] = urlencode($k)."=".urlencode($v);
-            }
-        }
-
-        return implode("&", $r);
+        return $sleepSeconds;
     }
 }
diff --git a/htdocs/includes/stripe/lib/JsonSerializable.php b/htdocs/includes/stripe/lib/JsonSerializable.php
deleted file mode 100644
index 2fdf8526703..00000000000
--- a/htdocs/includes/stripe/lib/JsonSerializable.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Stripe;
-
-// JsonSerializable only exists in PHP 5.4+. Stub if out if it doesn't exist
-if (interface_exists('\JsonSerializable', false)) {
-    interface JsonSerializable extends \JsonSerializable
-    {
-    }
-} else {
-    // PSR2 wants each interface to have its own file.
-    // @codingStandardsIgnoreStart
-    interface JsonSerializable
-    {
-        // @codingStandardsIgnoreEnd
-        public function jsonSerialize();
-    }
-}
diff --git a/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
index 80877e6742e..167d1258a26 100644
--- a/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
+++ b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
@@ -7,7 +7,7 @@ class AutoPagingIterator implements \Iterator
     private $lastId = null;
     private $page = null;
     private $pageOffset = 0;
-    private $params = array();
+    private $params = [];
 
     public function __construct($collection, $params)
     {
@@ -42,8 +42,8 @@ class AutoPagingIterator implements \Iterator
             $this->pageOffset += count($this->page->data);
             if ($this->page['has_more']) {
                 $this->params = array_merge(
-                    $this->params ? $this->params : array(),
-                    array('starting_after' => $this->lastId)
+                    $this->params ?: [],
+                    ['starting_after' => $this->lastId]
                 );
                 $this->page = $this->page->all($this->params);
             } else {
diff --git a/htdocs/includes/stripe/lib/Util/RequestOptions.php b/htdocs/includes/stripe/lib/Util/RequestOptions.php
index 14af2b8a0e8..a31f4d322d9 100644
--- a/htdocs/includes/stripe/lib/Util/RequestOptions.php
+++ b/htdocs/includes/stripe/lib/Util/RequestOptions.php
@@ -6,10 +6,18 @@ use Stripe\Error;
 
 class RequestOptions
 {
+    /**
+     * @var array A list of headers that should be persisted across requests.
+     */
+    public static $HEADERS_TO_PERSIST = [
+        'Stripe-Account',
+        'Stripe-Version',
+    ];
+
     public $headers;
     public $apiKey;
 
-    public function __construct($key = null, $headers = array())
+    public function __construct($key = null, $headers = [])
     {
         $this->apiKey = $key;
         $this->headers = $headers;
@@ -32,6 +40,18 @@ class RequestOptions
         return $other_options;
     }
 
+    /**
+     * Discards all headers that we don't want to persist across requests.
+     */
+    public function discardNonPersistentHeaders()
+    {
+        foreach ($this->headers as $k => $v) {
+            if (!in_array($k, self::$HEADERS_TO_PERSIST)) {
+                unset($this->headers[$k]);
+            }
+        }
+    }
+
     /**
      * Unpacks an options array into an RequestOptions object
      * @param array|string|null $options a key => value array
@@ -45,15 +65,15 @@ class RequestOptions
         }
 
         if (is_null($options)) {
-            return new RequestOptions(null, array());
+            return new RequestOptions(null, []);
         }
 
         if (is_string($options)) {
-            return new RequestOptions($options, array());
+            return new RequestOptions($options, []);
         }
 
         if (is_array($options)) {
-            $headers = array();
+            $headers = [];
             $key = null;
             if (array_key_exists('api_key', $options)) {
                 $key = $options['api_key'];
diff --git a/htdocs/includes/stripe/lib/Util/Set.php b/htdocs/includes/stripe/lib/Util/Set.php
index 2a500cd639b..d8beb8b1a39 100644
--- a/htdocs/includes/stripe/lib/Util/Set.php
+++ b/htdocs/includes/stripe/lib/Util/Set.php
@@ -9,9 +9,9 @@ class Set implements IteratorAggregate
 {
     private $_elts;
 
-    public function __construct($members = array())
+    public function __construct($members = [])
     {
-        $this->_elts = array();
+        $this->_elts = [];
         foreach ($members as $item) {
             $this->_elts[$item] = true;
         }
diff --git a/htdocs/includes/stripe/lib/Util/Util.php b/htdocs/includes/stripe/lib/Util/Util.php
index 1c8235df9bd..82fd337dd34 100644
--- a/htdocs/includes/stripe/lib/Util/Util.php
+++ b/htdocs/includes/stripe/lib/Util/Util.php
@@ -7,24 +7,26 @@ use Stripe\StripeObject;
 abstract class Util
 {
     private static $isMbstringAvailable = null;
+    private static $isHashEqualsAvailable = null;
 
     /**
      * Whether the provided array (or other) is a list rather than a dictionary.
+     * A list is defined as an array for which all the keys are consecutive
+     * 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 boolean true if the given object is a list.
      */
     public static function isList($array)
     {
         if (!is_array($array)) {
             return false;
         }
-
-      // TODO: generally incorrect, but it's correct given Stripe's response
-        foreach (array_keys($array) as $k) {
-            if (!is_numeric($k)) {
-                return false;
-            }
+        if ($array === []) {
+            return true;
+        }
+        if (array_keys($array) !== range(0, count($array) - 1)) {
+            return false;
         }
         return true;
     }
@@ -37,7 +39,7 @@ abstract class Util
      */
     public static function convertStripeObjectToArray($values)
     {
-        $results = array();
+        $results = [];
         foreach ($values as $k => $v) {
             // FIXME: this is an encapsulation violation
             if ($k[0] == '_') {
@@ -63,26 +65,34 @@ abstract class Util
      */
     public static function convertToStripeObject($resp, $opts)
     {
-        $types = array(
+        $types = [
+            // data structures
+            'list' => 'Stripe\\Collection',
+
+            // business objects
             'account' => 'Stripe\\Account',
             'alipay_account' => 'Stripe\\AlipayAccount',
             'apple_pay_domain' => 'Stripe\\ApplePayDomain',
-            'bank_account' => 'Stripe\\BankAccount',
+            'application_fee' => 'Stripe\\ApplicationFee',
+            'balance' => 'Stripe\\Balance',
             'balance_transaction' => 'Stripe\\BalanceTransaction',
+            'bank_account' => 'Stripe\\BankAccount',
+            'bitcoin_receiver' => 'Stripe\\BitcoinReceiver',
+            'bitcoin_transaction' => 'Stripe\\BitcoinTransaction',
             'card' => 'Stripe\\Card',
             'charge' => 'Stripe\\Charge',
             'country_spec' => 'Stripe\\CountrySpec',
             'coupon' => 'Stripe\\Coupon',
             'customer' => 'Stripe\\Customer',
             'dispute' => 'Stripe\\Dispute',
-            'list' => 'Stripe\\Collection',
+            'ephemeral_key' => 'Stripe\\EphemeralKey',
+            'event' => 'Stripe\\Event',
+            'exchange_rate' => 'Stripe\\ExchangeRate',
+            'fee_refund' => 'Stripe\\ApplicationFeeRefund',
+            'file_upload' => 'Stripe\\FileUpload',
             'invoice' => 'Stripe\\Invoice',
             'invoiceitem' => 'Stripe\\InvoiceItem',
-            'event' => 'Stripe\\Event',
-            'file' => 'Stripe\\FileUpload',
-            'token' => 'Stripe\\Token',
-            'transfer' => 'Stripe\\Transfer',
-            'transfer_reversal' => 'Stripe\\TransferReversal',
+            'login_link' => 'Stripe\\LoginLink',
             'order' => 'Stripe\\Order',
             'order_return' => 'Stripe\\OrderReturn',
             'payout' => 'Stripe\\Payout',
@@ -93,15 +103,17 @@ abstract class Util
             'refund' => 'Stripe\\Refund',
             'sku' => 'Stripe\\SKU',
             'source' => 'Stripe\\Source',
+            'source_transaction' => 'Stripe\\SourceTransaction',
             'subscription' => 'Stripe\\Subscription',
             'subscription_item' => 'Stripe\\SubscriptionItem',
             'three_d_secure' => 'Stripe\\ThreeDSecure',
-            'fee_refund' => 'Stripe\\ApplicationFeeRefund',
-            'bitcoin_receiver' => 'Stripe\\BitcoinReceiver',
-            'bitcoin_transaction' => 'Stripe\\BitcoinTransaction',
-        );
+            'token' => 'Stripe\\Token',
+            'topup' => 'Stripe\\Topup',
+            'transfer' => 'Stripe\\Transfer',
+            'transfer_reversal' => 'Stripe\\TransferReversal',
+        ];
         if (self::isList($resp)) {
-            $mapped = array();
+            $mapped = [];
             foreach ($resp as $i) {
                 array_push($mapped, self::convertToStripeObject($i, $opts));
             }
@@ -143,4 +155,84 @@ abstract class Util
             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.
+     */
+    public static function secureCompare($a, $b)
+    {
+        if (self::$isHashEqualsAvailable === null) {
+            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);
+        }
+    }
+
+    /**
+     * @param array $arr A map of param keys to values.
+     * @param string|null $prefix
+     *
+     * @return string A querystring, essentially.
+     */
+    public static function urlEncode($arr, $prefix = null)
+    {
+        if (!is_array($arr)) {
+            return $arr;
+        }
+
+        $r = [];
+        foreach ($arr as $k => $v) {
+            if (is_null($v)) {
+                continue;
+            }
+
+            if ($prefix) {
+                if ($k !== null && (!is_int($k) || is_array($v))) {
+                    $k = $prefix."[".$k."]";
+                } else {
+                    $k = $prefix."[]";
+                }
+            }
+
+            if (is_array($v)) {
+                $enc = self::urlEncode($v, $k);
+                if ($enc) {
+                    $r[] = $enc;
+                }
+            } else {
+                $r[] = urlencode($k)."=".urlencode($v);
+            }
+        }
+
+        return implode("&", $r);
+    }
+
+    public static function normalizeId($id)
+    {
+        if (is_array($id)) {
+            $params = $id;
+            $id = $params['id'];
+            unset($params['id']);
+        } else {
+            $params = [];
+        }
+        return [$id, $params];
+    }
 }
diff --git a/htdocs/includes/stripe/tests/AccountTest.php b/htdocs/includes/stripe/tests/AccountTest.php
deleted file mode 100644
index 994ba6f6a8a..00000000000
--- a/htdocs/includes/stripe/tests/AccountTest.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class AccountTest extends TestCase
-{
-    private function managedAccountResponse($id)
-    {
-        return array(
-            'id' => $id,
-            'currencies_supported' => array('usd', 'aed', 'afn', '...'),
-            'object' => 'account',
-            'business_name' => 'Stripe.com',
-            'bank_accounts' => array(
-                'object' => 'list',
-                'total_count' => 0,
-                'has_more' => false,
-                'url' => '/v1/accounts/' . $id . '/bank_accounts',
-                'data' => array()
-            ),
-            'verification' => array(
-                'fields_needed' => array(
-                    'product_description',
-                    'business_url',
-                    'support_phone',
-                    'bank_account',
-                    'tos_acceptance.ip',
-                    'tos_acceptance.date'
-                ),
-                'due_by' => null,
-                'contacted' => false
-            ),
-            'tos_acceptance' => array(
-                'ip' => null,
-                'date' => null,
-                'user_agent' => null
-            ),
-            'legal_entity' => array(
-                'type' => null,
-                'business_name' => null,
-                'address' => array(
-                    'line1' => null,
-                    'line2' => null,
-                    'city' => null,
-                    'state' => null,
-                    'postal_code' => null,
-                    'country' => 'US'
-                ),
-                'first_name' => null,
-                'last_name' => null,
-                'additional_owners' => null,
-                'verification' => array(
-                    'status' => 'unverified',
-                    'document' => null,
-                    'details' => null
-                )
-            )
-        );
-    }
-
-    private function deletedAccountResponse($id)
-    {
-        return array(
-            'id' => $id,
-            'deleted' => true
-        );
-    }
-
-    public function testBasicRetrieve()
-    {
-        $this->mockRequest('GET', '/v1/account', array(), $this->managedAccountResponse('acct_ABC'));
-        $account = Account::retrieve();
-        $this->assertSame($account->id, 'acct_ABC');
-    }
-
-    public function testIDRetrieve()
-    {
-        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->managedAccountResponse('acct_DEF'));
-        $account = Account::retrieve('acct_DEF');
-        $this->assertSame($account->id, 'acct_DEF');
-    }
-
-    public function testCreate()
-    {
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts',
-            array('managed' => 'true'),
-            $this->managedAccountResponse('acct_ABC')
-        );
-        $account = Account::create(array(
-            'managed' => true
-        ));
-        $this->assertSame($account->id, 'acct_ABC');
-    }
-
-    public function testDelete()
-    {
-        $account = self::createTestAccount();
-
-        $this->mockRequest(
-            'DELETE',
-            '/v1/accounts/' . $account->id,
-            array(),
-            $this->deletedAccountResponse('acct_ABC')
-        );
-        $deleted = $account->delete();
-        $this->assertSame($deleted->id, $account->id);
-        $this->assertTrue($deleted->deleted);
-    }
-
-    public function testReject()
-    {
-        $account = self::createTestAccount();
-
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/' . $account->id . '/reject',
-            array('reason' => 'fraud'),
-            $this->deletedAccountResponse('acct_ABC')
-        );
-        $rejected = $account->reject(array('reason' => 'fraud'));
-        $this->assertSame($rejected->id, $account->id);
-    }
-
-    public function testSaveLegalEntity()
-    {
-        $response = $this->managedAccountResponse('acct_ABC');
-        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
-
-        $response['legal_entity']['first_name'] = 'Bob';
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('first_name' => 'Bob')),
-            $response
-        );
-
-        $account = Account::create(array('managed' => true));
-        $account->legal_entity->first_name = 'Bob';
-        $account->save();
-
-        $this->assertSame('Bob', $account->legal_entity->first_name);
-    }
-
-    public function testUpdateLegalEntity()
-    {
-        $response = $this->managedAccountResponse('acct_ABC');
-        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
-
-        $response['legal_entity']['first_name'] = 'Bob';
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('first_name' => 'Bob')),
-            $response
-        );
-
-        $account = Account::create(array('managed' => true));
-        $account = Account::update($account['id'], array(
-          'legal_entity' => array(
-            'first_name' => 'Bob'
-          )
-        ));
-
-        $this->assertSame('Bob', $account->legal_entity->first_name);
-    }
-
-    public function testCreateAdditionalOwners()
-    {
-        $request = array(
-            'managed' => true,
-            'country' => 'GB',
-            'legal_entity' => array(
-                'additional_owners' => array(
-                    0 => array(
-                        'dob' => array(
-                            'day' => 12,
-                            'month' => 5,
-                            'year' => 1970,
-                        ),
-                        'first_name' => 'xgvukvfrde',
-                        'last_name' => 'rtcyvubhy',
-                    ),
-                    1 => array(
-                        'dob' => array(
-                            'day' => 8,
-                            'month' => 4,
-                            'year' => 1979,
-                        ),
-                        'first_name' => 'yutreuk',
-                        'last_name' => 'dfcgvhbjihmv',
-                    ),
-                ),
-            ),
-        );
-
-        $acct = Account::create($request);
-        $response = $acct->__toArray(true);
-
-        $req_ao = $request['legal_entity']['additional_owners'];
-        $resp_ao = $response['legal_entity']['additional_owners'];
-
-        $this->assertSame($req_ao[0]['dob'], $resp_ao[0]['dob']);
-        $this->assertSame($req_ao[1]['dob'], $resp_ao[1]['dob']);
-
-        $this->assertSame($req_ao[0]['first_name'], $resp_ao[0]['first_name']);
-        $this->assertSame($req_ao[1]['first_name'], $resp_ao[1]['first_name']);
-    }
-
-    public function testUpdateAdditionalOwners()
-    {
-        $response = $this->managedAccountResponse('acct_ABC');
-        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
-
-        $response['legal_entity']['additional_owners'] = array(array(
-            'first_name' => 'Bob',
-            'last_name' => null,
-            'address' => array(
-                'line1' => null,
-                'line2' => null,
-                'city' => null,
-                'state' => null,
-                'postal_code' => null,
-                'country' => null
-            ),
-            'verification' => array(
-                'status' => 'unverified',
-                'document' => null,
-                'details' => null
-            )
-        ));
-
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('additional_owners' => array(array('first_name' => 'Bob')))),
-            $response
-        );
-
-        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Smith';
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Smith')))),
-            $response
-        );
-
-        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Johnson')))),
-            $response
-        );
-
-        $response['legal_entity']['additional_owners'][0]['verification']['document'] = 'file_123';
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('additional_owners' => array(array('verification' => array('document' => 'file_123'))))),
-            $response
-        );
-
-        $response['legal_entity']['additional_owners'][1] = array(
-            'first_name' => 'Jane',
-            'last_name' => 'Doe'
-        );
-        $this->mockRequest(
-            'POST',
-            '/v1/accounts/acct_ABC',
-            array('legal_entity' => array('additional_owners' => array(1 => array('first_name' => 'Jane')))),
-            $response
-        );
-
-        $account = Account::create(array('managed' => true));
-        $account->legal_entity->additional_owners = array(array('first_name' => 'Bob'));
-        $account->save();
-        $this->assertSame(1, count($account->legal_entity->additional_owners));
-        $this->assertSame('Bob', $account->legal_entity->additional_owners[0]->first_name);
-
-        $account->legal_entity->additional_owners[0]->last_name = 'Smith';
-        $account->save();
-        $this->assertSame(1, count($account->legal_entity->additional_owners));
-        $this->assertSame('Smith', $account->legal_entity->additional_owners[0]->last_name);
-
-        $account['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
-        $account->save();
-        $this->assertSame(1, count($account->legal_entity->additional_owners));
-        $this->assertSame('Johnson', $account->legal_entity->additional_owners[0]->last_name);
-
-        $account->legal_entity->additional_owners[0]->verification->document = 'file_123';
-        $account->save();
-        $this->assertSame('file_123', $account->legal_entity->additional_owners[0]->verification->document);
-
-        $account->legal_entity->additional_owners[1] = array('first_name' => 'Jane');
-        $account->save();
-        $this->assertSame('Jane', $account->legal_entity->additional_owners[1]->first_name);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ApiRequestorTest.php b/htdocs/includes/stripe/tests/ApiRequestorTest.php
deleted file mode 100644
index 859fb63a347..00000000000
--- a/htdocs/includes/stripe/tests/ApiRequestorTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Stripe;
-
-use Stripe\HttpClient\CurlClient;
-
-class ApiRequestorTest extends TestCase
-{
-    public function testEncodeObjects()
-    {
-        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
-        $method = $reflector->getMethod('_encodeObjects');
-        $method->setAccessible(true);
-
-        $a = array('customer' => new Customer('abcd'));
-        $enc = $method->invoke(null, $a);
-        $this->assertSame($enc, array('customer' => 'abcd'));
-
-        // Preserves UTF-8
-        $v = array('customer' => "☃");
-        $enc = $method->invoke(null, $v);
-        $this->assertSame($enc, $v);
-
-        // Encodes latin-1 -> UTF-8
-        $v = array('customer' => "\xe9");
-        $enc = $method->invoke(null, $v);
-        $this->assertSame($enc, array('customer' => "\xc3\xa9"));
-    }
-
-    public function testHttpClientInjection()
-    {
-        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
-        $method = $reflector->getMethod('httpClient');
-        $method->setAccessible(true);
-
-        $curl = new CurlClient();
-        $curl->setTimeout(10);
-        ApiRequestor::setHttpClient($curl);
-
-        $injectedCurl = $method->invoke(new ApiRequestor());
-        $this->assertSame($injectedCurl, $curl);
-    }
-
-    public function testDefaultHeaders()
-    {
-        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
-        $method = $reflector->getMethod('_defaultHeaders');
-        $method->setAccessible(true);
-
-        // no way to stub static methods with PHPUnit 4.x :(
-        Stripe::setAppInfo('MyTestApp', '1.2.34', 'https://mytestapp.example');
-        $apiKey = 'sk_test_notarealkey';
-
-        $headers = $method->invoke(null, $apiKey);
-
-        $ua = json_decode($headers['X-Stripe-Client-User-Agent']);
-        $this->assertSame($ua->application->name, 'MyTestApp');
-        $this->assertSame($ua->application->version, '1.2.34');
-        $this->assertSame($ua->application->url, 'https://mytestapp.example');
-
-        $this->assertSame(
-            $headers['User-Agent'],
-            'Stripe/v1 PhpBindings/' . Stripe::VERSION . ' MyTestApp/1.2.34 (https://mytestapp.example)'
-        );
-
-        $this->assertSame($headers['Authorization'], 'Bearer ' . $apiKey);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ApplePayDomainTest.php b/htdocs/includes/stripe/tests/ApplePayDomainTest.php
deleted file mode 100644
index ebb3e7cfa9d..00000000000
--- a/htdocs/includes/stripe/tests/ApplePayDomainTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ApplePayDomainTest extends TestCase
-{
-    public function testCreation()
-    {
-        $this->mockRequest(
-            'POST',
-            '/v1/apple_pay/domains',
-            array('domain_name' => 'test.com'),
-            array(
-                'id' => 'apwc_create',
-                'object' => 'apple_pay_domain'
-            )
-        );
-        $d = ApplePayDomain::create(array(
-            'domain_name' => 'test.com'
-        ));
-        $this->assertSame('apwc_create', $d->id);
-        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
-    }
-
-    public function testRetrieve()
-    {
-        $this->mockRequest(
-            'GET',
-            '/v1/apple_pay/domains/apwc_retrieve',
-            array(),
-            array(
-                'id' => 'apwc_retrieve',
-                'object' => 'apple_pay_domain'
-            )
-        );
-        $d = ApplePayDomain::retrieve('apwc_retrieve');
-        $this->assertSame('apwc_retrieve', $d->id);
-        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
-    }
-
-    public function testDeletion()
-    {
-        self::authorizeFromEnv();
-        $d = ApplePayDomain::create(array(
-            'domain_name' => 'jackshack.website'
-        ));
-        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
-        $this->mockRequest(
-            'DELETE',
-            '/v1/apple_pay/domains/' . $d->id,
-            array(),
-            array('deleted' => true)
-        );
-        $d->delete();
-        $this->assertTrue($d->deleted);
-    }
-
-    public function testList()
-    {
-        $this->mockRequest(
-            'GET',
-            '/v1/apple_pay/domains',
-            array(),
-            array(
-                'url' => '/v1/apple_pay/domains',
-                'object' => 'list'
-            )
-        );
-        $all = ApplePayDomain::all();
-        $this->assertSame($all->url, '/v1/apple_pay/domains');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php b/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
deleted file mode 100644
index b8d266ad1eb..00000000000
--- a/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ApplicationFeeRefundTest extends TestCase
-{
-    public function testUrls()
-    {
-        $refund = new ApplicationFeeRefund();
-        $refund->id = 'refund_id';
-        $refund->fee = 'fee_id';
-
-        $this->assertSame(
-            $refund->instanceUrl(),
-            '/v1/application_fees/fee_id/refunds/refund_id'
-        );
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeTest.php b/htdocs/includes/stripe/tests/ApplicationFeeTest.php
deleted file mode 100644
index fe6df923084..00000000000
--- a/htdocs/includes/stripe/tests/ApplicationFeeTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ApplicationFeeTest extends TestCase
-{
-    public function testUrls()
-    {
-        $applicationFee = new ApplicationFee('abcd/efgh');
-        $this->assertSame(
-            $applicationFee->instanceUrl(),
-            '/v1/application_fees/abcd%2Fefgh'
-        );
-    }
-
-    public function testList()
-    {
-        self::authorizeFromEnv();
-        $d = ApplicationFee::all();
-        $this->assertSame($d->url, '/v1/application_fees');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/AuthenticationErrorTest.php b/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
deleted file mode 100644
index 1003d6990c8..00000000000
--- a/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class AuthenticationErrorTest extends TestCase
-{
-    public function testInvalidCredentials()
-    {
-        Stripe::setApiKey('invalid');
-        try {
-            Customer::create();
-        } catch (Error\Authentication $e) {
-            $this->assertSame(401, $e->getHttpStatus());
-        }
-    }
-}
diff --git a/htdocs/includes/stripe/tests/BalanceTest.php b/htdocs/includes/stripe/tests/BalanceTest.php
deleted file mode 100644
index 3d6a2a668f0..00000000000
--- a/htdocs/includes/stripe/tests/BalanceTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class BalanceTest extends TestCase
-{
-    public function testRetrieve()
-    {
-        self::authorizeFromEnv();
-        $d = Balance::retrieve();
-        $this->assertSame($d->object, "balance");
-        $this->assertTrue(Util\Util::isList($d->available));
-        $this->assertTrue(Util\Util::isList($d->pending));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/BalanceTransactionTest.php b/htdocs/includes/stripe/tests/BalanceTransactionTest.php
deleted file mode 100644
index b196a288014..00000000000
--- a/htdocs/includes/stripe/tests/BalanceTransactionTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class BalanceTransactionTest extends TestCase
-{
-    public function testList()
-    {
-        self::authorizeFromEnv();
-        $d = BalanceTransaction::all();
-        $this->assertSame($d->url, '/v1/balance/history');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/BankAccountTest.php b/htdocs/includes/stripe/tests/BankAccountTest.php
deleted file mode 100644
index 285078f00ad..00000000000
--- a/htdocs/includes/stripe/tests/BankAccountTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class BankAccountTest extends TestCase
-{
-    public function testVerify()
-    {
-        self::authorizeFromEnv();
-
-        $customer = self::createTestCustomer();
-
-        $bankAccount = $customer->sources->create(array(
-            'source' => array(
-                'object' => 'bank_account',
-                'account_holder_type' => 'individual',
-                'account_number' => '000123456789',
-                'account_holder_name' => 'John Doe',
-                'routing_number' => '110000000',
-                'country' => 'US'
-            )
-        ));
-
-        $this->assertSame($bankAccount->status, 'new');
-
-        $bankAccount = $bankAccount->verify(array(
-            'amounts' => array(32, 45)
-        ));
-
-        $this->assertSame($bankAccount->status, 'verified');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/BitcoinReceiverTest.php b/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
deleted file mode 100644
index fc71cf973a5..00000000000
--- a/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class BitcoinReceiverTest extends TestCase
-{
-    public function testUrls()
-    {
-        $classUrl = BitcoinReceiver::classUrl('Stripe_BitcoinReceiver');
-        $this->assertSame($classUrl, '/v1/bitcoin/receivers');
-        $receiver = new BitcoinReceiver('abcd/efgh');
-        $instanceUrl = $receiver->instanceUrl();
-        $this->assertSame($instanceUrl, '/v1/bitcoin/receivers/abcd%2Fefgh');
-    }
-
-    public function testCreate()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $this->assertSame(100, $receiver->amount);
-        $this->assertNotNull($receiver->id);
-    }
-
-    public function testRetrieve()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $r = BitcoinReceiver::retrieve($receiver->id);
-        $this->assertSame($receiver->id, $r->id);
-
-        $this->assertInstanceOf('Stripe\\BitcoinTransaction', $r->transactions->data[0]);
-    }
-
-    public function testList()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $receivers = BitcoinReceiver::all();
-        $this->assertGreaterThan(0, count($receivers->data));
-    }
-
-    public function testListTransactions()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-        $this->assertSame(0, count($receiver->transactions->data));
-
-        $transactions = $receiver->transactions->all(array("limit" => 1));
-        $this->assertSame(1, count($transactions->data));
-    }
-
-    public function testDeleteWithCustomer()
-    {
-        self::authorizeFromEnv();
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-        $customer = Customer::create(array("source" => $receiver->id));
-        $charge = Charge::create(array(
-            "customer" => $customer->id,
-            "amount" => $receiver->amount,
-            "currency" => $receiver->currency
-        ));
-        $receiver = BitcoinReceiver::retrieve($receiver->id);
-        $response = $receiver->delete();
-        $this->assertTrue($response->deleted);
-    }
-
-    public function testUpdateWithCustomer()
-    {
-        self::authorizeFromEnv();
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-        $customer = Customer::create(array("source" => $receiver->id));
-        $receiver = BitcoinReceiver::retrieve($receiver->id);
-
-        $receiver->description = "a new description";
-        $receiver->save();
-
-        $base = Customer::classUrl();
-        $parentExtn = $receiver['customer'];
-        $extn = $receiver['id'];
-        $this->assertEquals("$base/$parentExtn/sources/$extn", $receiver->instanceUrl());
-
-        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
-        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
-    }
-
-    public function testUpdateWithoutCustomer()
-    {
-        self::authorizeFromEnv();
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $receiver->description = "a new description";
-        $receiver->save();
-
-        $this->assertEquals(BitcoinReceiver::classUrl() . "/" . $receiver['id'], $receiver->instanceUrl());
-
-        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
-        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
-    }
-
-    public function testRefund()
-    {
-        self::authorizeFromEnv();
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $receiver = BitcoinReceiver::retrieve($receiver->id);
-        $this->assertNull($receiver->refund_address);
-
-        $refundAddress = "REFUNDHERE";
-        $receiver->refund(array("refund_address" => $refundAddress));
-
-        $this->assertSame($refundAddress, $receiver->refund_address);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CardErrorTest.php b/htdocs/includes/stripe/tests/CardErrorTest.php
deleted file mode 100644
index a0de752e512..00000000000
--- a/htdocs/includes/stripe/tests/CardErrorTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class CardErrorTest extends TestCase
-{
-    public function testDecline()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4000000000000002',
-            'exp_month' => '3',
-            'exp_year' => '2020'
-        );
-
-        $charge = array(
-            'amount' => 100,
-            'currency' => 'usd',
-            'card' => $card
-        );
-
-        try {
-            Charge::create($charge);
-        } catch (Error\Card $e) {
-            $this->assertSame(402, $e->getHttpStatus());
-            $this->assertTrue(strpos($e->getRequestId(), "req_") === 0, $e->getRequestId());
-            $actual = $e->getJsonBody();
-            $this->assertSame(
-                array('error' => array(
-                    'message' => 'Your card was declined.',
-                    'type' => 'card_error',
-                    'code' => 'card_declined',
-                    'decline_code' => 'generic_decline',
-                    'charge' => $actual['error']['charge'],
-                )),
-                $actual
-            );
-        }
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ChargeTest.php b/htdocs/includes/stripe/tests/ChargeTest.php
deleted file mode 100644
index 6ec0fa1f1d4..00000000000
--- a/htdocs/includes/stripe/tests/ChargeTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ChargeTest extends TestCase
-{
-    public function testUrls()
-    {
-        $this->assertSame(Charge::classUrl(), '/v1/charges');
-        $charge = new Charge('abcd/efgh');
-        $this->assertSame($charge->instanceUrl(), '/v1/charges/abcd%2Fefgh');
-    }
-
-    public function testCreate()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $c = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-        $this->assertTrue($c->paid);
-        $this->assertFalse($c->refunded);
-    }
-
-    public function testIdempotentCreate()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $c = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            ),
-            array(
-                'idempotency_key' => self::generateRandomString(),
-            )
-        );
-
-        $this->assertTrue($c->paid);
-        $this->assertSame(200, $c->getLastResponse()->code);
-    }
-
-    public function testRetrieve()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $c = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-        $d = Charge::retrieve($c->id);
-        $this->assertSame(200, $d->getLastResponse()->code);
-        $this->assertSame($d->id, $c->id);
-    }
-
-    public function testUpdateMetadata()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $charge = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-
-        $charge->metadata['test'] = 'foo bar';
-        $charge->save();
-
-        $updatedCharge = Charge::retrieve($charge->id);
-        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
-    }
-
-    public function testUpdateMetadataAll()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $charge = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-
-        $charge->metadata = array('test' => 'foo bar');
-        $charge->save();
-        $this->assertSame(200, $charge->getLastResponse()->code);
-
-        $updatedCharge = Charge::retrieve($charge->id);
-        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
-    }
-
-    public function testMarkAsFraudulent()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $charge = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-
-        $charge->refunds->create();
-        $charge->markAsFraudulent();
-
-        $updatedCharge = Charge::retrieve($charge->id);
-        $this->assertSame(
-            'fraudulent',
-            $updatedCharge['fraud_details']['user_report']
-        );
-    }
-
-    public function testCreateWithBitcoinReceiverSource()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $charge = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'source' => $receiver->id
-            )
-        );
-
-        $this->assertSame($receiver->id, $charge->source->id);
-        $this->assertSame("bitcoin_receiver", $charge->source->object);
-        $this->assertSame("succeeded", $charge->status);
-        $this->assertInstanceOf('Stripe\\BitcoinReceiver', $charge->source);
-    }
-
-    public function markAsSafe()
-    {
-        self::authorizeFromEnv();
-
-        $card = array(
-            'number' => '4242424242424242',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $charge = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-
-        $charge->markAsSafe();
-
-        $updatedCharge = Charge::retrieve($charge->id);
-        $this->assertSame('safe', $updatedCharge['fraud_details']['user_report']);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CollectionTest.php b/htdocs/includes/stripe/tests/CollectionTest.php
deleted file mode 100644
index f8f923ff00d..00000000000
--- a/htdocs/includes/stripe/tests/CollectionTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class CollectionTest extends TestCase
-{
-    private function pageableModelResponse($ids, $hasMore)
-    {
-        $data = array();
-        foreach ($ids as $id) {
-            array_push($data, array(
-                'id' => $id,
-                'object' => 'pageablemodel'
-            ));
-        }
-        return array(
-            'object' => 'list',
-            'url' => '/v1/pageablemodels',
-            'data' => $data,
-            'has_more' => $hasMore
-        );
-    }
-
-    public function testAutoPagingOnePage()
-    {
-        $collection = Collection::constructFrom(
-            $this->pageableModelResponse(array('pm_123', 'pm_124'), false),
-            new Util\RequestOptions()
-        );
-
-        $seen = array();
-        foreach ($collection->autoPagingIterator() as $item) {
-            array_push($seen, $item['id']);
-        }
-
-        $this->assertSame($seen, array('pm_123', 'pm_124'));
-    }
-
-    public function testAutoPagingThreePages()
-    {
-        $collection = Collection::constructFrom(
-            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
-            new Util\RequestOptions()
-        );
-        $collection->setRequestParams(array('foo' => 'bar'));
-
-        $this->mockRequest(
-            'GET',
-            '/v1/pageablemodels',
-            array(
-                  'foo' => 'bar',
-                  'starting_after' => 'pm_124'
-            ),
-            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/pageablemodels',
-            array(
-                  'foo' => 'bar',
-                  'starting_after' => 'pm_126'
-            ),
-            $this->pageableModelResponse(array('pm_127'), false)
-        );
-
-        $seen = array();
-        foreach ($collection->autoPagingIterator() as $item) {
-            array_push($seen, $item['id']);
-        }
-
-        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
-    }
-
-    public function testIteratorToArray()
-    {
-        $collection = Collection::constructFrom(
-            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
-            new Util\RequestOptions()
-        );
-
-        $this->mockRequest(
-            'GET',
-            '/v1/pageablemodels',
-            array(
-                  'starting_after' => 'pm_124'
-            ),
-            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/pageablemodels',
-            array(
-                  'starting_after' => 'pm_126'
-            ),
-            $this->pageableModelResponse(array('pm_127'), false)
-        );
-
-        $seen = array();
-        foreach (iterator_to_array($collection->autoPagingIterator()) as $item) {
-            array_push($seen, $item['id']);
-        }
-
-        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CountrySpecTest.php b/htdocs/includes/stripe/tests/CountrySpecTest.php
deleted file mode 100644
index 19dc37062e5..00000000000
--- a/htdocs/includes/stripe/tests/CountrySpecTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class CountrySpecTest extends TestCase
-{
-    public function testRetrieve()
-    {
-        self::authorizeFromEnv();
-
-        $country = "US";
-        $d = CountrySpec::retrieve($country);
-        $this->assertSame($d->object, "country_spec");
-        $this->assertSame($d->id, $country);
-        $this->assertGreaterThan(0, count($d->supported_bank_account_currencies));
-        $this->assertGreaterThan(0, count($d->supported_payment_currencies));
-        $this->assertGreaterThan(0, count($d->supported_payment_methods));
-        $this->assertGreaterThan(0, count($d->verification_fields));
-    }
-
-    public function testList()
-    {
-        self::authorizeFromEnv();
-
-        $d = CountrySpec::all();
-        $this->assertSame($d->object, "list");
-        $this->assertGreaterThan(0, count($d->data));
-        $this->assertSame($d->data[0]->object, "country_spec");
-        $this->assertInstanceOf("Stripe\\CountrySpec", $d->data[0]);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CouponTest.php b/htdocs/includes/stripe/tests/CouponTest.php
deleted file mode 100644
index d23163e338e..00000000000
--- a/htdocs/includes/stripe/tests/CouponTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class CouponTest extends TestCase
-{
-    public function testSave()
-    {
-        self::authorizeFromEnv();
-        $id = 'test_coupon-' . self::generateRandomString(20);
-        $c = Coupon::create(
-            array(
-                'percent_off' => 25,
-                'duration' => 'repeating',
-                'duration_in_months' => 5,
-                'id' => $id,
-            )
-        );
-        $this->assertSame($id, $c->id);
-        // @codingStandardsIgnoreStart
-        $this->assertSame(25, $c->percent_off);
-        // @codingStandardsIgnoreEnd
-        $c->metadata['foo'] = 'bar';
-        $c->save();
-
-        $stripeCoupon = Coupon::retrieve($id);
-        $this->assertEquals($c->metadata, $stripeCoupon->metadata);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CurlClientTest.php b/htdocs/includes/stripe/tests/CurlClientTest.php
deleted file mode 100644
index 864607f088c..00000000000
--- a/htdocs/includes/stripe/tests/CurlClientTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Stripe;
-
-use Stripe\HttpClient\CurlClient;
-
-class CurlClientTest extends TestCase
-{
-    public function testTimeout()
-    {
-        $curl = new CurlClient();
-        $this->assertSame(CurlClient::DEFAULT_TIMEOUT, $curl->getTimeout());
-        $this->assertSame(CurlClient::DEFAULT_CONNECT_TIMEOUT, $curl->getConnectTimeout());
-
-        // implicitly tests whether we're returning the CurlClient instance
-        $curl = $curl->setConnectTimeout(1)->setTimeout(10);
-        $this->assertSame(1, $curl->getConnectTimeout());
-        $this->assertSame(10, $curl->getTimeout());
-
-        $curl->setTimeout(-1);
-        $curl->setConnectTimeout(-999);
-        $this->assertSame(0, $curl->getTimeout());
-        $this->assertSame(0, $curl->getConnectTimeout());
-    }
-
-    public function testDefaultOptions()
-    {
-        // make sure options array loads/saves properly
-        $optionsArray = array(CURLOPT_PROXY => 'localhost:80');
-        $withOptionsArray = new CurlClient($optionsArray);
-        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
-
-        // make sure closure-based options work properly, including argument passing
-        $ref = null;
-        $withClosure = new CurlClient(function ($method, $absUrl, $headers, $params, $hasFile) use (&$ref) {
-            $ref = func_get_args();
-            return array();
-        });
-
-        $withClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
-        $this->assertSame($ref, array('get', 'https://httpbin.org/status/200', array(), array(), false));
-
-        // this is the last test case that will run, since it'll throw an exception at the end
-        $withBadClosure = new CurlClient(function () {
-            return 'thisShouldNotWork';
-        });
-        $this->setExpectedException('Stripe\Error\Api', "Non-array value returned by defaultOptions CurlClient callback");
-        $withBadClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
-    }
-
-    public function testEncode()
-    {
-        $a = array(
-            'my' => 'value',
-            'that' => array('your' => 'example'),
-            'bar' => 1,
-            'baz' => null
-        );
-
-        $enc = CurlClient::encode($a);
-        $this->assertSame('my=value&that%5Byour%5D=example&bar=1', $enc);
-
-        $a = array('that' => array('your' => 'example', 'foo' => null));
-        $enc = CurlClient::encode($a);
-        $this->assertSame('that%5Byour%5D=example', $enc);
-
-        $a = array('that' => 'example', 'foo' => array('bar', 'baz'));
-        $enc = CurlClient::encode($a);
-        $this->assertSame('that=example&foo%5B%5D=bar&foo%5B%5D=baz', $enc);
-
-        $a = array(
-            'my' => 'value',
-            'that' => array('your' => array('cheese', 'whiz', null)),
-            'bar' => 1,
-            'baz' => null
-        );
-
-        $enc = CurlClient::encode($a);
-        $expected = 'my=value&that%5Byour%5D%5B%5D=cheese'
-              . '&that%5Byour%5D%5B%5D=whiz&bar=1';
-        $this->assertSame($expected, $enc);
-
-        // Ignores an empty array
-        $enc = CurlClient::encode(array('foo' => array(), 'bar' => 'baz'));
-        $expected = 'bar=baz';
-        $this->assertSame($expected, $enc);
-
-        $a = array('foo' => array(array('bar' => 'baz'), array('bar' => 'bin')));
-        $enc = CurlClient::encode($a);
-        $this->assertSame('foo%5B0%5D%5Bbar%5D=baz&foo%5B1%5D%5Bbar%5D=bin', $enc);
-    }
-
-    public function testSslOption()
-    {
-        // make sure options array loads/saves properly
-        $optionsArray = array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1);
-        $withOptionsArray = new CurlClient($optionsArray);
-        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/CustomerTest.php b/htdocs/includes/stripe/tests/CustomerTest.php
deleted file mode 100644
index 606536ee86f..00000000000
--- a/htdocs/includes/stripe/tests/CustomerTest.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class CustomerTest extends TestCase
-{
-    public function testDeletion()
-    {
-        $customer = self::createTestCustomer();
-        $customer->delete();
-
-        $this->assertTrue($customer->deleted);
-        $this->assertNull($customer['active_card']);
-    }
-
-    public function testSave()
-    {
-        $customer = self::createTestCustomer();
-
-        $customer->email = 'gdb@stripe.com';
-        $customer->save();
-        $this->assertSame($customer->email, 'gdb@stripe.com');
-
-        $stripeCustomer = Customer::retrieve($customer->id);
-        $this->assertSame($customer->email, $stripeCustomer->email);
-
-        Stripe::setApiKey(null);
-        $customer = Customer::create(null, self::API_KEY);
-        $customer->email = 'gdb@stripe.com';
-        $customer->save();
-
-        self::authorizeFromEnv();
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame($updatedCustomer->email, 'gdb@stripe.com');
-    }
-
-    /**
-     * @expectedException Stripe\Error\InvalidRequest
-     */
-    public function testBogusAttribute()
-    {
-        $customer = self::createTestCustomer();
-        $customer->bogus = 'bogus';
-        $customer->save();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testUpdateDescriptionEmpty()
-    {
-        $customer = self::createTestCustomer();
-        $customer->description = '';
-    }
-
-    public function testUpdateDescriptionNull()
-    {
-        $customer = self::createTestCustomer(array('description' => 'foo bar'));
-        $customer->description = null;
-
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame(null, $updatedCustomer->description);
-    }
-
-    public function testUpdateMetadata()
-    {
-        $customer = self::createTestCustomer();
-
-        $customer->metadata['test'] = 'foo bar';
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame('foo bar', $updatedCustomer->metadata['test']);
-    }
-
-    public function testDeleteMetadata()
-    {
-        $customer = self::createTestCustomer();
-
-        $customer->metadata = null;
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame(0, count($updatedCustomer->metadata->keys()));
-    }
-
-    public function testUpdateSomeMetadata()
-    {
-        $customer = self::createTestCustomer();
-        $customer->metadata['shoe size'] = '7';
-        $customer->metadata['shirt size'] = 'XS';
-        $customer->save();
-
-        $customer->metadata['shoe size'] = '9';
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame('XS', $updatedCustomer->metadata['shirt size']);
-        $this->assertSame('9', $updatedCustomer->metadata['shoe size']);
-    }
-
-    public function testUpdateAllMetadata()
-    {
-        $customer = self::createTestCustomer();
-        $customer->metadata['shoe size'] = '7';
-        $customer->metadata['shirt size'] = 'XS';
-        $customer->save();
-
-        $customer->metadata = array('shirt size' => 'XL');
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $this->assertSame('XL', $updatedCustomer->metadata['shirt size']);
-        $this->assertFalse(isset($updatedCustomer->metadata['shoe size']));
-    }
-
-    /**
-     * @expectedException Stripe\Error\InvalidRequest
-     */
-    public function testUpdateInvalidMetadata()
-    {
-        $customer = self::createTestCustomer();
-        $customer->metadata = 'something';
-        $customer->save();
-    }
-
-    public function testCancelSubscription()
-    {
-        $planID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($planID);
-
-        $customer = self::createTestCustomer(
-            array(
-                'plan' => $planID,
-            )
-        );
-
-        $customer->cancelSubscription(array('at_period_end' => true));
-        $this->assertSame($customer->subscription->status, 'active');
-        $this->assertTrue($customer->subscription->cancel_at_period_end);
-        $customer->cancelSubscription();
-        $this->assertSame($customer->subscription->status, 'canceled');
-    }
-
-    public function testCustomerAddCard()
-    {
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4242424242424242",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $customer = $this->createTestCustomer();
-        $createdCard = $customer->sources->create(array("card" => $token->id));
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedCards = $updatedCustomer->sources->all();
-        $this->assertSame(count($updatedCards["data"]), 2);
-    }
-
-    public function testCustomerUpdateCard()
-    {
-        $customer = $this->createTestCustomer();
-        $customer->save();
-
-        $sources = $customer->sources->all();
-        $this->assertSame(count($sources["data"]), 1);
-
-        $card = $sources['data'][0];
-        $card->name = "Jane Austen";
-        $card->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedCards = $updatedCustomer->sources->all();
-        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
-    }
-
-    public function testCustomerDeleteCard()
-    {
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4242424242424242",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $customer = $this->createTestCustomer();
-        $createdCard = $customer->sources->create(array("card" => $token->id));
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedCards = $updatedCustomer->sources->all();
-        $this->assertSame(count($updatedCards["data"]), 2);
-
-        $deleteStatus = $updatedCustomer->sources->retrieve($createdCard->id)->delete();
-        $this->assertTrue($deleteStatus->deleted);
-        $updatedCustomer->save();
-
-        $postDeleteCustomer = Customer::retrieve($customer->id);
-        $postDeleteCards = $postDeleteCustomer->sources->all();
-        $this->assertSame(count($postDeleteCards["data"]), 1);
-    }
-
-    public function testCustomerAddSource()
-    {
-        self::authorizeFromEnv();
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4242424242424242",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $customer = $this->createTestCustomer();
-        $createdSource = $customer->sources->create(array("source" => $token->id));
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedSources = $updatedCustomer->sources->all();
-        $this->assertSame(count($updatedSources["data"]), 2);
-    }
-
-    public function testCustomerUpdateSource()
-    {
-        $customer = $this->createTestCustomer();
-        $customer->save();
-
-        $sources = $customer->sources->all();
-        $this->assertSame(count($sources["data"]), 1);
-
-        $source = $sources['data'][0];
-        $source->name = "Jane Austen";
-        $source->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedSources = $updatedCustomer->sources->all();
-        $this->assertSame($updatedSources["data"][0]->name, "Jane Austen");
-    }
-
-    public function testCustomerDeleteSource()
-    {
-        self::authorizeFromEnv();
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4242424242424242",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $customer = $this->createTestCustomer();
-        $createdSource = $customer->sources->create(array("source" => $token->id));
-        $customer->save();
-
-        $updatedCustomer = Customer::retrieve($customer->id);
-        $updatedSources = $updatedCustomer->sources->all();
-        $this->assertSame(count($updatedSources["data"]), 2);
-
-        $deleteStatus = $updatedCustomer->sources->retrieve($createdSource->id)->delete();
-        $this->assertTrue($deleteStatus->deleted);
-        $updatedCustomer->save();
-
-        $postDeleteCustomer = Customer::retrieve($customer->id);
-        $postDeleteSources = $postDeleteCustomer->sources->all();
-        $this->assertSame(count($postDeleteSources["data"]), 1);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/DiscountTest.php b/htdocs/includes/stripe/tests/DiscountTest.php
deleted file mode 100644
index 1e77029ad2d..00000000000
--- a/htdocs/includes/stripe/tests/DiscountTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class DiscountTest extends TestCase
-{
-    public function testDeletion()
-    {
-        self::authorizeFromEnv();
-        $id = 'test-coupon-' . self::generateRandomString(20);
-        $coupon = Coupon::create(
-            array(
-                'percent_off' => 25,
-                'duration' => 'repeating',
-                'duration_in_months' => 5,
-                'id' => $id,
-            )
-        );
-        $customer = self::createTestCustomer(array('coupon' => $id));
-
-        $this->assertTrue(isset($customer->discount));
-        $this->assertTrue(isset($customer->discount->coupon));
-        $this->assertSame($id, $customer->discount->coupon->id);
-
-        $customer->deleteDiscount();
-        $this->assertFalse(isset($customer->discount));
-
-        $customer = Customer::retrieve($customer->id);
-        $this->assertFalse(isset($customer->discount));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/DisputeTest.php b/htdocs/includes/stripe/tests/DisputeTest.php
deleted file mode 100644
index 3c4f29678ea..00000000000
--- a/htdocs/includes/stripe/tests/DisputeTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class DisputeTest extends TestCase
-{
-    public function testUrls()
-    {
-        $this->assertSame(Dispute::classUrl(), '/v1/disputes');
-        $dispute = new Dispute('dp_123');
-        $this->assertSame($dispute->instanceUrl(), '/v1/disputes/dp_123');
-    }
-
-    private function createDisputedCharge()
-    {
-        $card = array(
-            'number' => '4000000000000259',
-            'exp_month' => 5,
-            'exp_year' => date('Y') + 1
-        );
-
-        $c = Charge::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'card' => $card
-            )
-        );
-        $c = Charge::retrieve($c->id);
-
-        $attempts = 0;
-
-        while ($c->dispute === null) {
-            if ($attempts > 5) {
-                throw new \Exception("Charge is taking too long to be disputed");
-            }
-            sleep(1);
-            $c = Charge::retrieve($c->id);
-            $attempts += 1;
-        }
-
-        return $c;
-    }
-
-    public function testAll()
-    {
-        self::authorizeFromEnv();
-
-        $sublist = Dispute::all(
-            array(
-                'limit' => 3,
-            )
-        );
-        $this->assertSame(3, count($sublist->data));
-    }
-
-
-    public function testUpdate()
-    {
-        self::authorizeFromEnv();
-
-        $c = $this->createDisputedCharge();
-
-        $d = Dispute::retrieve($c->dispute);
-        $d->evidence["customer_name"] = "Bob";
-        $s = $d->save();
-
-        $this->assertSame($c->dispute, $s->id);
-        $this->assertSame("Bob", $s->evidence["customer_name"]);
-    }
-
-    public function testClose()
-    {
-        self::authorizeFromEnv();
-
-        $c = $this->createDisputedCharge();
-        $d = Dispute::retrieve($c->dispute);
-
-        $this->assertNotSame("lost", $d->status);
-
-        $d->close();
-
-        $this->assertSame("lost", $d->status);
-    }
-
-    public function testRetrieve()
-    {
-        self::authorizeFromEnv();
-
-        $c = $this->createDisputedCharge();
-
-        $d = Dispute::retrieve($c->dispute);
-
-        $this->assertSame($c->dispute, $d->id);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ErrorTest.php b/htdocs/includes/stripe/tests/ErrorTest.php
deleted file mode 100644
index 75362427510..00000000000
--- a/htdocs/includes/stripe/tests/ErrorTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ErrorTest extends TestCase
-{
-    public function testCreation()
-    {
-        try {
-            throw new Error\Api(
-                "hello",
-                500,
-                "{'foo':'bar'}",
-                array('foo' => 'bar')
-            );
-            $this->fail("Did not raise error");
-        } catch (Error\Api $e) {
-            $this->assertSame("hello", $e->getMessage());
-            $this->assertSame(500, $e->getHttpStatus());
-            $this->assertSame("{'foo':'bar'}", $e->getHttpBody());
-            $this->assertSame(array('foo' => 'bar'), $e->getJsonBody());
-            $this->assertSame(null, $e->getHttpHeaders());
-            $this->assertSame(null, $e->getRequestId());
-        }
-    }
-
-    public function testResponseHeaders()
-    {
-        try {
-            throw new Error\Api(
-                "hello",
-                500,
-                "{'foo':'bar'}",
-                array('foo' => 'bar'),
-                array('Request-Id' => 'req_bar')
-            );
-            $this->fail("Did not raise error");
-        } catch (Error\Api $e) {
-            $this->assertSame(array('Request-Id' => 'req_bar'), $e->getHttpHeaders());
-            $this->assertSame('req_bar', $e->getRequestId());
-        }
-    }
-
-    public function testCode()
-    {
-        try {
-            throw new Error\Card(
-                "hello",
-                "some_param",
-                "some_code",
-                400,
-                "{'foo':'bar'}",
-                array('foo' => 'bar')
-            );
-            $this->fail("Did not raise error");
-        } catch (Error\Card $e) {
-            $this->assertSame("some_param", $e->getStripeParam());
-            $this->assertSame('some_code', $e->getStripeCode());
-        }
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ExternalAccountTest.php b/htdocs/includes/stripe/tests/ExternalAccountTest.php
deleted file mode 100644
index 70c0068bc45..00000000000
--- a/htdocs/includes/stripe/tests/ExternalAccountTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ExternalAccountTest extends TestCase
-{
-    public function testVerify()
-    {
-        self::authorizeFromEnv();
-        $bankAccountToken = Token::create(
-            array(
-                'bank_account' => array(
-                'country' => 'US',
-                'routing_number' => '110000000',
-                'account_number' => '000123456789',
-                'account_holder_name' => 'Jane Austen',
-                'account_holder_type' => 'company'
-                )
-            )
-        );
-        $customer = Customer::create();
-        $externalAccount = $customer->sources->create(array('bank_account' => $bankAccountToken->id));
-        $verifiedAccount = $externalAccount->verify(array('amounts' => array(32, 45)), null);
-
-        $base = Customer::classUrl();
-        $parentExtn = $externalAccount['customer'];
-        $extn = $externalAccount['id'];
-        $this->assertEquals("$base/$parentExtn/sources/$extn", $externalAccount->instanceUrl());
-    }
-}
diff --git a/htdocs/includes/stripe/tests/FileUploadTest.php b/htdocs/includes/stripe/tests/FileUploadTest.php
deleted file mode 100644
index 7d1faf3b00f..00000000000
--- a/htdocs/includes/stripe/tests/FileUploadTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class FileUploadTest extends TestCase
-{
-    public function testCreateFile()
-    {
-        $fp = fopen(dirname(__FILE__).'/../data/test.png', 'r');
-        self::authorizeFromEnv();
-        $file = FileUpload::create(
-            array(
-                'purpose' => 'dispute_evidence',
-                'file' => $fp,
-            )
-        );
-        fclose($fp);
-        $this->assertSame(95, $file->size);
-        $this->assertSame('png', $file->type);
-    }
-
-    public function testCreateAndRetrieveCurlFile()
-    {
-        if (!class_exists('\CurlFile', false)) {
-            // Older PHP versions don't support this
-            return;
-        }
-
-        $curlFile = new \CurlFile(dirname(__FILE__).'/../data/test.png');
-        self::authorizeFromEnv();
-        $file = FileUpload::create(
-            array(
-                'purpose' => 'dispute_evidence',
-                'file' => $curlFile,
-            )
-        );
-        $this->assertSame(95, $file->size);
-        $this->assertSame('png', $file->type);
-
-        // Just check that we don't get exceptions
-        $file = FileUpload::retrieve($file->id);
-        $file->refresh();
-    }
-}
diff --git a/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php b/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
deleted file mode 100644
index 6cc6d682911..00000000000
--- a/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class InvalidRequestErrorTest extends TestCase
-{
-    public function testInvalidObject()
-    {
-        self::authorizeFromEnv();
-        try {
-            Customer::retrieve('invalid');
-        } catch (Error\InvalidRequest $e) {
-            $this->assertSame(404, $e->getHttpStatus());
-        }
-    }
-
-    public function testBadData()
-    {
-        self::authorizeFromEnv();
-        try {
-            Charge::create();
-        } catch (Error\InvalidRequest $e) {
-            $this->assertSame(400, $e->getHttpStatus());
-        }
-    }
-}
diff --git a/htdocs/includes/stripe/tests/InvoiceTest.php b/htdocs/includes/stripe/tests/InvoiceTest.php
deleted file mode 100644
index a55ab83e4ac..00000000000
--- a/htdocs/includes/stripe/tests/InvoiceTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class InvoiceTest extends TestCase
-{
-    public function testUpcoming()
-    {
-        self::authorizeFromEnv();
-        $customer = self::createTestCustomer();
-
-        InvoiceItem::create(array(
-            'customer'  => $customer->id,
-            'amount'    => 0,
-            'currency'  => 'usd',
-        ));
-
-        $invoice = Invoice::upcoming(array(
-            'customer' => $customer->id,
-        ));
-        $this->assertSame($invoice->customer, $customer->id);
-        $this->assertSame($invoice->attempted, false);
-    }
-
-    public function testItemsAccessWithParameter()
-    {
-        self::authorizeFromEnv();
-        $customer = self::createTestCustomer();
-
-        InvoiceItem::create(array(
-            'customer'  => $customer->id,
-            'amount'    => 100,
-            'currency'  => 'usd',
-        ));
-
-        $invoice = Invoice::upcoming(
-            array(
-            'customer' => $customer->id,
-            )
-        );
-
-        $lines = $invoice->lines->all(array('limit' => 10));
-
-        $this->assertSame(count($lines->data), 1);
-        $this->assertSame($lines->data[0]->amount, 100);
-    }
-
-    // This is really just making sure that this operation does not trigger any
-    // warnings, as it's highly nested.
-    public function testAll()
-    {
-        self::authorizeFromEnv();
-        $invoices = Invoice::all();
-        $this->assertGreaterThan(0, count($invoices));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/PayoutTest.php b/htdocs/includes/stripe/tests/PayoutTest.php
deleted file mode 100644
index 5e99faede87..00000000000
--- a/htdocs/includes/stripe/tests/PayoutTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class PayoutTest extends TestCase
-{
-    private $managedAccount = null;
-
-    /**
-     * Create a managed account and put enough funds in the balance
-     * to be able to create a payout afterwards. Also try to re-use
-     * the managed account across the tests to avoid hitting the
-     * rate limit for account creation.
-     */
-    private function createAccountWithBalance()
-    {
-        if ($this->managedAccount === null) {
-            self::authorizeFromEnv();
-            $account = self::createTestManagedAccount();
-
-            $charge = \Stripe\Charge::create(array(
-                'currency' => 'usd',
-                'amount' => '10000',
-                'source' => array(
-                    'object' => 'card',
-                    'number' => '4000000000000077',
-                    'exp_month' => '09',
-                    'exp_year' => date('Y') + 3,
-                ),
-                'destination' => array(
-                    'account' => $account->id
-                )
-            ));
-
-            $this->managedAccount = $account;
-        }
-
-        return $this->managedAccount;
-    }
-
-    private function createPayoutFromManagedAccount($accountId)
-    {
-        $payout = Payout::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-            ),
-            array(
-                'stripe_account' => $accountId
-            )
-        );
-
-        return $payout;
-    }
-
-    public function testCreate()
-    {
-        $account = self::createAccountWithBalance();
-        $payout =  self::createPayoutFromManagedAccount($account->id);
-
-        $this->assertSame('pending', $payout->status);
-    }
-
-    public function testRetrieve()
-    {
-        $account = self::createAccountWithBalance();
-        $payout =  self::createPayoutFromManagedAccount($account->id);
-        $reloaded = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
-        $this->assertSame($reloaded->id, $payout->id);
-    }
-
-    public function testPayoutUpdateMetadata()
-    {
-        $account = self::createAccountWithBalance();
-        $payout =  self::createPayoutFromManagedAccount($account->id);
-        $payout->metadata['test'] = 'foo bar';
-        $payout->save();
-
-        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
-        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
-    }
-
-    public function testPayoutUpdateMetadataAll()
-    {
-        $account = self::createAccountWithBalance();
-        $payout =  self::createPayoutFromManagedAccount($account->id);
-
-        $payout->metadata = array('test' => 'foo bar');
-        $payout->save();
-
-        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
-        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/PermissionsErrorTest.php b/htdocs/includes/stripe/tests/PermissionsErrorTest.php
deleted file mode 100644
index cc8a5cd0be0..00000000000
--- a/htdocs/includes/stripe/tests/PermissionsErrorTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class PermissionErrorTest extends TestCase
-{
-    private function permissionErrorResponse()
-    {
-        return array(
-            'error' => array(),
-        );
-    }
-
-    /**
-     * @expectedException Stripe\Error\Permission
-     */
-    public function testPermission()
-    {
-        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->permissionErrorResponse(), 403);
-        Account::retrieve('acct_DEF');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/PlanTest.php b/htdocs/includes/stripe/tests/PlanTest.php
deleted file mode 100644
index 9aa3589c719..00000000000
--- a/htdocs/includes/stripe/tests/PlanTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class PlanTest extends TestCase
-{
-    public function testDeletion()
-    {
-        self::authorizeFromEnv();
-        $p = Plan::create(array(
-            'amount' => 2000,
-            'interval' => 'month',
-            'currency' => 'usd',
-            'name' => 'Plan',
-            'id' => 'gold-' . self::generateRandomString(20)
-        ));
-        $p->delete();
-        $this->assertTrue($p->deleted);
-    }
-
-    public function testFalseyId()
-    {
-        try {
-            $retrievedPlan = Plan::retrieve('0');
-        } catch (Error\InvalidRequest $e) {
-            // Can either succeed or 404, all other errors are bad
-            if ($e->httpStatus !== 404) {
-                $this->fail();
-            }
-        }
-    }
-
-    public function testSave()
-    {
-        self::authorizeFromEnv();
-        $planID = 'gold-' . self::generateRandomString(20);
-        $p = Plan::create(array(
-            'amount'   => 2000,
-            'interval' => 'month',
-            'currency' => 'usd',
-            'name'     => 'Plan',
-            'id'       => $planID
-        ));
-        $p->name = 'A new plan name';
-        $p->save();
-        $this->assertSame($p->name, 'A new plan name');
-
-        $stripePlan = Plan::retrieve($planID);
-        $this->assertSame($p->name, $stripePlan->name);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/ProductTest.php b/htdocs/includes/stripe/tests/ProductTest.php
deleted file mode 100644
index 668d015e380..00000000000
--- a/htdocs/includes/stripe/tests/ProductTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ProductSKUOrderTest extends TestCase
-{
-    public function testProductFalseyId()
-    {
-        try {
-            Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
-            $retrievedProduct = Product::retrieve('0');
-        } catch (Error\InvalidRequest $e) {
-            // Can either succeed or 404, all other errors are bad
-            if ($e->httpStatus !== 404) {
-                $this->fail();
-            }
-        }
-    }
-
-    public function testProductCreateUpdateRead()
-    {
-
-        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
-        $ProductID = 'gold-' . self::generateRandomString(20);
-        $p = Product::create(array(
-            'name'     => 'Gold Product',
-            'id'       => $ProductID,
-            'url'      => 'www.stripe.com/gold'
-        ));
-        $this->assertSame($p->url, 'www.stripe.com/gold');
-
-        $p->name = 'A new Product name';
-        $p->save();
-        $this->assertSame($p->name, 'A new Product name');
-        $this->assertSame($p->url, 'www.stripe.com/gold');
-
-        $stripeProduct = Product::retrieve($ProductID);
-        $this->assertSame($p->name, $stripeProduct->name);
-        $this->assertSame($stripeProduct->url, 'www.stripe.com/gold');
-    }
-
-    public function testSKUCreateUpdateRead()
-    {
-        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
-        $ProductID = 'silver-' . self::generateRandomString(20);
-        $p = Product::create(array(
-            'name'     => 'Silver Product',
-            'id'       => $ProductID,
-            'url'      => 'www.stripe.com/silver'
-        ));
-
-        $SkuID = 'silver-sku-' . self::generateRandomString(20);
-        $sku = SKU::create(array(
-            'price'     => 500,
-            'currency'  => 'usd',
-            'id'        => $SkuID,
-            'inventory' => array(
-                'type'     => 'finite',
-                'quantity' => 40
-            ),
-            'product'   => $ProductID
-        ));
-
-        $sku->price = 600;
-        $sku->inventory->quantity = 50;
-        $sku->save();
-        $this->assertSame($sku->price, 600);
-        $this->assertSame(50, $sku->inventory->quantity);
-
-        $stripeSku = SKU::retrieve($SkuID);
-        $this->assertSame($sku->price, 600);
-        $this->assertSame('finite', $sku->inventory->type);
-        $this->assertSame(50, $sku->inventory->quantity);
-    }
-
-    public function testSKUProductDelete()
-    {
-        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
-        $ProductID = 'silver-' . self::generateRandomString(20);
-        $p = Product::create(array(
-            'name'     => 'Silver Product',
-            'id'       => $ProductID,
-            'url'      => 'stripe.com/silver'
-        ));
-
-        $SkuID = 'silver-sku-' . self::generateRandomString(20);
-        $sku = SKU::create(array(
-            'price'     => 500,
-            'currency'  => 'usd',
-            'id'        => $SkuID,
-            'inventory' => array(
-                'type'     => 'finite',
-                'quantity' => 40
-            ),
-            'product'   => $ProductID
-        ));
-
-        $deletedSku = $sku->delete();
-        $this->assertTrue($deletedSku->deleted);
-
-        $deletedProduct = $p->delete();
-        $this->assertTrue($deletedProduct->deleted);
-    }
-
-    public function testOrderCreateUpdateRetrievePayReturn()
-    {
-        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
-        $ProductID = 'silver-' . self::generateRandomString(20);
-        $p = Product::create(array(
-            'name'      => 'Silver Product',
-            'id'        => $ProductID,
-            'url'       => 'www.stripe.com/silver',
-            'shippable' => false,
-        ));
-
-        $SkuID = 'silver-sku-' . self::generateRandomString(20);
-        $sku = SKU::create(array(
-            'price'     => 500,
-            'currency'  => 'usd',
-            'id'        => $SkuID,
-            'inventory' => array(
-                'type'     => 'finite',
-                'quantity' => 40
-            ),
-            'product'   => $ProductID
-        ));
-
-        $order = Order::create(array(
-            'items' => array(
-                0 => array(
-                    'type' => 'sku',
-                    'parent' => $SkuID,
-                ),
-            ),
-            'currency' => 'usd',
-            'email' => 'foo@bar.com',
-        ));
-
-        $order->metadata->foo = "bar";
-        $order->save();
-
-        $stripeOrder = Order::retrieve($order->id);
-        $this->assertSame($order->metadata->foo, "bar");
-
-        $order->pay(array(
-            'source' => array(
-                'object' => 'card',
-                'number' => '4242424242424242',
-                'exp_month' => '05',
-                'exp_year' => '2017'
-            ),
-        ));
-        $this->assertSame($order->status, 'paid');
-
-        $orderReturn = $order->returnOrder();
-        $this->assertSame($orderReturn->order, $order->id);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/RateLimitErrorTest.php b/htdocs/includes/stripe/tests/RateLimitErrorTest.php
deleted file mode 100644
index 2d6a6b22a2b..00000000000
--- a/htdocs/includes/stripe/tests/RateLimitErrorTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class RateLimitErrorTest extends TestCase
-{
-    private function rateLimitErrorResponse()
-    {
-        return array(
-            'error' => array(),
-        );
-    }
-
-    /**
-     * @expectedException Stripe\Error\RateLimit
-     */
-    public function testRateLimit()
-    {
-        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->rateLimitErrorResponse(), 429);
-        Account::retrieve('acct_DEF');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/RecipientTest.php b/htdocs/includes/stripe/tests/RecipientTest.php
deleted file mode 100644
index e26bfe8cddd..00000000000
--- a/htdocs/includes/stripe/tests/RecipientTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class RecipientTest extends TestCase
-{
-    public function testDeletion()
-    {
-        $recipient = self::createTestRecipient();
-        $recipient->delete();
-
-        $this->assertTrue($recipient->deleted);
-    }
-
-    public function testSave()
-    {
-        $recipient = self::createTestRecipient();
-
-        $recipient->email = 'gdb@stripe.com';
-        $recipient->save();
-        $this->assertSame($recipient->email, 'gdb@stripe.com');
-
-        $stripeRecipient = Recipient::retrieve($recipient->id);
-        $this->assertSame($recipient->email, $stripeRecipient->email);
-    }
-
-    /**
-     * @expectedException Stripe\Error\InvalidRequest
-     */
-    public function testBogusAttribute()
-    {
-        $recipient = self::createTestRecipient();
-        $recipient->bogus = 'bogus';
-        $recipient->save();
-    }
-
-    public function testRecipientAddCard()
-    {
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4000056655665556",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $recipient = $this->createTestRecipient();
-        $createdCard = $recipient->cards->create(array("card" => $token->id));
-        $recipient->save();
-
-        $updatedRecipient = Recipient::retrieve($recipient->id);
-        $updatedCards = $updatedRecipient->cards->all();
-        $this->assertSame(count($updatedCards["data"]), 1);
-    }
-
-    public function testRecipientUpdateCard()
-    {
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4000056655665556",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $recipient = $this->createTestRecipient();
-        $createdCard = $recipient->cards->create(array("card" => $token->id));
-        $recipient->save();
-
-        $createdCards = $recipient->cards->all();
-        $this->assertSame(count($createdCards["data"]), 1);
-
-        $card = $createdCards['data'][0];
-        $card->name = "Jane Austen";
-        $card->save();
-
-        $updatedRecipient = Recipient::retrieve($recipient->id);
-        $updatedCards = $updatedRecipient->cards->all();
-        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
-    }
-
-    public function testRecipientDeleteCard()
-    {
-        $token = Token::create(
-            array("card" => array(
-                "number" => "4000056655665556",
-                "exp_month" => 5,
-                "exp_year" => date('Y') + 3,
-                "cvc" => "314"
-            ))
-        );
-
-        $recipient = $this->createTestRecipient();
-        $createdCard = $recipient->cards->create(array("card" => $token->id));
-        $recipient->save();
-
-        $updatedRecipient = Recipient::retrieve($recipient->id);
-        $updatedCards = $updatedRecipient->cards->all();
-        $this->assertSame(count($updatedCards["data"]), 1);
-
-        $deleteStatus =
-        $updatedRecipient->cards->retrieve($createdCard->id)->delete();
-        $this->assertTrue($deleteStatus->deleted);
-        $updatedRecipient->save();
-
-        $postDeleteRecipient = Recipient::retrieve($recipient->id);
-        $postDeleteCards = $postDeleteRecipient->cards->all();
-        $this->assertSame(count($postDeleteCards["data"]), 0);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/RefundTest.php b/htdocs/includes/stripe/tests/RefundTest.php
deleted file mode 100644
index e9dd8509cd3..00000000000
--- a/htdocs/includes/stripe/tests/RefundTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class RefundTest extends TestCase
-{
-
-    public function testCreate()
-    {
-        $charge = self::createTestCharge();
-        $refund = Refund::create(array('amount' => 100, 'charge' => $charge->id));
-        $this->assertSame(100, $refund->amount);
-        $this->assertSame($charge->id, $refund->charge);
-    }
-
-    public function testUpdateAndRetrieve()
-    {
-        $charge = self::createTestCharge();
-        $ref = Refund::create(array('amount' => 100, 'charge' => $charge->id));
-        $ref->metadata["key"] = "value";
-        $ref->save();
-        $ref = Refund::retrieve($ref->id);
-        $this->assertSame("value", $ref->metadata["key"], "value");
-    }
-
-    public function testListForCharge()
-    {
-        $charge = self::createTestCharge();
-        $refA = Refund::create(array('amount' => 100, 'charge' => $charge->id));
-        $refB = Refund::create(array('amount' => 50, 'charge' => $charge->id));
-
-        $all = Refund::all(array('charge' => $charge));
-        $this->assertSame(false, $all['has_more']);
-        $this->assertSame(2, count($all->data));
-        $this->assertSame($refB->id, $all->data[0]->id);
-        $this->assertSame($refA->id, $all->data[1]->id);
-    }
-
-    public function testList()
-    {
-        $all = Refund::all();
-
-        // Fetches all refunds on this test account.
-        $this->assertSame(true, $all['has_more']);
-        $this->assertSame(10, count($all->data));
-    }
-
-    public function testCreateForBitcoin()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $charge = Charge::create(
-            array(
-                'amount' => $receiver->amount,
-                'currency' => $receiver->currency,
-                'description' => $receiver->description,
-                'source' => $receiver->id
-            )
-        );
-
-        $ref = Refund::create(
-            array(
-                'amount' => $receiver->amount,
-                'refund_address' => 'ABCDEF',
-                'charge' => $charge->id
-            )
-        );
-        $this->assertSame($receiver->amount, $ref->amount);
-        $this->assertNotNull($ref->id);
-    }
-
-    // Deprecated charge endpoints:
-
-    public function testCreateViaCharge()
-    {
-        $charge = self::createTestCharge();
-        $ref = $charge->refunds->create(array('amount' => 100));
-        $this->assertSame(100, $ref->amount);
-        $this->assertSame($charge->id, $ref->charge);
-    }
-
-    public function testUpdateAndRetrieveViaCharge()
-    {
-        $charge = self::createTestCharge();
-        $ref = $charge->refunds->create(array('amount' => 100));
-        $ref->metadata["key"] = "value";
-        $ref->save();
-        $ref = $charge->refunds->retrieve($ref->id);
-        $this->assertSame("value", $ref->metadata["key"], "value");
-    }
-
-    public function testListViaCharge()
-    {
-        $charge = self::createTestCharge();
-        $refA = $charge->refunds->create(array('amount' => 50));
-        $refB = $charge->refunds->create(array('amount' => 50));
-
-        $all = $charge->refunds->all();
-        $this->assertSame(false, $all['has_more']);
-        $this->assertSame(2, count($all->data));
-        $this->assertSame($refB->id, $all->data[0]->id);
-        $this->assertSame($refA->id, $all->data[1]->id);
-    }
-
-    public function testCreateForBitcoinViaCharge()
-    {
-        self::authorizeFromEnv();
-
-        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
-
-        $charge = Charge::create(
-            array(
-                'amount' => $receiver->amount,
-                'currency' => $receiver->currency,
-                'description' => $receiver->description,
-                'source' => $receiver->id
-            )
-        );
-
-        $ref = $charge->refunds->create(
-            array(
-                'amount' => $receiver->amount,
-                'refund_address' => 'ABCDEF'
-            )
-        );
-        $this->assertSame($receiver->amount, $ref->amount);
-        $this->assertNotNull($ref->id);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/RequestOptionsTest.php b/htdocs/includes/stripe/tests/RequestOptionsTest.php
deleted file mode 100644
index 11546dd6ece..00000000000
--- a/htdocs/includes/stripe/tests/RequestOptionsTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class RequestOptionsTest extends TestCase
-{
-    public function testStringAPIKey()
-    {
-        $opts = Util\RequestOptions::parse("foo");
-        $this->assertSame("foo", $opts->apiKey);
-        $this->assertSame(array(), $opts->headers);
-    }
-
-    public function testNull()
-    {
-        $opts = Util\RequestOptions::parse(null);
-        $this->assertSame(null, $opts->apiKey);
-        $this->assertSame(array(), $opts->headers);
-    }
-
-    public function testEmptyArray()
-    {
-        $opts = Util\RequestOptions::parse(array());
-        $this->assertSame(null, $opts->apiKey);
-        $this->assertSame(array(), $opts->headers);
-    }
-
-    public function testAPIKeyArray()
-    {
-        $opts = Util\RequestOptions::parse(
-            array(
-                'api_key' => 'foo',
-            )
-        );
-        $this->assertSame('foo', $opts->apiKey);
-        $this->assertSame(array(), $opts->headers);
-    }
-
-    public function testIdempotentKeyArray()
-    {
-        $opts = Util\RequestOptions::parse(
-            array(
-                'idempotency_key' => 'foo',
-            )
-        );
-        $this->assertSame(null, $opts->apiKey);
-        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
-    }
-
-    public function testKeyArray()
-    {
-        $opts = Util\RequestOptions::parse(
-            array(
-                'idempotency_key' => 'foo',
-                'api_key' => 'foo'
-            )
-        );
-        $this->assertSame('foo', $opts->apiKey);
-        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
-    }
-
-    /**
-     * @expectedException Stripe\Error\Api
-     */
-    public function testWrongType()
-    {
-        $opts = Util\RequestOptions::parse(5);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/SourceTest.php b/htdocs/includes/stripe/tests/SourceTest.php
deleted file mode 100644
index 5ba142b9be2..00000000000
--- a/htdocs/includes/stripe/tests/SourceTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class SourceTest extends TestCase
-{
-    public function testRetrieve()
-    {
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            array(
-                'id' => 'src_foo',
-                'object' => 'source',
-            )
-        );
-        $source = Source::retrieve('src_foo');
-        $this->assertSame($source->id, 'src_foo');
-    }
-
-    public function testCreate()
-    {
-        $this->mockRequest(
-            'POST',
-            '/v1/sources',
-            array(
-                'type' => 'bitcoin',
-                'amount' => 1000,
-                'currency' => 'usd',
-                'owner' => array('email' => 'jenny.rosen@example.com'),
-            ),
-            array(
-                'id' => 'src_foo',
-                'object' => 'source'
-            )
-        );
-        $source = Source::create(array(
-            'type' => 'bitcoin',
-            'amount' => 1000,
-            'currency' => 'usd',
-            'owner' => array('email' => 'jenny.rosen@example.com'),
-        ));
-        $this->assertSame($source->id, 'src_foo');
-    }
-
-    public function testSave()
-    {
-        $response = array(
-            'id' => 'src_foo',
-            'object' => 'source',
-            'metadata' => array(),
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            $response
-        );
-
-        $response['metadata'] = array('foo' => 'bar');
-        $this->mockRequest(
-            'POST',
-            '/v1/sources/src_foo',
-            array(
-                'metadata' => array('foo' => 'bar'),
-            ),
-            $response
-        );
-
-        $source = Source::retrieve('src_foo');
-        $source->metadata['foo'] = 'bar';
-        $source->save();
-        $this->assertSame($source->metadata['foo'], 'bar');
-    }
-
-    public function testSaveOwner()
-    {
-        $response = array(
-            'id' => 'src_foo',
-            'object' => 'source',
-            'owner' => array(
-                'name' => null,
-                'address' => null,
-            ),
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            $response
-        );
-
-        $response['owner'] = array(
-            'name' => "Stripey McStripe",
-            'address' => array(
-                'line1' => "Test Address",
-                'city' => "Test City",
-                'postal_code' => "12345",
-                'state' => "Test State",
-                'country' => "Test Country",
-            )
-        );
-        $this->mockRequest(
-            'POST',
-            '/v1/sources/src_foo',
-            array(
-                'owner' => array(
-                    'name' => "Stripey McStripe",
-                    'address' => array(
-                        'line1' => "Test Address",
-                        'city' => "Test City",
-                        'postal_code' => "12345",
-                        'state' => "Test State",
-                        'country' => "Test Country",
-                    ),
-                ),
-            ),
-            $response
-        );
-
-        $source = Source::retrieve('src_foo');
-        $source->owner['name'] = "Stripey McStripe";
-        $source->owner['address'] = array(
-            'line1' => "Test Address",
-            'city' => "Test City",
-            'postal_code' => "12345",
-            'state' => "Test State",
-            'country' => "Test Country",
-        );
-        $source->save();
-        $this->assertSame($source->owner['name'], "Stripey McStripe");
-        $this->assertSame($source->owner['address']['line1'], "Test Address");
-        $this->assertSame($source->owner['address']['city'], "Test City");
-        $this->assertSame($source->owner['address']['postal_code'], "12345");
-        $this->assertSame($source->owner['address']['state'], "Test State");
-        $this->assertSame($source->owner['address']['country'], "Test Country");
-    }
-
-    public function testDeleteAttached()
-    {
-        $response = array(
-            'id' => 'src_foo',
-            'object' => 'source',
-            'customer' => 'cus_bar',
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            $response
-        );
-
-        unset($response['customer']);
-        $this->mockRequest(
-            'DELETE',
-            '/v1/customers/cus_bar/sources/src_foo',
-            array(),
-            $response
-        );
-
-        $source = Source::retrieve('src_foo');
-        $source->delete();
-        $this->assertFalse(array_key_exists('customer', $source));
-    }
-
-    /**
-     * @expectedException Stripe\Error\Api
-     */
-    public function testDeleteUnattached()
-    {
-        $response = array(
-            'id' => 'src_foo',
-            'object' => 'source',
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            $response
-        );
-
-        $source = Source::retrieve('src_foo');
-        $source->delete();
-    }
-
-    public function testVerify()
-    {
-        $response = array(
-            'id' => 'src_foo',
-            'object' => 'source',
-            'verification' => array('status' => 'pending'),
-        );
-        $this->mockRequest(
-            'GET',
-            '/v1/sources/src_foo',
-            array(),
-            $response
-        );
-
-        $response['verification']['status'] = 'succeeded';
-        $this->mockRequest(
-            'POST',
-            '/v1/sources/src_foo/verify',
-            array(
-                'values' => array(32, 45),
-            ),
-            $response
-        );
-
-        $source = Source::retrieve('src_foo');
-        $this->assertSame($source->verification->status, 'pending');
-        $source->verify(array(
-            'values' => array(32, 45),
-        ));
-        $this->assertSame($source->verification->status, 'succeeded');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/StripeObjectTest.php b/htdocs/includes/stripe/tests/StripeObjectTest.php
deleted file mode 100644
index 5f922228270..00000000000
--- a/htdocs/includes/stripe/tests/StripeObjectTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class StripeObjectTest extends TestCase
-{
-    public function testArrayAccessorsSemantics()
-    {
-        $s = new StripeObject();
-        $s['foo'] = 'a';
-        $this->assertSame($s['foo'], 'a');
-        $this->assertTrue(isset($s['foo']));
-        unset($s['foo']);
-        $this->assertFalse(isset($s['foo']));
-    }
-
-    public function testNormalAccessorsSemantics()
-    {
-        $s = new StripeObject();
-        $s->foo = 'a';
-        $this->assertSame($s->foo, 'a');
-        $this->assertTrue(isset($s->foo));
-        unset($s->foo);
-        $this->assertFalse(isset($s->foo));
-    }
-
-    public function testArrayAccessorsMatchNormalAccessors()
-    {
-        $s = new StripeObject();
-        $s->foo = 'a';
-        $this->assertSame($s['foo'], 'a');
-
-        $s['bar'] = 'b';
-        $this->assertSame($s->bar, 'b');
-    }
-
-    public function testKeys()
-    {
-        $s = new StripeObject();
-        $s->foo = 'a';
-        $this->assertSame($s->keys(), array('foo'));
-    }
-
-    public function testToArray()
-    {
-        $s = new StripeObject();
-        $s->foo = 'a';
-
-        $converted = $s->__toArray();
-
-        $this->assertInternalType('array', $converted);
-        $this->assertArrayHasKey('foo', $converted);
-        $this->assertEquals('a', $converted['foo']);
-    }
-
-    public function testRecursiveToArray()
-    {
-        $s = new StripeObject();
-        $z = new StripeObject();
-
-        $s->child = $z;
-        $z->foo = 'a';
-
-        $converted = $s->__toArray(true);
-
-        $this->assertInternalType('array', $converted);
-        $this->assertArrayHasKey('child', $converted);
-        $this->assertInternalType('array', $converted['child']);
-        $this->assertArrayHasKey('foo', $converted['child']);
-        $this->assertEquals('a', $converted['child']['foo']);
-    }
-
-    public function testNonexistentProperty()
-    {
-        $s = new StripeObject();
-        $this->assertNull($s->nonexistent);
-    }
-
-    public function testPropertyDoesNotExists()
-    {
-        $s = new StripeObject();
-        $this->assertNull($s['nonexistent']);
-    }
-
-    public function testJsonEncode()
-    {
-        // We can only JSON encode our objects in PHP 5.4+. 5.3 must use ->__toJSON()
-        if (version_compare(phpversion(), '5.4.0', '<')) {
-            return;
-        }
-
-        $s = new StripeObject();
-        $s->foo = 'a';
-
-        $this->assertEquals('{"foo":"a"}', json_encode($s->__toArray()));
-    }
-
-    public function testReplaceNewNestedUpdatable()
-    {
-        StripeObject::init(); // Populate the $nestedUpdatableAttributes Set
-        $s = new StripeObject();
-
-        $s->metadata = array('bar');
-        $this->assertSame($s->metadata, array('bar'));
-        $s->metadata = array('baz', 'qux');
-        $this->assertSame($s->metadata, array('baz', 'qux'));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/SubscriptionItemTest.php b/htdocs/includes/stripe/tests/SubscriptionItemTest.php
deleted file mode 100644
index 4e4a545a5b1..00000000000
--- a/htdocs/includes/stripe/tests/SubscriptionItemTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class SubscriptionItemTest extends TestCase
-{
-    public function testCreateUpdateRetrieveListCancel()
-    {
-        $plan0ID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($plan0ID);
-
-        $customer = self::createTestCustomer();
-        $sub = Subscription::create(array('plan' => $plan0ID, 'customer' => $customer->id));
-
-        $plan1ID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($plan1ID);
-
-        $subItem = SubscriptionItem::create(array('plan' => $plan1ID, 'subscription' => $sub->id));
-        $this->assertSame($subItem->plan->id, $plan1ID);
-
-        $subItem->quantity = 2;
-        $subItem->save();
-
-        $subItem = SubscriptionItem::retrieve($subItem->id);
-        $this->assertSame($subItem->quantity, 2);
-
-        // Update the quantity parameter one more time
-        $subItem = SubscriptionItem::update($subItem->id, array('quantity' => 3));
-        $this->assertSame($subItem->quantity, 3);
-
-        $subItems = SubscriptionItem::all(array('subscription'=>$sub->id, 'limit'=>3));
-        $this->assertSame(get_class($subItems->data[0]), 'Stripe\SubscriptionItem');
-        $this->assertSame(2, count($subItems->data));
-
-        $subItem->delete();
-        $this->assertTrue($subItem->deleted);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/SubscriptionTest.php b/htdocs/includes/stripe/tests/SubscriptionTest.php
deleted file mode 100644
index 08f74108061..00000000000
--- a/htdocs/includes/stripe/tests/SubscriptionTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class SubscriptionTest extends TestCase
-{
-
-    public function testCustomerCreateUpdateListCancel()
-    {
-        $planID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($planID);
-
-        $customer = self::createTestCustomer();
-
-        $sub = $customer->subscriptions->create(array('plan' => $planID));
-
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-
-        $sub->quantity = 2;
-        $sub->save();
-
-        $sub = $customer->subscriptions->retrieve($sub->id);
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-        $this->assertSame($sub->quantity, 2);
-
-        $subs = $customer->subscriptions->all(array('limit'=>3));
-        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
-
-        $sub->cancel(array('at_period_end' => true));
-
-        $sub = $customer->subscriptions->retrieve($sub->id);
-        $this->assertSame($sub->status, 'active');
-        // @codingStandardsIgnoreStart
-        $this->assertTrue($sub->cancel_at_period_end);
-        // @codingStandardsIgnoreEnd
-    }
-
-    public function testCreateUpdateListCancel()
-    {
-        $planID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($planID);
-
-        $customer = self::createTestCustomer();
-
-        $sub = Subscription::create(array('plan' => $planID, 'customer' => $customer->id));
-
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-
-        $sub->quantity = 2;
-        $sub->save();
-
-        $sub = Subscription::retrieve($sub->id);
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-        $this->assertSame($sub->quantity, 2);
-
-        // Update the quantity parameter one more time
-        $sub = Subscription::update($sub->id, array("quantity" => 3));
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-        $this->assertSame($sub->quantity, 3);
-
-        $subs = Subscription::all(array('customer'=>$customer->id, 'plan'=>$planID, 'limit'=>3));
-        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
-
-        $sub->cancel(array('at_period_end' => true));
-
-        $sub = Subscription::retrieve($sub->id);
-        $this->assertSame($sub->status, 'active');
-        $this->assertTrue($sub->cancel_at_period_end);
-    }
-
-    public function testCreateUpdateListCancelWithItems()
-    {
-        $plan0ID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($plan0ID);
-
-        $customer = self::createTestCustomer();
-
-        $sub = Subscription::create(array(
-          'customer' => $customer->id,
-          'items' => array(
-            array('plan' => $plan0ID),
-          ),
-        ));
-
-        $this->assertSame(count($sub->items->data), 1);
-        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
-
-        $plan1ID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($plan1ID);
-
-        $sub = Subscription::update($sub->id, array(
-          'items' => array(
-            array('plan' => $plan1ID),
-          ),
-        ));
-
-        $this->assertSame(count($sub->items->data), 2);
-        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
-        $this->assertSame($sub->items->data[1]->plan->id, $plan1ID);
-    }
-
-    public function testDeleteDiscount()
-    {
-        $planID = 'gold-' . self::generateRandomString(20);
-        self::retrieveOrCreatePlan($planID);
-
-        $couponID = '25off-' . self::generateRandomString(20);
-        self::retrieveOrCreateCoupon($couponID);
-
-        $customer = self::createTestCustomer();
-
-        $sub = $customer->subscriptions->create(
-            array(
-                'plan' => $planID,
-                'coupon' => $couponID
-            )
-        );
-
-        $this->assertSame($sub->status, 'active');
-        $this->assertSame($sub->plan->id, $planID);
-        $this->assertSame($sub->discount->coupon->id, $couponID);
-
-        $sub->deleteDiscount();
-        $sub = $customer->subscriptions->retrieve($sub->id);
-        $this->assertNull($sub->discount);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/TestCase.php b/htdocs/includes/stripe/tests/TestCase.php
index a1fdc94f917..840c0ec58c1 100644
--- a/htdocs/includes/stripe/tests/TestCase.php
+++ b/htdocs/includes/stripe/tests/TestCase.php
@@ -3,269 +3,175 @@
 namespace Stripe;
 
 /**
- * Base class for Stripe test cases, provides some utility methods for creating
- * objects.
+ * Base class for Stripe test cases.
  */
 class TestCase extends \PHPUnit_Framework_TestCase
 {
-    const API_KEY = 'tGN0bIwXnHdwOa85VABjPdSn8nWY7G7I';
+    /** @var string original API base URL */
+    protected $origApiBase;
 
-    private $mock;
+    /** @var string original API key */
+    protected $origApiKey;
 
-    protected static function authorizeFromEnv()
-    {
-        $apiKey = getenv('STRIPE_API_KEY');
-        if (!$apiKey) {
-            $apiKey = self::API_KEY;
-        }
+    /** @var string original client ID */
+    protected $origClientId;
 
-        Stripe::setApiKey($apiKey);
-    }
+    /** @var string original API version */
+    protected $origApiVersion;
+
+    /** @var string original account ID */
+    protected $origAccountId;
+
+    /** @var object HTTP client mocker */
+    protected $clientMock;
 
     protected function setUp()
     {
+        // Save original values so that we can restore them after running tests
+        $this->origApiBase = Stripe::$apiBase;
+        $this->origApiKey = Stripe::getApiKey();
+        $this->origClientId = Stripe::getClientId();
+        $this->origApiVersion = Stripe::getApiVersion();
+        $this->origAccountId = Stripe::getAccountId();
+
+        // Set up host and credentials for stripe-mock
+        Stripe::$apiBase = "http://localhost:" . MOCK_PORT;
+        Stripe::setApiKey("sk_test_123");
+        Stripe::setClientId("ca_123");
+        Stripe::setApiVersion(null);
+        Stripe::setAccountId(null);
+
+        // Set up the HTTP client mocker
+        $this->clientMock = $this->getMock('\Stripe\HttpClient\ClientInterface');
+
+        // By default, use the real HTTP client
         ApiRequestor::setHttpClient(HttpClient\CurlClient::instance());
-
-        // Peg the API version so that it can be varied independently of the
-        // one set on the test account.
-        Stripe::setApiVersion('2017-04-06');
-
-        $this->mock = null;
-        $this->call = 0;
     }
 
-    protected function mockRequest($method, $path, $params = array(), $return = array('id' => 'myId'), $rcode = 200)
+    protected function tearDown()
     {
-        $mock = $this->setUpMockRequest();
-        $mock->expects($this->at($this->call++))
-             ->method('request')
-             ->with(strtolower($method), 'https://api.stripe.com' . $path, $this->anything(), $params, false)
-             ->willReturn(array(json_encode($return), $rcode, array()));
+        // Restore original values
+        Stripe::$apiBase = $this->origApiBase;
+        Stripe::setApiKey($this->origApiKey);
+        Stripe::setClientId($this->origClientId);
+        Stripe::setApiVersion($this->origApiVersion);
+        Stripe::setAccountId($this->origAccountId);
     }
 
-    private function setUpMockRequest()
-    {
-        if (!$this->mock) {
-            self::authorizeFromEnv();
-            $this->mock = $this->getMock('\Stripe\HttpClient\ClientInterface');
-            ApiRequestor::setHttpClient($this->mock);
+    /**
+     * Sets up a request expectation with the provided parameters. The request
+     * will actually go through and be emitted.
+     *
+     * @param string $method HTTP method (e.g. 'post', 'get', etc.)
+     * @param string $path relative path (e.g. '/v1/charges')
+     * @param array|null $params array of parameters. If null, parameters will
+     *   not be checked.
+     * @param string[]|null $headers array of headers. Does not need to be
+     *   exhaustive. If null, headers are not checked.
+     * @param bool $hasFile Whether the request parameters contains a file.
+     *   Defaults to false.
+     */
+    protected function expectsRequest(
+        $method,
+        $path,
+        $params = null,
+        $headers = null,
+        $hasFile = false
+    ) {
+        $this->prepareRequestMock($method, $path, $params, $headers, $hasFile)
+            ->will($this->returnCallback(
+                function ($method, $absUrl, $headers, $params, $hasFile) {
+                    $curlClient = HttpClient\CurlClient::instance();
+                    ApiRequestor::setHttpClient($curlClient);
+                    return $curlClient->request($method, $absUrl, $headers, $params, $hasFile);
+                }
+            ));
+    }
+
+    /**
+     * Sets up a request expectation with the provided parameters. The request
+     * will not actually be emitted, instead the provided response parameters
+     * will be returned.
+     *
+     * @param string $method HTTP method (e.g. 'post', 'get', etc.)
+     * @param string $path relative path (e.g. '/v1/charges')
+     * @param array|null $params array of parameters. If null, parameters will
+     *   not be checked.
+     * @param string[]|null $headers array of headers. Does not need to be
+     *   exhaustive. If null, headers are not checked.
+     * @param bool $hasFile Whether the request parameters contains a file.
+     *   Defaults to false.
+     * @param array $response
+     * @param integer $rcode
+     * @param string|null $base
+     *
+     * @return array
+     */
+    protected function stubRequest(
+        $method,
+        $path,
+        $params = null,
+        $headers = null,
+        $hasFile = false,
+        $response = [],
+        $rcode = 200,
+        $base = null
+    ) {
+        $this->prepareRequestMock($method, $path, $params, $headers, $hasFile, $base)
+            ->willReturn([json_encode($response), $rcode, []]);
+    }
+
+    /**
+     * Prepares the client mocker for an invocation of the `request` method.
+     * This helper method is used by both `expectsRequest` and `stubRequest` to
+     * prepare the client mocker to expect an invocation of the `request` method
+     * with the provided arguments.
+     *
+     * @param string $method HTTP method (e.g. 'post', 'get', etc.)
+     * @param string $path relative path (e.g. '/v1/charges')
+     * @param array|null $params array of parameters. If null, parameters will
+     *   not be checked.
+     * @param string[]|null $headers array of headers. Does not need to be
+     *   exhaustive. If null, headers are not checked.
+     * @param bool $hasFile Whether the request parameters contains a file.
+     *   Defaults to false.
+     * @param string|null $base base URL (e.g. 'https://api.stripe.com')
+     *
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    private function prepareRequestMock(
+        $method,
+        $path,
+        $params = null,
+        $headers = null,
+        $hasFile = false,
+        $base = null
+    ) {
+        ApiRequestor::setHttpClient($this->clientMock);
+
+        if ($base === null) {
+            $base = Stripe::$apiBase;
         }
-        return $this->mock;
-    }
+        $absUrl = $base . $path;
 
-    /**
-     * Create a valid test charge.
-     */
-    protected static function createTestCharge(array $attributes = array())
-    {
-        self::authorizeFromEnv();
-
-        return Charge::create(
-            $attributes + array(
-                'amount' => 2000,
-                'currency' => 'usd',
-                'description' => 'Charge for test@example.com',
-                'card' => array(
-                    'number' => '4242424242424242',
-                    'exp_month' => 5,
-                    'exp_year' => date('Y') + 3,
-                ),
-            )
-        );
-    }
-
-    /**
-     * Create a valid test transfer.
-     */
-    protected static function createTestTransfer(array $attributes = array(), $opts = null)
-    {
-        self::authorizeFromEnv();
-
-        $recipient = self::createTestRecipient();
-
-        return Transfer::create(
-            $attributes + array(
-                'amount' => 2000,
-                'currency' => 'usd',
-                'description' => 'Transfer to test@example.com',
-                'recipient' => $recipient->id
-            ),
-            $opts
-        );
-    }
-
-    /**
-     * Create a valid test customer.
-     */
-    protected static function createTestCustomer(array $attributes = array())
-    {
-        self::authorizeFromEnv();
-
-        return Customer::create(
-            $attributes + array(
-                'card' => array(
-                    'number' => '4242424242424242',
-                    'exp_month' => 5,
-                    'exp_year' => date('Y') + 3,
-                ),
-            )
-        );
-    }
-
-    /**
-     * Create a valid test recipient
-     */
-    protected static function createTestRecipient(array $attributes = array())
-    {
-        self::authorizeFromEnv();
-
-        return Recipient::create(
-            $attributes + array(
-                'name' => 'PHP Test',
-                'type' => 'individual',
-                'tax_id' => '000000000',
-                'bank_account' => array(
-                    'country' => 'US',
-                    'routing_number' => '110000000',
-                    'account_number' => '000123456789'
-                ),
-            )
-        );
-    }
-
-    /**
-     * Create a test account
-     */
-    protected static function createTestAccount(array $attributes = array())
-    {
-        self::authorizeFromEnv();
-
-        return Account::create(
-            $attributes + array(
-                'managed' => false,
-                'country' => 'US',
-                'email' => self::generateRandomEmail(),
-            )
-        );
-    }
-
-    /**
-     * Create a test account
-     */
-    protected static function createTestManagedAccount(array $attributes = array())
-    {
-        self::authorizeFromEnv();
-
-        return Account::create(
-            $attributes + array(
-                'managed' => true,
-                'country' => 'US',
-                'external_account' => array(
-                    'object' => 'bank_account',
-                    'country' => 'US',
-                    'currency' => 'usd',
-                    'routing_number' => '110000000',
-                    'account_number' => '000123456789'
-                ),
-                'legal_entity' => array(
-                    'type'               => 'individual',
-                    'personal_id_number' => '000000000',
-                    'type'               => 'individual',
-                    'dob'                => array('year' => '1980', 'month' => '01', 'day' => '01'),
-                    'first_name'         => 'John',
-                    'last_name'          => 'Doe',
-                    'address'            => array(
-                        'line1'          => '1234 Main Street',
-                        'postal_code'    => '94110',
-                        'city'           => 'San Francisco'
-                    ),
-                    'personal_address'   => array(
-                        'line1'          => '1234 Main Street',
-                        'postal_code'    => '94110',
-                        'city'           => 'San Francisco'
-                    )
-                ),
-                'tos_acceptance' => array('date' => time(), 'ip' => '127.0.0.1')
-            )
-        );
-    }
-
-    /**
-     * Verify that a plan with a given ID exists, or create a new one if it does
-     * not.
-     */
-    protected static function retrieveOrCreatePlan($id)
-    {
-        self::authorizeFromEnv();
-
-        try {
-            $plan = Plan::retrieve($id);
-        } catch (Error\InvalidRequest $exception) {
-            $plan = Plan::create(
-                array(
-                    'id' => $id,
-                    'amount' => 0,
-                    'currency' => 'usd',
-                    'interval' => 'month',
-                    'name' => 'Gold Test Plan',
-                )
+        return $this->clientMock
+            ->expects($this->once())
+            ->method('request')
+            ->with(
+                $this->identicalTo(strtolower($method)),
+                $this->identicalTo($absUrl),
+                // for headers, we only check that all of the headers provided in $headers are
+                // present in the list of headers of the actual request
+                $headers === null ? $this->anything() : $this->callback(function ($array) use ($headers) {
+                    foreach ($headers as $header) {
+                        if (!in_array($header, $array)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                }),
+                $params === null ? $this->anything() : $this->identicalTo($params),
+                $this->identicalTo($hasFile)
             );
-        }
-    }
-
-    /**
-     * Verify that a coupon with a given ID exists, or create a new one if it
-     * does not.
-     */
-    protected static function retrieveOrCreateCoupon($id)
-    {
-        self::authorizeFromEnv();
-
-        try {
-            $coupon = Coupon::retrieve($id);
-        } catch (Error\InvalidRequest $exception) {
-            $coupon = Coupon::create(
-                array(
-                    'id' => $id,
-                    'duration' => 'forever',
-                    'percent_off' => 25,
-                )
-            );
-        }
-    }
-
-    /**
-     * Generate a semi-random string
-     */
-    protected static function generateRandomString($length = 24)
-    {
-        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTU';
-        $charactersLength = strlen($characters);
-        $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
-            $randomString .= $characters[rand(0, $charactersLength - 1)];
-        }
-        return $randomString;
-    }
-
-    /**
-     * Generate a semi-random email.
-     */
-    protected static function generateRandomEmail()
-    {
-        return 'dev-platform-bots+php-'.self::generateRandomString(12).'@stripe.com';
-    }
-
-    protected static function createTestBitcoinReceiver($email)
-    {
-        $receiver = BitcoinReceiver::create(
-            array(
-                'amount' => 100,
-                'currency' => 'usd',
-                'description' => 'some details',
-                'email' => $email
-            )
-        );
-        return $receiver;
     }
 }
diff --git a/htdocs/includes/stripe/tests/ThreeDSecureTest.php b/htdocs/includes/stripe/tests/ThreeDSecureTest.php
deleted file mode 100644
index ebdd62335ee..00000000000
--- a/htdocs/includes/stripe/tests/ThreeDSecureTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class ThreeDSecureTest extends TestCase
-{
-    public function testRetrieve()
-    {
-        $this->mockRequest(
-            'GET',
-            '/v1/3d_secure/tdsrc_test',
-            array(),
-            array(
-                'id' => 'tdsrc_test',
-                'object' => 'three_d_secure'
-            )
-        );
-        $three_d_secure = ThreeDSecure::retrieve('tdsrc_test');
-        $this->assertSame($three_d_secure->id, 'tdsrc_test');
-    }
-
-    public function testCreate()
-    {
-        $this->mockRequest(
-            'POST',
-            '/v1/3d_secure',
-            array(
-                'card' => 'tok_test',
-                'amount' => 1500,
-                'currency' => 'usd',
-                'return_url' => 'https://example.org/3d-secure-result'
-            ),
-            array(
-                'id' => 'tdsrc_test',
-                'object' => 'three_d_secure'
-            )
-        );
-        $three_d_secure = ThreeDSecure::create(array(
-                'card' => 'tok_test',
-                'amount' => 1500,
-                'currency' => 'usd',
-                'return_url' => 'https://example.org/3d-secure-result'
-        ));
-        $this->assertSame($three_d_secure->id, 'tdsrc_test');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/TokenTest.php b/htdocs/includes/stripe/tests/TokenTest.php
deleted file mode 100644
index 60ec76a1544..00000000000
--- a/htdocs/includes/stripe/tests/TokenTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class TokenTest extends TestCase
-{
-    public function testUrls()
-    {
-        $this->assertSame(Token::classUrl(), '/v1/tokens');
-        $token = new Token('abcd/efgh');
-        $this->assertSame($token->instanceUrl(), '/v1/tokens/abcd%2Fefgh');
-    }
-}
diff --git a/htdocs/includes/stripe/tests/TransferReversalTest.php b/htdocs/includes/stripe/tests/TransferReversalTest.php
deleted file mode 100644
index 86d746650f5..00000000000
--- a/htdocs/includes/stripe/tests/TransferReversalTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class TransferReversalTest extends TestCase
-{
-    // The resource that was traditionally called "transfer" became a "payout"
-    // in API version 2017-04-06. We're testing traditional transfers here, so
-    // we force the API version just prior anywhere that we need to.
-    private $opts = array('stripe_version' => '2017-02-14');
-
-    public function testList()
-    {
-        $transfer = self::createTestTransfer(array(), $this->opts);
-        $all = $transfer->reversals->all();
-        $this->assertSame(false, $all['has_more']);
-        $this->assertSame(0, count($all->data));
-    }
-}
diff --git a/htdocs/includes/stripe/tests/TransferTest.php b/htdocs/includes/stripe/tests/TransferTest.php
deleted file mode 100644
index f4fd347dc4e..00000000000
--- a/htdocs/includes/stripe/tests/TransferTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class TransferTest extends TestCase
-{
-    // The resource that was traditionally called "transfer" became a "payout"
-    // in API version 2017-04-06. We're testing traditional transfers here, so
-    // we force the API version just prior anywhere that we need to.
-    private $opts = array('stripe_version' => '2017-02-14');
-
-    public function testCreate()
-    {
-        $transfer = self::createTestTransfer(array(), $this->opts);
-        $this->assertSame('transfer', $transfer->object);
-    }
-
-    public function testRetrieve()
-    {
-        $transfer = self::createTestTransfer(array(), $this->opts);
-        $reloaded = Transfer::retrieve($transfer->id, $this->opts);
-        $this->assertSame($reloaded->id, $transfer->id);
-    }
-
-    public function testTransferUpdateMetadata()
-    {
-        $transfer = self::createTestTransfer(array(), $this->opts);
-
-        $transfer->metadata['test'] = 'foo bar';
-        $transfer->save();
-
-        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
-        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
-    }
-
-    public function testTransferUpdateMetadataAll()
-    {
-        $transfer = self::createTestTransfer(array(), $this->opts);
-
-        $transfer->metadata = array('test' => 'foo bar');
-        $transfer->save();
-
-        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
-        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/UtilTest.php b/htdocs/includes/stripe/tests/UtilTest.php
deleted file mode 100644
index a1206d698f7..00000000000
--- a/htdocs/includes/stripe/tests/UtilTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Stripe;
-
-class UtilTest extends TestCase
-{
-    public function testIsList()
-    {
-        $list = array(5, 'nstaoush', array());
-        $this->assertTrue(Util\Util::isList($list));
-
-        $notlist = array(5, 'nstaoush', array(), 'bar' => 'baz');
-        $this->assertFalse(Util\Util::isList($notlist));
-    }
-
-    public function testThatPHPHasValueSemanticsForArrays()
-    {
-        $original = array('php-arrays' => 'value-semantics');
-        $derived = $original;
-        $derived['php-arrays'] = 'reference-semantics';
-
-        $this->assertSame('value-semantics', $original['php-arrays']);
-    }
-
-    public function testConvertStripeObjectToArrayIncludesId()
-    {
-        $customer = self::createTestCustomer();
-        $this->assertTrue(array_key_exists("id", $customer->__toArray(true)));
-    }
-
-    public function testUtf8()
-    {
-        // UTF-8 string
-        $x = "\xc3\xa9";
-        $this->assertSame(Util\Util::utf8($x), $x);
-
-        // Latin-1 string
-        $x = "\xe9";
-        $this->assertSame(Util\Util::utf8($x), "\xc3\xa9");
-
-        // Not a string
-        $x = true;
-        $this->assertSame(Util\Util::utf8($x), $x);
-    }
-}
diff --git a/htdocs/includes/stripe/tests/bootstrap.no_autoload.php b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
index 7358058780a..7011a3f4782 100644
--- a/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
+++ b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
@@ -1,4 +1,5 @@
 <?php
 
 require_once __DIR__ . '/../init.php';
-require_once __DIR__ . '/TestCase.php';
+
+require_once __DIR__ . '/bootstrap.php';
diff --git a/htdocs/includes/stripe/tests/bootstrap.php b/htdocs/includes/stripe/tests/bootstrap.php
index de6ff4e253c..470b7027878 100644
--- a/htdocs/includes/stripe/tests/bootstrap.php
+++ b/htdocs/includes/stripe/tests/bootstrap.php
@@ -1,3 +1,43 @@
 <?php
 
+define("MOCK_MINIMUM_VERSION", "0.5.0");
+define("MOCK_PORT", getenv("STRIPE_MOCK_PORT") ?: 12111);
+
+// Send a request to stripe-mock
+$ch = curl_init("http://localhost:" . MOCK_PORT . "/");
+curl_setopt($ch, CURLOPT_HEADER, 1);
+curl_setopt($ch, CURLOPT_NOBODY, 1);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+$resp = curl_exec($ch);
+
+if (curl_errno($ch)) {
+    echo "Couldn't reach stripe-mock at `localhost:" . MOCK_PORT . "`. Is " .
+         "it running? Please see README for setup instructions.\n";
+    exit(1);
+}
+
+// Retrieve the Stripe-Mock-Version header
+$version = null;
+$headers = explode("\n", $resp);
+foreach ($headers as $header) {
+    $pair = explode(":", $header, 2);
+    if ($pair[0] == "Stripe-Mock-Version") {
+        $version = trim($pair[1]);
+    }
+}
+
+if ($version === null) {
+    echo "Could not retrieve Stripe-Mock-Version header. Are you sure " .
+         "that the server at `localhost:" . MOCK_PORT . "` is a stripe-mock " .
+         "instance?";
+    exit(1);
+}
+
+if (version_compare($version, MOCK_MINIMUM_VERSION) == -1) {
+    echo "Your version of stripe-mock (" . $version . ") is too old. The minimum " .
+         "version to run this test suite is " . MOCK_MINIMUM_VERSION . ". " .
+         "Please see its repository for upgrade instructions.\n";
+    exit(1);
+}
+
 require_once __DIR__ . '/TestCase.php';

From 8c03fdd51ffb0bf7cd3e7e7cb402a66da6d11c51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 19:26:06 +0100
Subject: [PATCH 355/386] NEW Upgrade of Stripe lib to 6.4.1

---
 .../includes/stripe/lib/ApiOperations/All.php |  34 ++
 .../stripe/lib/ApiOperations/Create.php       |  28 +
 .../stripe/lib/ApiOperations/Delete.php       |  27 +
 .../lib/ApiOperations/NestedResource.php      | 115 ++++
 .../stripe/lib/ApiOperations/Request.php      |  60 ++
 .../stripe/lib/ApiOperations/Retrieve.php     |  27 +
 .../stripe/lib/ApiOperations/Update.php       |  46 ++
 .../includes/stripe/lib/Error/Idempotency.php |   7 +
 .../stripe/lib/Error/OAuth/InvalidClient.php  |  10 +
 .../stripe/lib/Error/OAuth/InvalidGrant.php   |  13 +
 .../stripe/lib/Error/OAuth/InvalidRequest.php |  11 +
 .../stripe/lib/Error/OAuth/InvalidScope.php   |  10 +
 .../stripe/lib/Error/OAuth/OAuthBase.php      |  23 +
 .../lib/Error/OAuth/UnsupportedGrantType.php  |  11 +
 .../Error/OAuth/UnsupportedResponseType.php   |  11 +
 .../lib/Error/SignatureVerification.php       |  20 +
 .../stripe/lib/Util/DefaultLogger.php         |  18 +
 .../stripe/lib/Util/LoggerInterface.php       |  36 ++
 .../stripe/lib/Util/RandomGenerator.php       |  34 ++
 .../stripe/tests/Stripe/AccountTest.php       | 365 +++++++++++
 .../stripe/tests/Stripe/AlipayAccountTest.php |  76 +++
 .../stripe/tests/Stripe/ApiRequestorTest.php  | 572 ++++++++++++++++++
 .../tests/Stripe/ApplePayDomainTest.php       |  52 ++
 .../tests/Stripe/ApplicationFeeRefundTest.php |  21 +
 .../tests/Stripe/ApplicationFeeTest.php       |  83 +++
 .../stripe/tests/Stripe/BalanceTest.php       |  16 +
 .../tests/Stripe/BalanceTransactionTest.php   |  29 +
 .../stripe/tests/Stripe/BankAccountTest.php   |  99 +++
 .../tests/Stripe/BitcoinReceiverTest.php      |  62 ++
 .../includes/stripe/tests/Stripe/CardTest.php |  94 +++
 .../stripe/tests/Stripe/ChargeTest.php        | 140 +++++
 .../stripe/tests/Stripe/CollectionTest.php    | 147 +++++
 .../stripe/tests/Stripe/CountrySpecTest.php   |  29 +
 .../stripe/tests/Stripe/CouponTest.php        |  79 +++
 .../stripe/tests/Stripe/CustomerTest.php      | 269 ++++++++
 .../stripe/tests/Stripe/DisputeTest.php       |  65 ++
 .../stripe/tests/Stripe/EphemeralKeyTest.php  |  43 ++
 .../stripe/tests/Stripe/Error/BaseTest.php    |  36 ++
 .../Error/SignatureVerificationTest.php       |  12 +
 .../stripe/tests/Stripe/EventTest.php         |  29 +
 .../stripe/tests/Stripe/ExchangeRateTest.php  |  54 ++
 .../stripe/tests/Stripe/FileUploadTest.php    | 104 ++++
 .../Stripe/HttpClient/CurlClientTest.php      | 228 +++++++
 .../stripe/tests/Stripe/InvoiceItemTest.php   |  78 +++
 .../stripe/tests/Stripe/InvoiceTest.php       |  87 +++
 .../stripe/tests/Stripe/OAuthTest.php         |  97 +++
 .../stripe/tests/Stripe/OrderReturnTest.php   |  29 +
 .../stripe/tests/Stripe/OrderTest.php         |  87 +++
 .../stripe/tests/Stripe/PayoutTest.php        |  77 +++
 .../includes/stripe/tests/Stripe/PlanTest.php |  80 +++
 .../stripe/tests/Stripe/ProductTest.php       |  77 +++
 .../stripe/tests/Stripe/RecipientTest.php     |  90 +++
 .../stripe/tests/Stripe/RefundTest.php        |  65 ++
 .../includes/stripe/tests/Stripe/SKUTest.php  |  82 +++
 .../stripe/tests/Stripe/SourceTest.php        | 134 ++++
 .../stripe/tests/Stripe/StripeObjectTest.php  | 453 ++++++++++++++
 .../stripe/tests/Stripe/StripeTest.php        |  30 +
 .../tests/Stripe/SubscriptionItemTest.php     |  77 +++
 .../stripe/tests/Stripe/SubscriptionTest.php  | 115 ++++
 .../stripe/tests/Stripe/ThreeDSecureTest.php  |  32 +
 .../stripe/tests/Stripe/TokenTest.php         |  28 +
 .../stripe/tests/Stripe/TopupTest.php         |  69 +++
 .../tests/Stripe/TransferReversalTest.php     |  21 +
 .../stripe/tests/Stripe/TransferTest.php      | 140 +++++
 .../tests/Stripe/Util/DefaultLoggerTest.php   |  28 +
 .../tests/Stripe/Util/RequestOptionsTest.php  |  81 +++
 .../stripe/tests/Stripe/Util/UtilTest.php     |  90 +++
 .../stripe/tests/Stripe/WebhookTest.php       | 110 ++++
 htdocs/includes/stripe/tests/data/test.png    | Bin 0 -> 95 bytes
 69 files changed, 5502 insertions(+)
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/All.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/Create.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/Delete.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/NestedResource.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/Request.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/Retrieve.php
 create mode 100644 htdocs/includes/stripe/lib/ApiOperations/Update.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Idempotency.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php
 create mode 100644 htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php
 create mode 100644 htdocs/includes/stripe/lib/Error/SignatureVerification.php
 create mode 100644 htdocs/includes/stripe/lib/Util/DefaultLogger.php
 create mode 100644 htdocs/includes/stripe/lib/Util/LoggerInterface.php
 create mode 100644 htdocs/includes/stripe/lib/Util/RandomGenerator.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/AccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/AlipayAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ApiRequestorTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ApplePayDomainTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ApplicationFeeRefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ApplicationFeeTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/BalanceTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/BalanceTransactionTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/BankAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/BitcoinReceiverTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/CardTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ChargeTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/CollectionTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/CountrySpecTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/CouponTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/CustomerTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/DisputeTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/EphemeralKeyTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/Error/BaseTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/Error/SignatureVerificationTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/EventTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ExchangeRateTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/FileUploadTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/HttpClient/CurlClientTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/InvoiceItemTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/InvoiceTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/OAuthTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/OrderReturnTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/OrderTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/PayoutTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/PlanTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ProductTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/RecipientTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/RefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/SKUTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/SourceTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/StripeObjectTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/StripeTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/SubscriptionItemTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/SubscriptionTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/ThreeDSecureTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/TokenTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/TopupTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/TransferReversalTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/TransferTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/Util/DefaultLoggerTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/Util/RequestOptionsTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/Util/UtilTest.php
 create mode 100644 htdocs/includes/stripe/tests/Stripe/WebhookTest.php
 create mode 100644 htdocs/includes/stripe/tests/data/test.png

diff --git a/htdocs/includes/stripe/lib/ApiOperations/All.php b/htdocs/includes/stripe/lib/ApiOperations/All.php
new file mode 100644
index 00000000000..d1c6424816f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/All.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for listable resources. Adds a `all()` static method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait All
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return \Stripe\Collection of ApiResources
+     */
+    public static function all($params = null, $opts = null)
+    {
+        self::_validateParams($params);
+        $url = static::classUrl();
+
+        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 Error\Api($message);
+        }
+        $obj->setLastResponse($response);
+        $obj->setRequestParams($params);
+        return $obj;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Create.php b/htdocs/includes/stripe/lib/ApiOperations/Create.php
new file mode 100644
index 00000000000..0fb341d029b
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/Create.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for creatable resources. Adds a `create()` static method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Create
+{
+    /**
+     * @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);
+        $url = static::classUrl();
+
+        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/lib/ApiOperations/Delete.php b/htdocs/includes/stripe/lib/ApiOperations/Delete.php
new file mode 100644
index 00000000000..7df6797919a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/Delete.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for deletable resources. Adds a `delete()` method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Delete
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return \Stripe\ApiResource The deleted resource.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        self::_validateParams($params);
+
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('delete', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiOperations/NestedResource.php b/htdocs/includes/stripe/lib/ApiOperations/NestedResource.php
new file mode 100644
index 00000000000..1c3a73f45de
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/NestedResource.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for resources that have nested resources.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait NestedResource
+{
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return \Stripe\StripeObject
+     */
+    protected static function _nestedResourceOperation($method, $url, $params = null, $options = null)
+    {
+        self::_validateParams($params);
+
+        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
+     *
+     * @return string
+     */
+    protected static function _nestedResourceUrl($id, $nestedPath, $nestedId = null)
+    {
+        $url = static::resourceUrl($id) . $nestedPath;
+        if ($nestedId !== null) {
+            $url .= "/$nestedId";
+        }
+        return $url;
+    }
+
+    /**
+     * @param string $id
+     * @param string $nestedPath
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @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 array|null $params
+     * @param array|string|null $options
+     *
+     * @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 array|null $params
+     * @param array|string|null $options
+     *
+     * @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 array|null $params
+     * @param array|string|null $options
+     *
+     * @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
+     *
+     * @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/lib/ApiOperations/Request.php b/htdocs/includes/stripe/lib/ApiOperations/Request.php
new file mode 100644
index 00000000000..c6b06585ad2
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/Request.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for resources that need to make API requests.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Request
+{
+    /**
+     * @param array|null|mixed $params The list of parameters to validate
+     *
+     * @throws \Stripe\Error\Api 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 "
+               . "would be: \"Stripe\\Charge::create(['amount' => 100, "
+               . "'currency' => 'usd', 'source' => 'tok_1234'])\")";
+            throw new \Stripe\Error\Api($message);
+        }
+    }
+
+    /**
+     * @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
+     *
+     * @return array tuple containing (the JSON response, $options)
+     */
+    protected function _request($method, $url, $params = [], $options = null)
+    {
+        $opts = $this->_opts->merge($options);
+        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts);
+        $this->setLastResponse($resp);
+        return [$resp->json, $options];
+    }
+
+    /**
+     * @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
+     *
+     * @return array tuple containing (the JSON response, $options)
+     */
+    protected static function _staticRequest($method, $url, $params, $options)
+    {
+        $opts = \Stripe\Util\RequestOptions::parse($options);
+        $requestor = new \Stripe\ApiRequestor($opts->apiKey, static::baseUrl());
+        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers);
+        $opts->discardNonPersistentHeaders();
+        return [$response, $opts];
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Retrieve.php b/htdocs/includes/stripe/lib/ApiOperations/Retrieve.php
new file mode 100644
index 00000000000..a037326b3e8
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/Retrieve.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for retrievable resources. Adds a `retrieve()` static method to the
+ * class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+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
+     *
+     * @return \Stripe\StripeObject
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        $opts = \Stripe\Util\RequestOptions::parse($opts);
+        $instance = new static($id, $opts);
+        $instance->refresh();
+        return $instance;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Update.php b/htdocs/includes/stripe/lib/ApiOperations/Update.php
new file mode 100644
index 00000000000..0683e77af1a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiOperations/Update.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for updatable resources. Adds an `update()` static method and a
+ * `save()` method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Update
+{
+    /**
+     * @param string $id The ID of the resource to update.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return \Stripe\ApiResource The updated resource.
+     */
+    public static function update($id, $params = null, $opts = null)
+    {
+        self::_validateParams($params);
+        $url = static::resourceUrl($id);
+
+        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
+     *
+     * @return \Stripe\ApiResource The saved resource.
+     */
+    public function save($opts = null)
+    {
+        $params = $this->serializeParameters();
+        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/lib/Error/Idempotency.php b/htdocs/includes/stripe/lib/Error/Idempotency.php
new file mode 100644
index 00000000000..ea44d12e4ea
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Idempotency.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Idempotency extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php b/htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php
new file mode 100644
index 00000000000..b47346cde5f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * InvalidClient is raised when authentication fails.
+ */
+class InvalidClient extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php b/htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php
new file mode 100644
index 00000000000..62df56c2520
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * InvalidGrant is raised 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 InvalidGrant extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php b/htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php
new file mode 100644
index 00000000000..7f0e8b4ee86
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * InvalidRequest is raised when a code, refresh token, or grant type
+ * parameter is not provided, but was required.
+ */
+class InvalidRequest extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php b/htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php
new file mode 100644
index 00000000000..03cc67e6309
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * InvalidScope is raised when an invalid scope parameter is provided.
+ */
+class InvalidScope extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php b/htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php
new file mode 100644
index 00000000000..2f1721331c5
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+class OAuthBase extends \Stripe\Error\Base
+{
+    public function __construct(
+        $code,
+        $description,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null
+    ) {
+        parent::__construct($description, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
+        $this->code = $code;
+    }
+
+    public function getErrorCode()
+    {
+        return $this->code;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php b/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php
new file mode 100644
index 00000000000..421adc99645
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * UnsupportedGrantType is raised when an unuspported grant type
+ * parameter is specified.
+ */
+class UnsupportedGrantType extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php b/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php
new file mode 100644
index 00000000000..ed14878945e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Error\OAuth;
+
+/**
+ * UnsupportedResponseType is raised when an unsupported response type
+ * parameter is specified.
+ */
+class UnsupportedResponseType extends OAuthBase
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/SignatureVerification.php b/htdocs/includes/stripe/lib/Error/SignatureVerification.php
new file mode 100644
index 00000000000..98ddd3b02d5
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/SignatureVerification.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Stripe\Error;
+
+class SignatureVerification extends Base
+{
+    public function __construct(
+        $message,
+        $sigHeader,
+        $httpBody = null
+    ) {
+        parent::__construct($message, null, $httpBody, null, null);
+        $this->sigHeader = $sigHeader;
+    }
+
+    public function getSigHeader()
+    {
+        return $this->sigHeader;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/DefaultLogger.php b/htdocs/includes/stripe/lib/Util/DefaultLogger.php
new file mode 100644
index 00000000000..1a8663699f5
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/DefaultLogger.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe\Util;
+
+/**
+ * A very basic implementation of LoggerInterface that has just enough
+ * functionality that it can be the default for this library.
+ */
+class DefaultLogger implements LoggerInterface
+{
+    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.');
+        }
+        error_log($message);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/LoggerInterface.php b/htdocs/includes/stripe/lib/Util/LoggerInterface.php
new file mode 100644
index 00000000000..bbdfc929982
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/LoggerInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe\Util;
+
+/**
+ * Describes a logger instance.
+ *
+ * This is a subset of the interface of the same name in the PSR-3 logger
+ * interface. We guarantee to keep it compatible, but we'd redefined it here so
+ * that we don't have to pull in the extra dependencies for users who don't want
+ * it.
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ */
+interface LoggerInterface
+{
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = []);
+}
diff --git a/htdocs/includes/stripe/lib/Util/RandomGenerator.php b/htdocs/includes/stripe/lib/Util/RandomGenerator.php
new file mode 100644
index 00000000000..470f2bce8b3
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/RandomGenerator.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Stripe\Util;
+
+/**
+ * A basic random generator. This is in a separate class so we the generator
+ * can be injected as a dependency and replaced with a mock in tests.
+ */
+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;
+    }
+
+    /**
+     * Returns a v4 UUID.
+     *
+     * @return string
+     */
+    public function uuid()
+    {
+        $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);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/AccountTest.php b/htdocs/includes/stripe/tests/Stripe/AccountTest.php
new file mode 100644
index 00000000000..4c621690dcf
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/AccountTest.php
@@ -0,0 +1,365 @@
+<?php
+
+namespace Stripe;
+
+class AccountTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'acct_123';
+    const TEST_EXTERNALACCOUNT_ID = 'ba_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/accounts'
+        );
+        $resources = Account::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Account", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Account::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsRetrievableWithoutId()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/account'
+        );
+        $resource = Account::retrieve();
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts'
+        );
+        $resource = Account::create(["type" => "custom"]);
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Account::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Account::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Account::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/accounts/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+    }
+
+    public function testIsRejectable()
+    {
+        $account = Account::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . $account->id . '/reject'
+        );
+        $resource = $account->reject(["reason" => "fraud"]);
+        $this->assertInstanceOf("Stripe\\Account", $resource);
+        $this->assertSame($resource, $account);
+    }
+
+    public function testIsDeauthorizable()
+    {
+        $resource = Account::retrieve(self::TEST_RESOURCE_ID);
+        $this->stubRequest(
+            'post',
+            '/oauth/deauthorize',
+            [
+                'client_id' => Stripe::getClientId(),
+                'stripe_user_id' => $resource->id,
+            ],
+            null,
+            false,
+            [
+                'stripe_user_id' => $resource->id,
+            ],
+            200,
+            Stripe::$connectBase
+        );
+        $resource->deauthorize();
+    }
+
+    public function testCanCreateExternalAccount()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts'
+        );
+        $resource = Account::createExternalAccount(self::TEST_RESOURCE_ID, [
+            "external_account" => "btok_123",
+        ]);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanRetrieveExternalAccount()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts/' . self::TEST_EXTERNALACCOUNT_ID
+        );
+        $resource = Account::retrieveExternalAccount(self::TEST_RESOURCE_ID, self::TEST_EXTERNALACCOUNT_ID);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanUpdateExternalAccount()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts/' . self::TEST_EXTERNALACCOUNT_ID
+        );
+        $resource = Account::updateExternalAccount(self::TEST_RESOURCE_ID, self::TEST_EXTERNALACCOUNT_ID, [
+            "name" => "name",
+        ]);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanDeleteExternalAccount()
+    {
+        $this->expectsRequest(
+            'delete',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts/' . self::TEST_EXTERNALACCOUNT_ID
+        );
+        $resource = Account::deleteExternalAccount(self::TEST_RESOURCE_ID, self::TEST_EXTERNALACCOUNT_ID);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanListExternalAccounts()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts'
+        );
+        $resources = Account::allExternalAccounts(self::TEST_RESOURCE_ID);
+        $this->assertTrue(is_array($resources->data));
+    }
+
+    public function testCanCreateLoginLink()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/accounts/' . self::TEST_RESOURCE_ID . '/login_links'
+        );
+        $resource = Account::createLoginLink(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\LoginLink", $resource);
+    }
+
+    public function testSerializeNewAdditionalOwners()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+            'legal_entity' => StripeObject::constructFrom([]),
+        ], null);
+        $obj->legal_entity->additional_owners = [
+            ['first_name' => 'Joe'],
+            ['first_name' => 'Jane'],
+        ];
+
+        $expected = [
+            'legal_entity' => [
+                'additional_owners' => [
+                    0 => ['first_name' => 'Joe'],
+                    1 => ['first_name' => 'Jane'],
+                ],
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializePartiallyChangedAdditionalOwners()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+            'legal_entity' => [
+                'additional_owners' => [
+                    StripeObject::constructFrom(['first_name' => 'Joe']),
+                    StripeObject::constructFrom(['first_name' => 'Jane']),
+                ],
+            ],
+        ], null);
+        $obj->legal_entity->additional_owners[1]->first_name = 'Stripe';
+
+        $expected = [
+            'legal_entity' => [
+                'additional_owners' => [
+                    1 => ['first_name' => 'Stripe'],
+                ],
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeUnchangedAdditionalOwners()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+            'legal_entity' => [
+                'additional_owners' => [
+                    StripeObject::constructFrom(['first_name' => 'Joe']),
+                    StripeObject::constructFrom(['first_name' => 'Jane']),
+                ],
+            ],
+        ], null);
+
+        $expected = [
+            'legal_entity' => [
+                'additional_owners' => [],
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeUnsetAdditionalOwners()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+            'legal_entity' => [
+                'additional_owners' => [
+                    StripeObject::constructFrom(['first_name' => 'Joe']),
+                    StripeObject::constructFrom(['first_name' => 'Jane']),
+                ],
+            ],
+        ], null);
+        $obj->legal_entity->additional_owners = null;
+
+        // Note that the empty string that we send for this one has a special
+        // meaning for the server, which interprets it as an array unset.
+        $expected = [
+            'legal_entity' => [
+                'additional_owners' => '',
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testSerializeAdditionalOwnersDeletedItem()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+            'legal_entity' => [
+                'additional_owners' => [
+                    StripeObject::constructFrom(['first_name' => 'Joe']),
+                    StripeObject::constructFrom(['first_name' => 'Jane']),
+                ],
+            ],
+        ], null);
+        unset($obj->legal_entity->additional_owners[0]);
+
+        $obj->serializeParameters();
+    }
+
+    public function testSerializeExternalAccountString()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+        ], null);
+        $obj->external_account = 'btok_123';
+
+        $expected = [
+            'external_account' => 'btok_123',
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeExternalAccountHash()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+        ], null);
+        $obj->external_account = [
+            'object' => 'bank_account',
+            'routing_number' => '110000000',
+            'account_number' => '000123456789',
+            'country' => 'US',
+            'currency' => 'usd',
+        ];
+
+        $expected = [
+            'external_account' => [
+                'object' => 'bank_account',
+                'routing_number' => '110000000',
+                'account_number' => '000123456789',
+                'country' => 'US',
+                'currency' => 'usd',
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeBankAccountString()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+        ], null);
+        $obj->bank_account = 'btok_123';
+
+        $expected = [
+            'bank_account' => 'btok_123',
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeBankAccountHash()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'account',
+        ], null);
+        $obj->bank_account = [
+            'object' => 'bank_account',
+            'routing_number' => '110000000',
+            'account_number' => '000123456789',
+            'country' => 'US',
+            'currency' => 'usd',
+        ];
+
+        $expected = [
+            'bank_account' => [
+                'object' => 'bank_account',
+                'routing_number' => '110000000',
+                'account_number' => '000123456789',
+                'country' => 'US',
+                'currency' => 'usd',
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/AlipayAccountTest.php b/htdocs/includes/stripe/tests/Stripe/AlipayAccountTest.php
new file mode 100644
index 00000000000..7159f5444df
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/AlipayAccountTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Stripe;
+
+class AlipayAccountTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'aliacc_123';
+
+    // Because of the wildcard nature of sources, stripe-mock cannot currently
+    // reliably return sources of a given type, so we create a fixture manually
+    public function createFixture($params = [])
+    {
+        if (empty($params)) {
+            $params['customer'] = 'cus_123';
+        }
+        $base = [
+            'id' => self::TEST_RESOURCE_ID,
+            'object' => 'card',
+            'metadata' => [],
+        ];
+        return AlipayAccount::constructFrom(
+            array_merge($params, $base),
+            new Util\RequestOptions()
+        );
+    }
+
+    public function testHasCorrectUrlForCustomer()
+    {
+        $resource = $this->createFixture(['customer' => 'cus_123']);
+        $this->assertSame(
+            "/v1/customers/cus_123/sources/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyRetrievable()
+    {
+        AlipayAccount::retrieve(self::TEST_RESOURCE_ID);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = $this->createFixture();
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->save();
+        $this->assertSame("Stripe\\AlipayAccount", get_class($resource));
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyUpdatable()
+    {
+        AlipayAccount::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = $this->createFixture();
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->delete();
+        $this->assertSame("Stripe\\AlipayAccount", get_class($resource));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ApiRequestorTest.php b/htdocs/includes/stripe/tests/Stripe/ApiRequestorTest.php
new file mode 100644
index 00000000000..6fb8229c57d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ApiRequestorTest.php
@@ -0,0 +1,572 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class ApiRequestorTest extends TestCase
+{
+    public function testEncodeObjects()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_encodeObjects');
+        $method->setAccessible(true);
+
+        $a = ['customer' => new Customer('abcd')];
+        $enc = $method->invoke(null, $a);
+        $this->assertSame($enc, ['customer' => 'abcd']);
+
+        // Preserves UTF-8
+        $v = ['customer' => "☃"];
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, $v);
+
+        // Encodes latin-1 -> UTF-8
+        $v = ['customer' => "\xe9"];
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, ['customer' => "\xc3\xa9"]);
+
+        // Encodes booleans
+        $v = true;
+        $enc = $method->invoke(null, $v);
+        $this->assertSame('true', $enc);
+
+        $v = false;
+        $enc = $method->invoke(null, $v);
+        $this->assertSame('false', $enc);
+    }
+
+    public function testHttpClientInjection()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('httpClient');
+        $method->setAccessible(true);
+
+        $curl = new CurlClient();
+        $curl->setTimeout(10);
+        ApiRequestor::setHttpClient($curl);
+
+        $injectedCurl = $method->invoke(new ApiRequestor());
+        $this->assertSame($injectedCurl, $curl);
+    }
+
+    public function testDefaultHeaders()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_defaultHeaders');
+        $method->setAccessible(true);
+
+        // no way to stub static methods with PHPUnit 4.x :(
+        Stripe::setAppInfo('MyTestApp', '1.2.34', 'https://mytestapp.example');
+        $apiKey = 'sk_test_notarealkey';
+        $clientInfo = ['httplib' => 'testlib 0.1.2'];
+
+        $headers = $method->invoke(null, $apiKey, $clientInfo);
+
+        $ua = json_decode($headers['X-Stripe-Client-User-Agent']);
+        $this->assertSame($ua->application->name, 'MyTestApp');
+        $this->assertSame($ua->application->version, '1.2.34');
+        $this->assertSame($ua->application->url, 'https://mytestapp.example');
+
+        $this->assertSame($ua->httplib, 'testlib 0.1.2');
+
+        $this->assertSame(
+            $headers['User-Agent'],
+            'Stripe/v1 PhpBindings/' . Stripe::VERSION . ' MyTestApp/1.2.34 (https://mytestapp.example)'
+        );
+
+        $this->assertSame($headers['Authorization'], 'Bearer ' . $apiKey);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\Authentication
+     * @expectedExceptionMessageRegExp #No API key provided#
+     */
+    public function testRaisesAuthenticationErrorWhenNoApiKey()
+    {
+        Stripe::setApiKey(null);
+        Charge::create();
+    }
+
+    public function testRaisesInvalidRequestErrorOn400()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'type' => 'invalid_request_error',
+                    'message' => 'Missing id',
+                    'param' => 'id',
+                ],
+            ],
+            400
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('Missing id', $e->getMessage());
+            $this->assertSame('id', $e->getStripeParam());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesIdempotencyErrorOn400AndTypeIdempotencyError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            array(),
+            null,
+            false,
+            array(
+                'error' => array(
+                    'type' => 'idempotency_error',
+                    'message' => "Keys for idempotent requests can only be used with the same parameters they were first used with. Try using a key other than 'abc' if you meant to execute a different request.",
+                ),
+            ),
+            400
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\Idempotency $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame("Keys for idempotent requests can only be used with the same parameters they were first used with. Try using a key other than 'abc' if you meant to execute a different request.", $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesAuthenticationErrorOn401()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'type' => 'invalid_request_error',
+                    'message' => 'You did not provide an API key.',
+                ],
+            ],
+            401
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\Authentication $e) {
+            $this->assertSame(401, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('You did not provide an API key.', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesCardErrorOn402()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'type' => 'card_error',
+                    'message' => 'Your card was declined.',
+                    'code' => 'card_declined',
+                    'decline_code' => 'generic_decline',
+                    'charge' => 'ch_declined_charge',
+                    'param' => 'exp_month',
+                ],
+            ],
+            402
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\Card $e) {
+            $this->assertSame(402, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('Your card was declined.', $e->getMessage());
+            $this->assertSame('card_declined', $e->getStripeCode());
+            $this->assertSame('generic_decline', $e->getDeclineCode());
+            $this->assertSame('exp_month', $e->getStripeParam());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesPermissionErrorOn403()
+    {
+        $this->stubRequest(
+            'GET',
+            '/v1/accounts/foo',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'type' => 'invalid_request_error',
+                    'message' => "The provided key 'sk_test_********************1234' does not have access to account 'foo' (or that account does not exist). Application access may have been revoked.",
+                ],
+            ],
+            403
+        );
+
+        try {
+            Account::retrieve('foo');
+            $this->fail("Did not raise error");
+        } catch (Error\Permission $e) {
+            $this->assertSame(403, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame("The provided key 'sk_test_********************1234' does not have access to account 'foo' (or that account does not exist). Application access may have been revoked.", $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesInvalidRequestErrorOn404()
+    {
+        $this->stubRequest(
+            'GET',
+            '/v1/charges/foo',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'type' => 'invalid_request_error',
+                    'message' => 'No such charge: foo',
+                    'param' => 'id',
+                ],
+            ],
+            404
+        );
+
+        try {
+            Charge::retrieve('foo');
+            $this->fail("Did not raise error");
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(404, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('No such charge: foo', $e->getMessage());
+            $this->assertSame('id', $e->getStripeParam());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesRateLimitErrorOn429()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'message' => 'Too many requests',
+                ],
+            ],
+            429
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\RateLimit $e) {
+            $this->assertSame(429, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('Too many requests', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesRateLimitErrorOn400AndCodeRateLimit()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            null,
+            false,
+            [
+                'error' => [
+                    'code' => 'rate_limit',
+                    'message' => 'Too many requests',
+                ],
+            ],
+            400
+        );
+
+        try {
+            Charge::create();
+            $this->fail("Did not raise error");
+        } catch (Error\RateLimit $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertSame('Too many requests', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthInvalidRequestError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'invalid_request',
+                'error_description' => 'No grant type specified',
+            ],
+            400,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\InvalidRequest $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertSame('invalid_request', $e->getErrorCode());
+            $this->assertSame('No grant type specified', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthInvalidClientError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'invalid_client',
+                'error_description' => 'No authentication was provided. Send your secret API key using the Authorization header, or as a client_secret POST parameter.',
+            ],
+            401,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\InvalidClient $e) {
+            $this->assertSame(401, $e->getHttpStatus());
+            $this->assertSame('invalid_client', $e->getErrorCode());
+            $this->assertSame('No authentication was provided. Send your secret API key using the Authorization header, or as a client_secret POST parameter.', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthInvalidGrantError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'invalid_grant',
+                'error_description' => 'This authorization code has already been used. All tokens issued with this code have been revoked.',
+            ],
+            400,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\InvalidGrant $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertSame('invalid_grant', $e->getErrorCode());
+            $this->assertSame('This authorization code has already been used. All tokens issued with this code have been revoked.', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthInvalidScopeError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'invalid_scope',
+                'error_description' => 'Invalid scope provided: invalid_scope.',
+            ],
+            400,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\InvalidScope $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertSame('invalid_scope', $e->getErrorCode());
+            $this->assertSame('Invalid scope provided: invalid_scope.', $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthUnsupportedGrantTypeError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'unsupported_grant_type',
+            ],
+            400,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\UnsupportedGrantType $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertSame('unsupported_grant_type', $e->getErrorCode());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testRaisesOAuthUnsupportedResponseTypeError()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [],
+            null,
+            false,
+            [
+                'error' => 'unsupported_response_type',
+                'error_description' => "Only 'code' response_type is supported, but 'unsupported_response_type' was provided",
+            ],
+            400,
+            Stripe::$connectBase
+        );
+
+        try {
+            OAuth::token();
+            $this->fail("Did not raise error");
+        } catch (Error\OAuth\UnsupportedResponseType $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+            $this->assertSame('unsupported_response_type', $e->getErrorCode());
+            $this->assertSame("Only 'code' response_type is supported, but 'unsupported_response_type' was provided", $e->getMessage());
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testHeaderStripeVersionGlobal()
+    {
+        Stripe::setApiVersion('2222-22-22');
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            [
+                'Stripe-Version: 2222-22-22',
+            ],
+            false,
+            [
+                'id' => 'ch_123',
+                'object' => 'charge',
+            ]
+        );
+        Charge::create();
+    }
+
+    public function testHeaderStripeVersionRequestOptions()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            [
+                'Stripe-Version: 2222-22-22',
+            ],
+            false,
+            [
+                'id' => 'ch_123',
+                'object' => 'charge',
+            ]
+        );
+        Charge::create([], ['stripe_version' => '2222-22-22']);
+    }
+
+    public function testHeaderStripeAccountGlobal()
+    {
+        Stripe::setAccountId('acct_123');
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            [
+                'Stripe-Account: acct_123',
+            ],
+            false,
+            [
+                'id' => 'ch_123',
+                'object' => 'charge',
+            ]
+        );
+        Charge::create();
+    }
+
+    public function testHeaderStripeAccountRequestOptions()
+    {
+        $this->stubRequest(
+            'POST',
+            '/v1/charges',
+            [],
+            [
+                'Stripe-Account: acct_123',
+            ],
+            false,
+            [
+                'id' => 'ch_123',
+                'object' => 'charge',
+            ]
+        );
+        Charge::create([], ['stripe_account' => 'acct_123']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ApplePayDomainTest.php b/htdocs/includes/stripe/tests/Stripe/ApplePayDomainTest.php
new file mode 100644
index 00000000000..d033f55cbb0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ApplePayDomainTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Stripe;
+
+class ApplePayDomainTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'apwc_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/apple_pay/domains'
+        );
+        $resources = ApplePayDomain::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\ApplePayDomain", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/apple_pay/domains/' . self::TEST_RESOURCE_ID
+        );
+        $resource = ApplePayDomain::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\ApplePayDomain", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/apple_pay/domains'
+        );
+        $resource = ApplePayDomain::create([
+            "domain_name" => "domain",
+        ]);
+        $this->assertInstanceOf("Stripe\\ApplePayDomain", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = ApplePayDomain::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/apple_pay/domains/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\ApplePayDomain", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ApplicationFeeRefundTest.php b/htdocs/includes/stripe/tests/Stripe/ApplicationFeeRefundTest.php
new file mode 100644
index 00000000000..9af059ff7f3
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ApplicationFeeRefundTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeRefundTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'fr_123';
+    const TEST_FEE_ID = 'fee_123';
+
+    public function testIsSaveable()
+    {
+        $resource = ApplicationFee::retrieveRefund(self::TEST_FEE_ID, self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/application_fees/' . $resource->fee . '/refunds/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\ApplicationFeeRefund", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ApplicationFeeTest.php b/htdocs/includes/stripe/tests/Stripe/ApplicationFeeTest.php
new file mode 100644
index 00000000000..66e007ff3d2
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ApplicationFeeTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'fee_123';
+    const TEST_FEEREFUND_ID = 'fr_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/application_fees'
+        );
+        $resources = ApplicationFee::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\ApplicationFee", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/application_fees/' . self::TEST_RESOURCE_ID
+        );
+        $resource = ApplicationFee::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\ApplicationFee", $resource);
+    }
+
+    public function testIsRefundable()
+    {
+        $fee = ApplicationFee::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/application_fees/' . $fee->id . '/refunds'
+        );
+        $resource = $fee->refund();
+        $this->assertInstanceOf("Stripe\\ApplicationFee", $resource);
+        $this->assertSame($resource, $fee);
+    }
+
+    public function testCanCreateRefund()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/application_fees/' . self::TEST_RESOURCE_ID . '/refunds'
+        );
+        $resource = ApplicationFee::createRefund(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\ApplicationFeeRefund", $resource);
+    }
+
+    public function testCanRetrieveRefund()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/application_fees/' . self::TEST_RESOURCE_ID . '/refunds/' . self::TEST_FEEREFUND_ID
+        );
+        $resource = ApplicationFee::retrieveRefund(self::TEST_RESOURCE_ID, self::TEST_FEEREFUND_ID);
+        $this->assertInstanceOf("Stripe\\ApplicationFeeRefund", $resource);
+    }
+
+    public function testCanUpdateRefund()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/application_fees/' . self::TEST_RESOURCE_ID . '/refunds/' . self::TEST_FEEREFUND_ID
+        );
+        $resource = ApplicationFee::updateRefund(self::TEST_RESOURCE_ID, self::TEST_FEEREFUND_ID);
+        $this->assertInstanceOf("Stripe\\ApplicationFeeRefund", $resource);
+    }
+
+    public function testCanListRefunds()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/application_fees/' . self::TEST_RESOURCE_ID . '/refunds'
+        );
+        $resources = ApplicationFee::allRefunds(self::TEST_RESOURCE_ID);
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\ApplicationFeeRefund", $resources->data[0]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/BalanceTest.php b/htdocs/includes/stripe/tests/Stripe/BalanceTest.php
new file mode 100644
index 00000000000..ccbdbdfb747
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/BalanceTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTest extends TestCase
+{
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/balance'
+        );
+        $resource = Balance::retrieve();
+        $this->assertInstanceOf("Stripe\\Balance", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/BalanceTransactionTest.php b/htdocs/includes/stripe/tests/Stripe/BalanceTransactionTest.php
new file mode 100644
index 00000000000..8785e859113
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/BalanceTransactionTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTransactionTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'txn_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/balance/history'
+        );
+        $resources = BalanceTransaction::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\BalanceTransaction", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/balance/history/' . self::TEST_RESOURCE_ID
+        );
+        $resource = BalanceTransaction::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\BalanceTransaction", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/BankAccountTest.php b/htdocs/includes/stripe/tests/Stripe/BankAccountTest.php
new file mode 100644
index 00000000000..ab1dff9d5a8
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/BankAccountTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Stripe;
+
+class BankAccountTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'ba_123';
+
+    // Because of the wildcard nature of sources, stripe-mock cannot currently
+    // reliably return sources of a given type, so we create a fixture manually
+    public function createFixture($params = [])
+    {
+        if (empty($params)) {
+            $params['customer'] = 'cus_123';
+        }
+        $base = [
+            'id' => self::TEST_RESOURCE_ID,
+            'object' => 'bank_account',
+            'metadata' => [],
+        ];
+        return BankAccount::constructFrom(
+            array_merge($params, $base),
+            new Util\RequestOptions()
+        );
+    }
+
+    public function testHasCorrectUrlForCustomer()
+    {
+        $resource = $this->createFixture(['customer' => 'cus_123']);
+        $this->assertSame(
+            "/v1/customers/cus_123/sources/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    public function testHasCorrectUrlForAccount()
+    {
+        $resource = $this->createFixture(['account' => 'acct_123']);
+        $this->assertSame(
+            "/v1/accounts/acct_123/external_accounts/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyRetrievable()
+    {
+        BankAccount::retrieve(self::TEST_RESOURCE_ID);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = $this->createFixture();
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->save();
+        $this->assertSame("Stripe\\BankAccount", get_class($resource));
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyUpdatable()
+    {
+        BankAccount::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = $this->createFixture();
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->delete();
+        $this->assertSame("Stripe\\BankAccount", get_class($resource));
+    }
+
+    public function testIsVerifiable()
+    {
+        $resource = $this->createFixture();
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID . "/verify",
+            [
+                "amounts" => [1, 2]
+            ]
+        );
+        $resource->verify(["amounts" => [1, 2]]);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/BitcoinReceiverTest.php b/htdocs/includes/stripe/tests/Stripe/BitcoinReceiverTest.php
new file mode 100644
index 00000000000..cea999fc4f2
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/BitcoinReceiverTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Stripe;
+
+class BitcoinReceiverTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'btcrcv_123';
+
+    // Because of the wildcard nature of sources, stripe-mock cannot currently
+    // reliably return sources of a given type, so we create a fixture manually
+    public function createFixture($params = [])
+    {
+        $base = [
+            'id' => self::TEST_RESOURCE_ID,
+            'object' => 'bitcoin_receiver',
+            'metadata' => [],
+        ];
+        return BitcoinReceiver::constructFrom(
+            array_merge($params, $base),
+            new Util\RequestOptions()
+        );
+    }
+
+    public function testHasCorrectStandaloneUrl()
+    {
+        $resource = $this->createFixture();
+        $this->assertSame(
+            "/v1/bitcoin/receivers/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    public function testHasCorrectUrlForCustomer()
+    {
+        $resource = $this->createFixture(['customer' => 'cus_123']);
+        $this->assertSame(
+            "/v1/customers/cus_123/sources/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/bitcoin/receivers'
+        );
+        $resources = BitcoinReceiver::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertSame("Stripe\\BitcoinReceiver", get_class($resources->data[0]));
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/bitcoin/receivers/' . self::TEST_RESOURCE_ID
+        );
+        $resource = BitcoinReceiver::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertSame("Stripe\\BitcoinReceiver", get_class($resource));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/CardTest.php b/htdocs/includes/stripe/tests/Stripe/CardTest.php
new file mode 100644
index 00000000000..8976eff6679
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/CardTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Stripe;
+
+class CardTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'card_123';
+
+    // Because of the wildcard nature of sources, stripe-mock cannot currently
+    // reliably return sources of a given type, so we create a fixture manually
+    public function createFixture($params = [])
+    {
+        if (empty($params)) {
+            $params['customer'] = 'cus_123';
+        }
+        $base = [
+            'id' => self::TEST_RESOURCE_ID,
+            'object' => 'card',
+            'metadata' => [],
+        ];
+        return Card::constructFrom(
+            array_merge($params, $base),
+            new Util\RequestOptions()
+        );
+    }
+
+    public function testHasCorrectUrlForCustomer()
+    {
+        $resource = $this->createFixture(['customer' => 'cus_123']);
+        $this->assertSame(
+            "/v1/customers/cus_123/sources/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    public function testHasCorrectUrlForAccount()
+    {
+        $resource = $this->createFixture(['account' => 'acct_123']);
+        $this->assertSame(
+            "/v1/accounts/acct_123/external_accounts/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    public function testHasCorrectUrlForRecipient()
+    {
+        $resource = $this->createFixture(['recipient' => 'rp_123']);
+        $this->assertSame(
+            "/v1/recipients/rp_123/cards/" . self::TEST_RESOURCE_ID,
+            $resource->instanceUrl()
+        );
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyRetrievable()
+    {
+        Card::retrieve(self::TEST_RESOURCE_ID);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = $this->createFixture();
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->save();
+        $this->assertSame("Stripe\\Card", get_class($resource));
+    }
+
+    /**
+     * @expectedException \Stripe\Error\InvalidRequest
+     */
+    public function testIsNotDirectlyUpdatable()
+    {
+        Card::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = $this->createFixture();
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/cus_123/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource->delete();
+        $this->assertSame("Stripe\\Card", get_class($resource));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ChargeTest.php b/htdocs/includes/stripe/tests/Stripe/ChargeTest.php
new file mode 100644
index 00000000000..b8c6cbabf3b
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ChargeTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Stripe;
+
+class ChargeTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'ch_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/charges'
+        );
+        $resources = Charge::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Charge", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/charges/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/charges'
+        );
+        $resource = Charge::create([
+            "amount" => 100,
+            "currency" => "usd",
+            "source" => "tok_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Charge::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+    }
+
+    public function testCanRefund()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id . '/refund'
+        );
+        $resource = $charge->refund();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+        $this->assertSame($resource, $charge);
+    }
+
+    public function testCanCapture()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id . '/capture'
+        );
+        $resource = $charge->capture();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+        $this->assertSame($resource, $charge);
+    }
+
+    public function testCanUpdateDispute()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id . '/dispute'
+        );
+        $resource = $charge->updateDispute();
+        $this->assertInstanceOf("Stripe\\Dispute", $resource);
+    }
+
+    public function testCanCloseDispute()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id . '/dispute/close'
+        );
+        $resource = $charge->closeDispute();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+        $this->assertSame($resource, $charge);
+    }
+
+    public function testCanMarkAsFraudulent()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id,
+            ['fraud_details' => ['user_report' => 'fraudulent']]
+        );
+        $resource = $charge->markAsFraudulent();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+        $this->assertSame($resource, $charge);
+    }
+
+    public function testCanMarkAsSafe()
+    {
+        $charge = Charge::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/charges/' . $charge->id,
+            ['fraud_details' => ['user_report' => 'safe']]
+        );
+        $resource = $charge->markAsSafe();
+        $this->assertInstanceOf("Stripe\\Charge", $resource);
+        $this->assertSame($resource, $charge);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/CollectionTest.php b/htdocs/includes/stripe/tests/Stripe/CollectionTest.php
new file mode 100644
index 00000000000..560085aede2
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/CollectionTest.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Stripe;
+
+class CollectionTest extends TestCase
+{
+    /**
+     * @before
+     */
+    public function setUpFixture()
+    {
+        $this->fixture = Collection::constructFrom([
+            'data' => [['id' => 1]],
+            'has_more' => true,
+            'url' => '/things',
+        ]);
+    }
+
+    public function testCanList()
+    {
+        $this->stubRequest(
+            'GET',
+            '/things',
+            [],
+            null,
+            false,
+            [
+                'data' => [['id' => 1]],
+                'has_more' => true,
+                'url' => '/things',
+            ]
+        );
+
+        $resources = $this->fixture->all();
+        $this->assertTrue(is_array($resources->data));
+    }
+
+    public function testCanRetrieve()
+    {
+        $this->stubRequest(
+            'GET',
+            '/things/1',
+            [],
+            null,
+            false,
+            [
+                'id' => 1,
+            ]
+        );
+
+        $this->fixture->retrieve(1);
+    }
+
+    public function testCanCreate()
+    {
+        $this->stubRequest(
+            'POST',
+            '/things',
+            [
+                'foo' => 'bar',
+            ],
+            null,
+            false,
+            [
+                'id' => 2,
+            ]
+        );
+
+        $this->fixture->create([
+            'foo' => 'bar',
+        ]);
+    }
+
+    public function testProvidesAutoPagingIterator()
+    {
+        $this->stubRequest(
+            'GET',
+            '/things',
+            [
+                'starting_after' => 1,
+            ],
+            null,
+            false,
+            [
+                'data' => [['id' => 2], ['id' => 3]],
+                'has_more' => false,
+            ]
+        );
+
+        $seen = [];
+        foreach ($this->fixture->autoPagingIterator() as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame([1, 2, 3], $seen);
+    }
+
+    public function testSupportsIteratorToArray()
+    {
+        $this->stubRequest(
+            'GET',
+            '/things',
+            [
+                'starting_after' => 1,
+            ],
+            null,
+            false,
+            [
+                'data' => [['id' => 2], ['id' => 3]],
+                'has_more' => false,
+            ]
+        );
+
+        $seen = [];
+        foreach (iterator_to_array($this->fixture->autoPagingIterator()) as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame([1, 2, 3], $seen);
+    }
+
+    public function testHeaders()
+    {
+        $this->stubRequest(
+            'POST',
+            '/things',
+            [
+                'foo' => 'bar',
+            ],
+            [
+                'Stripe-Account: acct_foo',
+                'Idempotency-Key: qwertyuiop',
+            ],
+            false,
+            [
+                'id' => 2,
+            ]
+        );
+
+        $this->fixture->create([
+            'foo' => 'bar',
+        ], [
+            'stripe_account' => 'acct_foo',
+            'idempotency_key' => 'qwertyuiop',
+        ]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/CountrySpecTest.php b/htdocs/includes/stripe/tests/Stripe/CountrySpecTest.php
new file mode 100644
index 00000000000..cccd4116845
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/CountrySpecTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class CountrySpecTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'US';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/country_specs'
+        );
+        $resources = CountrySpec::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\CountrySpec", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/country_specs/' . self::TEST_RESOURCE_ID
+        );
+        $resource = CountrySpec::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\CountrySpec", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/CouponTest.php b/htdocs/includes/stripe/tests/Stripe/CouponTest.php
new file mode 100644
index 00000000000..8a6fbf630cd
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/CouponTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe;
+
+class CouponTest extends TestCase
+{
+    const TEST_RESOURCE_ID = '25OFF';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/coupons'
+        );
+        $resources = Coupon::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Coupon", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/coupons/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Coupon::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Coupon", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/coupons'
+        );
+        $resource = Coupon::create([
+            "percent_off" => 25,
+            "duration" => "repeating",
+            "duration_in_months" => 3,
+            "id" => self::TEST_RESOURCE_ID,
+        ]);
+        $this->assertInstanceOf("Stripe\\Coupon", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Coupon::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/coupons/' . self::TEST_RESOURCE_ID
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Coupon", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/coupons/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Coupon::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Coupon", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Coupon::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/coupons/' . self::TEST_RESOURCE_ID
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Coupon", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/CustomerTest.php b/htdocs/includes/stripe/tests/Stripe/CustomerTest.php
new file mode 100644
index 00000000000..e279e5489e8
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/CustomerTest.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace Stripe;
+
+class CustomerTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'cus_123';
+    const TEST_SOURCE_ID = 'ba_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/customers'
+        );
+        $resources = Customer::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Customer", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/customers/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Customer", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/customers'
+        );
+        $resource = Customer::create();
+        $this->assertInstanceOf("Stripe\\Customer", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Customer", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Customer::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Customer", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Customer", $resource);
+    }
+
+    public function testCanAddInvoiceItem()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/invoiceitems',
+            [
+                "amount" => 100,
+                "currency" => "usd",
+                "customer" => $customer->id
+            ]
+        );
+        $resource = $customer->addInvoiceItem([
+            "amount" => 100,
+            "currency" => "usd"
+        ]);
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+
+    public function testCanListInvoices()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'get',
+            '/v1/invoices',
+            ["customer" => $customer->id]
+        );
+        $resources = $customer->invoices();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Invoice", $resources->data[0]);
+    }
+
+    public function testCanListInvoiceItems()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'get',
+            '/v1/invoiceitems',
+            ["customer" => $customer->id]
+        );
+        $resources = $customer->invoiceItems();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resources->data[0]);
+    }
+
+    public function testCanListCharges()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'get',
+            '/v1/charges',
+            ["customer" => $customer->id]
+        );
+        $resources = $customer->charges();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Charge", $resources->data[0]);
+    }
+
+    public function testCanUpdateSubscription()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->stubRequest(
+            'post',
+            '/v1/customers/' . $customer->id . '/subscription',
+            ["plan" => "plan"],
+            null,
+            false,
+            [
+                "object" => "subscription",
+                "id" => "sub_foo"
+            ]
+        );
+        $resource = $customer->updateSubscription(["plan" => "plan"]);
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+        $this->assertSame("sub_foo", $customer->subscription->id);
+    }
+
+    public function testCanCancelSubscription()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->stubRequest(
+            'delete',
+            '/v1/customers/' . $customer->id . '/subscription',
+            [],
+            null,
+            false,
+            [
+                "object" => "subscription",
+                "id" => "sub_foo"
+            ]
+        );
+        $resource = $customer->cancelSubscription();
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+        $this->assertSame("sub_foo", $customer->subscription->id);
+    }
+
+    public function testCanDeleteDiscount()
+    {
+        $customer = Customer::retrieve(self::TEST_RESOURCE_ID);
+        $this->stubRequest(
+            'delete',
+            '/v1/customers/' . $customer->id . '/discount'
+        );
+        $customer->deleteDiscount();
+        $this->assertSame($customer->discount, null);
+    }
+
+    public function testCanCreateSource()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/' . self::TEST_RESOURCE_ID . '/sources'
+        );
+        $resource = Customer::createSource(self::TEST_RESOURCE_ID, ["source" => "btok_123"]);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanRetrieveSource()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/customers/' . self::TEST_RESOURCE_ID . '/sources/' . self::TEST_SOURCE_ID
+        );
+        $resource = Customer::retrieveSource(self::TEST_RESOURCE_ID, self::TEST_SOURCE_ID);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanUpdateSource()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/customers/' . self::TEST_RESOURCE_ID . '/sources/' . self::TEST_SOURCE_ID
+        );
+        $resource = Customer::updateSource(self::TEST_RESOURCE_ID, self::TEST_SOURCE_ID, ["name" => "name"]);
+        // stripe-mock returns a Card on this method and not a bank account
+        $this->assertInstanceOf("Stripe\\Card", $resource);
+    }
+
+    public function testCanDeleteSource()
+    {
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/' . self::TEST_RESOURCE_ID . '/sources/' . self::TEST_SOURCE_ID
+        );
+        $resource = Customer::deleteSource(self::TEST_RESOURCE_ID, self::TEST_SOURCE_ID);
+        $this->assertInstanceOf("Stripe\\BankAccount", $resource);
+    }
+
+    public function testCanListSources()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/customers/' . self::TEST_RESOURCE_ID . '/sources'
+        );
+        $resources = Customer::allSources(self::TEST_RESOURCE_ID);
+        $this->assertTrue(is_array($resources->data));
+    }
+
+    public function testSerializeSourceString()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'customer',
+        ], null);
+        $obj->source = 'tok_visa';
+
+        $expected = [
+            'source' => 'tok_visa',
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+
+    public function testSerializeSourceMap()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'customer',
+        ], null);
+        $obj->source = [
+            'object' => 'card',
+            'number' => '4242424242424242',
+            'exp_month' => 12,
+            'exp_year' => 2032,
+        ];
+
+        $expected = [
+            'source' => [
+                'object' => 'card',
+                'number' => '4242424242424242',
+                'exp_month' => 12,
+                'exp_year' => 2032,
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/DisputeTest.php b/htdocs/includes/stripe/tests/Stripe/DisputeTest.php
new file mode 100644
index 00000000000..81d93da0213
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/DisputeTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Stripe;
+
+class DisputeTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'dp_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/disputes'
+        );
+        $resources = Dispute::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Dispute", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/disputes/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Dispute::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Dispute", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Dispute::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/disputes/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Dispute", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/disputes/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Dispute::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Dispute", $resource);
+    }
+
+    public function testIsClosable()
+    {
+        $dispute = Dispute::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/disputes/' . $dispute->id . '/close'
+        );
+        $resource = $dispute->close();
+        $this->assertInstanceOf("Stripe\\Dispute", $resource);
+        $this->assertSame($resource, $dispute);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/EphemeralKeyTest.php b/htdocs/includes/stripe/tests/Stripe/EphemeralKeyTest.php
new file mode 100644
index 00000000000..e8a1fc0e9ef
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/EphemeralKeyTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Stripe;
+
+class EphemeralKeyTest extends TestCase
+{
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/ephemeral_keys',
+            null,
+            ["Stripe-Version: 2017-05-25"]
+        );
+        $resource = EphemeralKey::create([
+            "customer" => "cus_123",
+        ], ["stripe_version" => "2017-05-25"]);
+        $this->assertInstanceOf("Stripe\\EphemeralKey", $resource);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testIsNotCreatableWithoutAnExplicitApiVersion()
+    {
+        $resource = EphemeralKey::create([
+            "customer" => "cus_123",
+        ]);
+    }
+
+    public function testIsDeletable()
+    {
+        $key = EphemeralKey::create([
+            "customer" => "cus_123",
+        ], ["stripe_version" => "2017-05-25"]);
+        $this->expectsRequest(
+            'delete',
+            '/v1/ephemeral_keys/' . $key->id
+        );
+        $resource = $key->delete();
+        $this->assertInstanceOf("Stripe\\EphemeralKey", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/Error/BaseTest.php b/htdocs/includes/stripe/tests/Stripe/Error/BaseTest.php
new file mode 100644
index 00000000000..4c2732ed1d1
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/Error/BaseTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe;
+
+class BaseTest extends TestCase
+{
+    public function createFixture($params = [])
+    {
+        return $this->getMockForAbstractClass('Stripe\\Error\\Base', [
+            'message',
+            200,
+            '{"key": "value"}',
+            ['key' => 'value'],
+            [
+                'Some-Header' => 'Some Value',
+                'Request-Id' => 'req_test',
+            ],
+        ]);
+    }
+
+    public function testGetters()
+    {
+        $e = $this->createFixture();
+        $this->assertSame(200, $e->getHttpStatus());
+        $this->assertSame('{"key": "value"}', $e->getHttpBody());
+        $this->assertSame(['key' => 'value'], $e->getJsonBody());
+        $this->assertSame('Some Value', $e->getHttpHeaders()['Some-Header']);
+        $this->assertSame('req_test', $e->getRequestId());
+    }
+
+    public function testToString()
+    {
+        $e = $this->createFixture();
+        $this->assertContains("from API request 'req_test'", (string)$e);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/Error/SignatureVerificationTest.php b/htdocs/includes/stripe/tests/Stripe/Error/SignatureVerificationTest.php
new file mode 100644
index 00000000000..020a41f8f76
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/Error/SignatureVerificationTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe;
+
+class SignatureVerificationTest extends TestCase
+{
+    public function testGetters()
+    {
+        $e = new Error\SignatureVerification('message', 'sig_header');
+        $this->assertSame('sig_header', $e->getSigHeader());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/EventTest.php b/htdocs/includes/stripe/tests/Stripe/EventTest.php
new file mode 100644
index 00000000000..2e3c92f0e49
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/EventTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class EventTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'evt_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/events'
+        );
+        $resources = Event::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Event", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/events/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Event::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Event", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ExchangeRateTest.php b/htdocs/includes/stripe/tests/Stripe/ExchangeRateTest.php
new file mode 100644
index 00000000000..8b07b5a1358
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ExchangeRateTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Stripe;
+
+class ExchangeRateTest extends TestCase
+{
+    public function testIsListable()
+    {
+        $this->stubRequest(
+            'get',
+            '/v1/exchange_rates',
+            [],
+            null,
+            false,
+            [
+                'object' => 'list',
+                'data' => [
+                    [
+                        'id' => 'eur',
+                        'object' => 'exchange_rate',
+                        'rates' => ['usd' => 1.18221],
+                    ],
+                    [
+                        'id' => 'usd',
+                        'object' => 'exchange_rate',
+                        'rates' => ['eur' => 0.845876],
+                    ],
+                ],
+            ]
+        );
+
+        $listRates = ExchangeRate::all();
+        $this->assertTrue(is_array($listRates->data));
+        $this->assertEquals('exchange_rate', $listRates->data[0]->object);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->stubRequest(
+            'get',
+            '/v1/exchange_rates/usd',
+            [],
+            null,
+            false,
+            [
+                'id' => 'usd',
+                'object' => 'exchange_rate',
+                'rates' => ['eur' => 0.845876],
+            ]
+        );
+        $rates = ExchangeRate::retrieve("usd");
+        $this->assertEquals('exchange_rate', $rates->object);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/FileUploadTest.php b/htdocs/includes/stripe/tests/Stripe/FileUploadTest.php
new file mode 100644
index 00000000000..21bb0b568f6
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/FileUploadTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Stripe;
+
+class FileUploadTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'file_123';
+
+    /**
+     * @before
+     */
+    public function setUpFixture()
+    {
+        // PHP <= 5.5 does not support arrays as class constants, so we set up
+        // the fixture as an instance variable.
+        $this->fixture = [
+            'id' => self::TEST_RESOURCE_ID,
+            'object' => 'file_upload',
+        ];
+    }
+
+    public function testIsListable()
+    {
+        $this->stubRequest(
+            'get',
+            '/v1/files',
+            [],
+            null,
+            false,
+            [
+                'object' => 'list',
+                'data' => [$this->fixture],
+                'resource_url' => '/v1/files',
+            ],
+            200,
+            Stripe::$apiUploadBase
+        );
+
+        $resources = FileUpload::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\FileUpload", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->stubRequest(
+            'get',
+            '/v1/files/' . self::TEST_RESOURCE_ID,
+            [],
+            null,
+            false,
+            $this->fixture,
+            200,
+            Stripe::$apiUploadBase
+        );
+        $resource = FileUpload::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\FileUpload", $resource);
+    }
+
+    public function testIsCreatableWithFileHandle()
+    {
+        $this->stubRequest(
+            'post',
+            '/v1/files',
+            null,
+            ['Content-Type: multipart/form-data'],
+            true,
+            $this->fixture,
+            200,
+            Stripe::$apiUploadBase
+        );
+        $fp = fopen(dirname(__FILE__) . '/../data/test.png', 'r');
+        $resource = FileUpload::create([
+            "purpose" => "dispute_evidence",
+            "file" => $fp,
+        ]);
+        $this->assertInstanceOf("Stripe\\FileUpload", $resource);
+    }
+
+    public function testIsCreatableWithCurlFile()
+    {
+        if (!class_exists('\CurlFile', false)) {
+            // Older PHP versions don't support this
+            return;
+        }
+
+        $this->stubRequest(
+            'post',
+            '/v1/files',
+            null,
+            ['Content-Type: multipart/form-data'],
+            true,
+            $this->fixture,
+            200,
+            Stripe::$apiUploadBase
+        );
+        $curlFile = new \CurlFile(dirname(__FILE__) . '/../data/test.png');
+        $resource = FileUpload::create([
+            "purpose" => "dispute_evidence",
+            "file" => $curlFile,
+        ]);
+        $this->assertInstanceOf("Stripe\\FileUpload", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/HttpClient/CurlClientTest.php b/htdocs/includes/stripe/tests/Stripe/HttpClient/CurlClientTest.php
new file mode 100644
index 00000000000..086e6d3ee8d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/HttpClient/CurlClientTest.php
@@ -0,0 +1,228 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class CurlClientTest extends TestCase
+{
+    /**
+     * @before
+     */
+    public function saveOriginalNetworkValues()
+    {
+        $this->origMaxNetworkRetries = Stripe::getMaxNetworkRetries();
+        $this->origMaxNetworkRetryDelay = Stripe::getMaxNetworkRetryDelay();
+        $this->origInitialNetworkRetryDelay = Stripe::getInitialNetworkRetryDelay();
+    }
+
+    /**
+     * @before
+     */
+    public function setUpReflectors()
+    {
+        $stripeReflector = new \ReflectionClass('\Stripe\Stripe');
+
+        $this->maxNetworkRetryDelayProperty = $stripeReflector->getProperty('maxNetworkRetryDelay');
+        $this->maxNetworkRetryDelayProperty->setAccessible(true);
+
+        $this->initialNetworkRetryDelayProperty = $stripeReflector->getProperty('initialNetworkRetryDelay');
+        $this->initialNetworkRetryDelayProperty->setAccessible(true);
+
+        $curlClientReflector = new \ReflectionClass('Stripe\HttpClient\CurlClient');
+
+        $this->shouldRetryMethod = $curlClientReflector->getMethod('shouldRetry');
+        $this->shouldRetryMethod->setAccessible(true);
+
+        $this->sleepTimeMethod = $curlClientReflector->getMethod('sleepTime');
+        $this->sleepTimeMethod->setAccessible(true);
+    }
+
+    /**
+     * @after
+     */
+    public function restoreOriginalNetworkValues()
+    {
+        Stripe::setMaxNetworkRetries($this->origMaxNetworkRetries);
+        $this->setMaxNetworkRetryDelay($this->origMaxNetworkRetryDelay);
+        $this->setInitialNetworkRetryDelay($this->origInitialNetworkRetryDelay);
+    }
+
+    private function setMaxNetworkRetryDelay($maxNetworkRetryDelay)
+    {
+        $this->maxNetworkRetryDelayProperty->setValue(null, $maxNetworkRetryDelay);
+    }
+
+    private function setInitialNetworkRetryDelay($initialNetworkRetryDelay)
+    {
+        $this->initialNetworkRetryDelayProperty->setValue(null, $initialNetworkRetryDelay);
+    }
+
+    private function createFakeRandomGenerator($returnValue = 1.0)
+    {
+        $fakeRandomGenerator = $this->getMock('Stripe\Util\RandomGenetator', ['randFloat']);
+        $fakeRandomGenerator->method('randFloat')->willReturn($returnValue);
+        return $fakeRandomGenerator;
+    }
+
+    public function testTimeout()
+    {
+        $curl = new CurlClient();
+        $this->assertSame(CurlClient::DEFAULT_TIMEOUT, $curl->getTimeout());
+        $this->assertSame(CurlClient::DEFAULT_CONNECT_TIMEOUT, $curl->getConnectTimeout());
+
+        // implicitly tests whether we're returning the CurlClient instance
+        $curl = $curl->setConnectTimeout(1)->setTimeout(10);
+        $this->assertSame(1, $curl->getConnectTimeout());
+        $this->assertSame(10, $curl->getTimeout());
+
+        $curl->setTimeout(-1);
+        $curl->setConnectTimeout(-999);
+        $this->assertSame(0, $curl->getTimeout());
+        $this->assertSame(0, $curl->getConnectTimeout());
+    }
+
+    public function testUserAgentInfo()
+    {
+        $curl = new CurlClient();
+        $uaInfo = $curl->getUserAgentInfo();
+        $this->assertNotNull($uaInfo);
+        $this->assertNotNull($uaInfo['httplib']);
+        $this->assertNotNull($uaInfo['ssllib']);
+    }
+
+    public function testDefaultOptions()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = [CURLOPT_PROXY => 'localhost:80'];
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+
+        // make sure closure-based options work properly, including argument passing
+        $ref = null;
+        $withClosure = new CurlClient(function ($method, $absUrl, $headers, $params, $hasFile) use (&$ref) {
+            $ref = func_get_args();
+            return [];
+        });
+
+        $withClosure->request('get', 'https://httpbin.org/status/200', [], [], false);
+        $this->assertSame($ref, ['get', 'https://httpbin.org/status/200', [], [], false]);
+
+        // this is the last test case that will run, since it'll throw an exception at the end
+        $withBadClosure = new CurlClient(function () {
+            return 'thisShouldNotWork';
+        });
+        $this->setExpectedException('Stripe\Error\Api', "Non-array value returned by defaultOptions CurlClient callback");
+        $withBadClosure->request('get', 'https://httpbin.org/status/200', [], [], false);
+    }
+
+    public function testSslOption()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = [CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1];
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+    }
+
+    public function testShouldRetryOnTimeout()
+    {
+        Stripe::setMaxNetworkRetries(2);
+
+        $curlClient = new CurlClient();
+
+        $this->assertTrue($this->shouldRetryMethod->invoke($curlClient, CURLE_OPERATION_TIMEOUTED, 0, 0));
+    }
+
+    public function testShouldRetryOnConnectionFailure()
+    {
+        Stripe::setMaxNetworkRetries(2);
+
+        $curlClient = new CurlClient();
+
+        $this->assertTrue($this->shouldRetryMethod->invoke($curlClient, CURLE_COULDNT_CONNECT, 0, 0));
+    }
+
+    public function testShouldRetryOnConflict()
+    {
+        Stripe::setMaxNetworkRetries(2);
+
+        $curlClient = new CurlClient();
+
+        $this->assertTrue($this->shouldRetryMethod->invoke($curlClient, 0, 409, 0));
+    }
+
+    public function testShouldNotRetryAtMaximumCount()
+    {
+        Stripe::setMaxNetworkRetries(2);
+
+        $curlClient = new CurlClient();
+
+        $this->assertFalse($this->shouldRetryMethod->invoke($curlClient, 0, 0, Stripe::getMaxNetworkRetries()));
+    }
+
+    public function testShouldNotRetryOnCertValidationError()
+    {
+        Stripe::setMaxNetworkRetries(2);
+
+        $curlClient = new CurlClient();
+
+        $this->assertFalse($this->shouldRetryMethod->invoke($curlClient, CURLE_SSL_PEER_CERTIFICATE, -1, 0));
+    }
+
+    public function testSleepTimeShouldGrowExponentially()
+    {
+        $this->setMaxNetworkRetryDelay(999);
+
+        $curlClient = new CurlClient(null, $this->createFakeRandomGenerator());
+
+        $this->assertEquals(
+            Stripe::getInitialNetworkRetryDelay() * 1,
+            $this->sleepTimeMethod->invoke($curlClient, 1)
+        );
+        $this->assertEquals(
+            Stripe::getInitialNetworkRetryDelay() * 2,
+            $this->sleepTimeMethod->invoke($curlClient, 2)
+        );
+        $this->assertEquals(
+            Stripe::getInitialNetworkRetryDelay() * 4,
+            $this->sleepTimeMethod->invoke($curlClient, 3)
+        );
+        $this->assertEquals(
+            Stripe::getInitialNetworkRetryDelay() * 8,
+            $this->sleepTimeMethod->invoke($curlClient, 4)
+        );
+    }
+
+    public function testSleepTimeShouldEnforceMaxNetworkRetryDelay()
+    {
+        $this->setInitialNetworkRetryDelay(1);
+        $this->setMaxNetworkRetryDelay(2);
+
+        $curlClient = new CurlClient(null, $this->createFakeRandomGenerator());
+
+        $this->assertEquals(1, $this->sleepTimeMethod->invoke($curlClient, 1));
+        $this->assertEquals(2, $this->sleepTimeMethod->invoke($curlClient, 2));
+        $this->assertEquals(2, $this->sleepTimeMethod->invoke($curlClient, 3));
+        $this->assertEquals(2, $this->sleepTimeMethod->invoke($curlClient, 4));
+    }
+
+    public function testSleepTimeShouldAddSomeRandomness()
+    {
+        $randomValue = 0.8;
+        $this->setInitialNetworkRetryDelay(1);
+        $this->setMaxNetworkRetryDelay(8);
+
+        $curlClient = new CurlClient(null, $this->createFakeRandomGenerator($randomValue));
+
+        $baseValue = Stripe::getInitialNetworkRetryDelay() * (0.5 * (1 + $randomValue));
+
+        // the initial value cannot be smaller than the base,
+        // so the randomness is ignored
+        $this->assertEquals(Stripe::getInitialNetworkRetryDelay(), $this->sleepTimeMethod->invoke($curlClient, 1));
+
+        // after the first one, the randomness is applied
+        $this->assertEquals($baseValue * 2, $this->sleepTimeMethod->invoke($curlClient, 2));
+        $this->assertEquals($baseValue * 4, $this->sleepTimeMethod->invoke($curlClient, 3));
+        $this->assertEquals($baseValue * 8, $this->sleepTimeMethod->invoke($curlClient, 4));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/InvoiceItemTest.php b/htdocs/includes/stripe/tests/Stripe/InvoiceItemTest.php
new file mode 100644
index 00000000000..ffe140aa7ca
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/InvoiceItemTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Stripe;
+
+class InvoiceItemTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'ii_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/invoiceitems'
+        );
+        $resources = InvoiceItem::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/invoiceitems/' . self::TEST_RESOURCE_ID
+        );
+        $resource = InvoiceItem::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/invoiceitems'
+        );
+        $resource = InvoiceItem::create([
+            "amount" => 100,
+            "currency" => "usd",
+            "customer" => "cus_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = InvoiceItem::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/invoiceitems/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/invoiceitems/' . self::TEST_RESOURCE_ID
+        );
+        $resource = InvoiceItem::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $invoiceItem = InvoiceItem::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/invoiceitems/' . $invoiceItem->id
+        );
+        $resource = $invoiceItem->delete();
+        $this->assertInstanceOf("Stripe\\InvoiceItem", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/InvoiceTest.php b/htdocs/includes/stripe/tests/Stripe/InvoiceTest.php
new file mode 100644
index 00000000000..f1ae9378628
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/InvoiceTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+class InvoiceTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'in_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/invoices'
+        );
+        $resources = Invoice::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Invoice", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/invoices/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Invoice::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/invoices'
+        );
+        $resource = Invoice::create([
+            "customer" => "cus_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Invoice::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/invoices/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/invoices/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Invoice::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+    }
+
+    public function testCanRetrieveUpcoming()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/invoices/upcoming'
+        );
+        $resource = Invoice::upcoming(["customer" => "cus_123"]);
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+    }
+
+    public function testIsPayable()
+    {
+        $invoice = Invoice::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/invoices/' . $invoice->id . '/pay'
+        );
+        $resource = $invoice->pay();
+        $this->assertInstanceOf("Stripe\\Invoice", $resource);
+        $this->assertSame($resource, $invoice);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/OAuthTest.php b/htdocs/includes/stripe/tests/Stripe/OAuthTest.php
new file mode 100644
index 00000000000..b4e43a88103
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/OAuthTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Stripe;
+
+class OAuthTest extends TestCase
+{
+    public function testAuthorizeUrl()
+    {
+        $uriStr = OAuth::authorizeUrl([
+            'scope' => 'read_write',
+            'state' => 'csrf_token',
+            'stripe_user' => [
+                'email' => 'test@example.com',
+                'url' => 'https://example.com/profile/test',
+                'country' => 'US',
+            ],
+        ]);
+
+        $uri = parse_url($uriStr);
+        parse_str($uri['query'], $params);
+
+        $this->assertSame('https', $uri['scheme']);
+        $this->assertSame('connect.stripe.com', $uri['host']);
+        $this->assertSame('/oauth/authorize', $uri['path']);
+
+        $this->assertSame('ca_123', $params['client_id']);
+        $this->assertSame('read_write', $params['scope']);
+        $this->assertSame('test@example.com', $params['stripe_user']['email']);
+        $this->assertSame('https://example.com/profile/test', $params['stripe_user']['url']);
+        $this->assertSame('US', $params['stripe_user']['country']);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\Authentication
+     * @expectedExceptionMessageRegExp #No client_id provided#
+     */
+    public function testRaisesAuthenticationErrorWhenNoClientId()
+    {
+        Stripe::setClientId(null);
+        OAuth::authorizeUrl();
+    }
+
+    public function testToken()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/token',
+            [
+                'grant_type' => 'authorization_code',
+                'code' => 'this_is_an_authorization_code',
+            ],
+            null,
+            false,
+            [
+                'access_token' => 'sk_access_token',
+                'scope' => 'read_only',
+                'livemode' => false,
+                'token_type' => 'bearer',
+                'refresh_token' => 'sk_refresh_token',
+                'stripe_user_id' => 'acct_test',
+                'stripe_publishable_key' => 'pk_test',
+            ],
+            200,
+            Stripe::$connectBase
+        );
+
+        $resp = OAuth::token([
+            'grant_type' => 'authorization_code',
+            'code' => 'this_is_an_authorization_code',
+        ]);
+        $this->assertSame('sk_access_token', $resp->access_token);
+    }
+
+    public function testDeauthorize()
+    {
+        $this->stubRequest(
+            'POST',
+            '/oauth/deauthorize',
+            [
+                'stripe_user_id' => 'acct_test_deauth',
+                'client_id' => 'ca_123',
+            ],
+            null,
+            false,
+            [
+                'stripe_user_id' => 'acct_test_deauth',
+            ],
+            200,
+            Stripe::$connectBase
+        );
+
+        $resp = OAuth::deauthorize([
+                'stripe_user_id' => 'acct_test_deauth',
+        ]);
+        $this->assertSame('acct_test_deauth', $resp->stripe_user_id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/OrderReturnTest.php b/htdocs/includes/stripe/tests/Stripe/OrderReturnTest.php
new file mode 100644
index 00000000000..bb2d65c437a
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/OrderReturnTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class OrderReturnTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'orret_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/order_returns'
+        );
+        $resources = OrderReturn::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\OrderReturn", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/order_returns/' . self::TEST_RESOURCE_ID
+        );
+        $resource = OrderReturn::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\OrderReturn", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/OrderTest.php b/htdocs/includes/stripe/tests/Stripe/OrderTest.php
new file mode 100644
index 00000000000..51d17e94fc7
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/OrderTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+class OrderTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'or_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/orders'
+        );
+        $resources = Order::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Order", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/orders/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Order::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Order", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/orders'
+        );
+        $resource = Order::create([
+            'currency' => 'usd'
+        ]);
+        $this->assertInstanceOf("Stripe\\Order", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Order::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/orders/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Order", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/orders/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Order::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Order", $resource);
+    }
+
+    public function testIsPayable()
+    {
+        $resource = Order::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/orders/' . $resource->id . '/pay'
+        );
+        $resource->pay();
+        $this->assertInstanceOf("Stripe\\Order", $resource);
+    }
+
+    public function testIsReturnable()
+    {
+        $order = Order::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/orders/' . $order->id . '/returns'
+        );
+        $resource = $order->returnOrder();
+        $this->assertInstanceOf("Stripe\\OrderReturn", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/PayoutTest.php b/htdocs/includes/stripe/tests/Stripe/PayoutTest.php
new file mode 100644
index 00000000000..79c7b5fd015
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/PayoutTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+class PayoutTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'po_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/payouts'
+        );
+        $resources = Payout::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Payout", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/payouts/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Payout::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Payout", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/payouts'
+        );
+        $resource = Payout::create([
+            "amount" => 100,
+            "currency" => "usd"
+        ]);
+        $this->assertInstanceOf("Stripe\\Payout", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Payout::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/payouts/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Payout", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/payouts/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Payout::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Payout", $resource);
+    }
+
+    public function testIsCancelable()
+    {
+        $resource = Payout::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/payouts/' . $resource->id . '/cancel'
+        );
+        $resource->cancel();
+        $this->assertInstanceOf("Stripe\\Payout", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/PlanTest.php b/htdocs/includes/stripe/tests/Stripe/PlanTest.php
new file mode 100644
index 00000000000..8d71745ed56
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/PlanTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Stripe;
+
+class PlanTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'plan';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/plans'
+        );
+        $resources = Plan::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Plan", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/plans/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Plan::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Plan", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/plans'
+        );
+        $resource = Plan::create([
+            'amount' => 100,
+            'interval' => 'month',
+            'currency' => 'usd',
+            'name' => self::TEST_RESOURCE_ID,
+            'id' => self::TEST_RESOURCE_ID
+        ]);
+        $this->assertInstanceOf("Stripe\\Plan", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Plan::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/plans/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Plan", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/plans/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Plan::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Plan", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Plan::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/plans/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Plan", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ProductTest.php b/htdocs/includes/stripe/tests/Stripe/ProductTest.php
new file mode 100644
index 00000000000..c2a3813c870
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ProductTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+class ProductTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'prod_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/products'
+        );
+        $resources = Product::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Product", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/products/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Product::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Product", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/products'
+        );
+        $resource = Product::create([
+            'name' => 'name',
+            'type' => 'good'
+        ]);
+        $this->assertInstanceOf("Stripe\\Product", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Product::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/products/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Product", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/products/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Product::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Product", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Product::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/products/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Product", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/RecipientTest.php b/htdocs/includes/stripe/tests/Stripe/RecipientTest.php
new file mode 100644
index 00000000000..43dd6e82a79
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/RecipientTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Stripe;
+
+class RecipientTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'rp_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/recipients'
+        );
+        $resources = Recipient::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Recipient", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/recipients/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Recipient::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Recipient", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/recipients'
+        );
+        $resource = Recipient::create([
+            "name" => "name",
+            "type" => "individual"
+        ]);
+        $this->assertInstanceOf("Stripe\\Recipient", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Recipient::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/recipients/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Recipient", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/recipients/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Recipient::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Recipient", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = Recipient::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/recipients/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Recipient", $resource);
+    }
+
+    public function testCanListTransfers()
+    {
+        $recipient = Recipient::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'get',
+            '/v1/transfers',
+            ["recipient" => $recipient->id]
+        );
+        $resources = $recipient->transfers();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Transfer", $resources->data[0]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/RefundTest.php b/htdocs/includes/stripe/tests/Stripe/RefundTest.php
new file mode 100644
index 00000000000..788361d4d9d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/RefundTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Stripe;
+
+class RefundTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 're_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/refunds'
+        );
+        $resources = Refund::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Refund", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/refunds/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Refund::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Refund", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/refunds'
+        );
+        $resource = Refund::create([
+            "charge" => "ch_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\Refund", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Refund::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/refunds/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Refund", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/refunds/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Refund::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Refund", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/SKUTest.php b/htdocs/includes/stripe/tests/Stripe/SKUTest.php
new file mode 100644
index 00000000000..d4fc2ad408b
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/SKUTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Stripe;
+
+class SKUTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'sku_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/skus'
+        );
+        $resources = SKU::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\SKU", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/skus/' . self::TEST_RESOURCE_ID
+        );
+        $resource = SKU::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\SKU", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/skus'
+        );
+        $resource = SKU::create([
+            'currency'  => 'usd',
+            'inventory' => [
+                'type'     => 'finite',
+                'quantity' => 1
+            ],
+            'price'     => 100,
+            'product'   => "prod_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\SKU", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = SKU::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/skus/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\SKU", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/skus/' . self::TEST_RESOURCE_ID
+        );
+        $resource = SKU::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\SKU", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = SKU::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/skus/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\SKU", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/SourceTest.php b/htdocs/includes/stripe/tests/Stripe/SourceTest.php
new file mode 100644
index 00000000000..ad11b0d3455
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/SourceTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Stripe;
+
+class SourceTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'src_123';
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Source::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/sources'
+        );
+        $resource = Source::create([
+            "type" => "card"
+        ]);
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Source::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/sources/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/sources/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Source::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+
+    public function testCanSaveCardExpiryDate()
+    {
+        $response = [
+            'id' => 'src_foo',
+            'object' => 'source',
+            'card' => [
+                'exp_month' => 8,
+                'exp_year' => 2019,
+            ],
+        ];
+        $source = Source::constructFrom($response);
+
+        $response['card']['exp_month'] = 12;
+        $response['card']['exp_year'] = 2022;
+        $this->stubRequest(
+            'POST',
+            '/v1/sources/src_foo',
+            [
+                'card' => [
+                    'exp_month' => 12,
+                    'exp_year' => 2022,
+                ]
+            ],
+            null,
+            false,
+            $response
+        );
+
+        $source->card->exp_month = 12;
+        $source->card->exp_year = 2022;
+        $source->save();
+
+        $this->assertSame(12, $source->card->exp_month);
+        $this->assertSame(2022, $source->card->exp_year);
+    }
+
+    public function testIsDetachableWhenAttached()
+    {
+        $resource = Source::retrieve(self::TEST_RESOURCE_ID);
+        $resource->customer = "cus_123";
+        $this->expectsRequest(
+            'delete',
+            '/v1/customers/cus_123/sources/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\Api
+     */
+    public function testIsNotDetachableWhenUnattached()
+    {
+        $resource = Source::retrieve(self::TEST_RESOURCE_ID);
+        $resource->detach();
+    }
+
+    public function testCanListSourceTransactions()
+    {
+        $source = Source::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'get',
+            '/v1/sources/' . $source->id . "/source_transactions"
+        );
+        $resources = $source->sourceTransactions();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\SourceTransaction", $resources->data[0]);
+    }
+
+    public function testCanVerify()
+    {
+        $resource = Source::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/sources/' . $resource->id . "/verify"
+        );
+        $resource->verify(["values" => [32, 45]]);
+        $this->assertInstanceOf("Stripe\\Source", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/StripeObjectTest.php b/htdocs/includes/stripe/tests/Stripe/StripeObjectTest.php
new file mode 100644
index 00000000000..af1cd936e1c
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/StripeObjectTest.php
@@ -0,0 +1,453 @@
+<?php
+
+namespace Stripe;
+
+class StripeObjectTest extends TestCase
+{
+    /**
+     * @before
+     */
+    public function setUpReflectors()
+    {
+        // Sets up reflectors needed by some tests to access protected or
+        // private attributes.
+
+        // This is used to invoke the `deepCopy` protected function
+        $this->deepCopyReflector = new \ReflectionMethod('Stripe\\StripeObject', 'deepCopy');
+        $this->deepCopyReflector->setAccessible(true);
+
+        // This is used to access the `_opts` protected variable
+        $this->optsReflector = new \ReflectionProperty('Stripe\\StripeObject', '_opts');
+        $this->optsReflector->setAccessible(true);
+    }
+
+    public function testArrayAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s['foo'] = 'a';
+        $this->assertSame($s['foo'], 'a');
+        $this->assertTrue(isset($s['foo']));
+        unset($s['foo']);
+        $this->assertFalse(isset($s['foo']));
+    }
+
+    public function testNormalAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s->foo, 'a');
+        $this->assertTrue(isset($s->foo));
+        unset($s->foo);
+        $this->assertFalse(isset($s->foo));
+    }
+
+    public function testArrayAccessorsMatchNormalAccessors()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s['foo'], 'a');
+
+        $s['bar'] = 'b';
+        $this->assertSame($s->bar, 'b');
+    }
+
+    public function testCount()
+    {
+        $s = new StripeObject();
+        $this->assertSame(0, count($s));
+
+        $s['key1'] = 'value1';
+        $this->assertSame(1, count($s));
+
+        $s['key2'] = 'value2';
+        $this->assertSame(2, count($s));
+
+        unset($s['key1']);
+        $this->assertSame(1, count($s));
+    }
+
+    public function testKeys()
+    {
+        $s = new StripeObject();
+        $s->foo = 'bar';
+        $this->assertSame($s->keys(), ['foo']);
+    }
+
+    public function testValues()
+    {
+        $s = new StripeObject();
+        $s->foo = 'bar';
+        $this->assertSame($s->values(), ['bar']);
+    }
+
+    public function testToArray()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $converted = $s->__toArray();
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('foo', $converted);
+        $this->assertEquals('a', $converted['foo']);
+    }
+
+    public function testRecursiveToArray()
+    {
+        $s = new StripeObject();
+        $z = new StripeObject();
+
+        $s->child = $z;
+        $z->foo = 'a';
+
+        $converted = $s->__toArray(true);
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('child', $converted);
+        $this->assertInternalType('array', $converted['child']);
+        $this->assertArrayHasKey('foo', $converted['child']);
+        $this->assertEquals('a', $converted['child']['foo']);
+    }
+
+    public function testNonexistentProperty()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s->nonexistent);
+    }
+
+    public function testPropertyDoesNotExists()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s['nonexistent']);
+    }
+
+    public function testJsonEncode()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $this->assertEquals('{"foo":"a"}', json_encode($s));
+    }
+
+    public function testToString()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $string = $s->__toString();
+        $expected = <<<EOS
+Stripe\StripeObject JSON: {
+    "foo": "a"
+}
+EOS;
+        $this->assertEquals($expected, $string);
+    }
+
+    public function testReplaceNewNestedUpdatable()
+    {
+        $s = new StripeObject();
+
+        $s->metadata = ['bar'];
+        $this->assertSame($s->metadata, ['bar']);
+        $s->metadata = ['baz', 'qux'];
+        $this->assertSame($s->metadata, ['baz', 'qux']);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testSetPermanentAttribute()
+    {
+        $s = new StripeObject();
+        $s->id = 'abc_123';
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testSetEmptyStringValue()
+    {
+        $s = new StripeObject();
+        $s->foo = '';
+    }
+
+    public function testSerializeParametersOnEmptyObject()
+    {
+        $obj = StripeObject::constructFrom([]);
+        $this->assertSame([], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnNewObjectWithSubObject()
+    {
+        $obj = new StripeObject();
+        $obj->metadata = ['foo' => 'bar'];
+        $this->assertSame(['metadata' => ['foo' => 'bar']], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnBasicObject()
+    {
+        $obj = StripeObject::constructFrom(['foo' => null]);
+        $obj->updateAttributes(['foo' => 'bar']);
+        $this->assertSame(['foo' => 'bar'], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnMoreComplexObject()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => StripeObject::constructFrom([
+                'bar' => null,
+                'baz' => null,
+            ]),
+        ]);
+        $obj->foo->bar = 'newbar';
+        $this->assertSame(['foo' => ['bar' => 'newbar']], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnArray()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => null,
+        ]);
+        $obj->foo = ['new-value'];
+        $this->assertSame(['foo' => ['new-value']], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnArrayThatShortens()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => ['0-index', '1-index', '2-index'],
+        ]);
+        $obj->foo = ['new-value'];
+        $this->assertSame(['foo' => ['new-value']], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnArrayThatLengthens()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => ['0-index', '1-index', '2-index'],
+        ]);
+        $obj->foo = array_fill(0, 4, 'new-value');
+        $this->assertSame(['foo' => array_fill(0, 4, 'new-value')], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnArrayOfHashes()
+    {
+        $obj = StripeObject::constructFrom(['foo' => null]);
+        $obj->foo = [
+            StripeObject::constructFrom(['bar' => null]),
+        ];
+
+        $obj->foo[0]->bar = 'baz';
+        $this->assertSame(['foo' => [['bar' => 'baz']]], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersDoesNotIncludeUnchangedValues()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => null,
+        ]);
+        $this->assertSame([], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersOnUnchangedArray()
+    {
+        $obj = StripeObject::constructFrom([
+            'foo' => ['0-index', '1-index', '2-index'],
+        ]);
+        $obj->foo = ['0-index', '1-index', '2-index'];
+        $this->assertSame([], $obj->serializeParameters());
+    }
+
+    public function testSerializeParametersWithStripeObject()
+    {
+        $obj = StripeObject::constructFrom([]);
+        $obj->metadata = StripeObject::constructFrom(['foo' => 'bar']);
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame(['foo' => 'bar'], $serialized['metadata']);
+    }
+
+    public function testSerializeParametersOnReplacedStripeObject()
+    {
+        $obj = StripeObject::constructFrom([
+            'metadata' => StripeObject::constructFrom(['bar' => 'foo']),
+        ]);
+        $obj->metadata = StripeObject::constructFrom(['baz' => 'foo']);
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame(['bar' => '', 'baz' => 'foo'], $serialized['metadata']);
+    }
+
+    public function testSerializeParametersOnArrayOfStripeObjects()
+    {
+        $obj = StripeObject::constructFrom([]);
+        $obj->metadata = [
+            StripeObject::constructFrom(['foo' => 'bar']),
+        ];
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame([['foo' => 'bar']], $serialized['metadata']);
+    }
+
+    public function testSerializeParametersOnSetApiResource()
+    {
+        $customer = Customer::constructFrom(['id' => 'cus_123']);
+        $obj = StripeObject::constructFrom([]);
+
+        // the key here is that the property is set explicitly (and therefore
+        // marked as unsaved), which is why it gets included below
+        $obj->customer = $customer;
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame(['customer' => $customer], $serialized);
+    }
+
+    public function testSerializeParametersOnNotSetApiResource()
+    {
+        $customer = Customer::constructFrom(['id' => 'cus_123']);
+        $obj = StripeObject::constructFrom(['customer' => $customer]);
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame([], $serialized);
+    }
+
+    public function testSerializeParametersOnApiResourceFlaggedWithSaveWithParent()
+    {
+        $customer = Customer::constructFrom(['id' => 'cus_123']);
+        $customer->saveWithParent = true;
+
+        $obj = StripeObject::constructFrom(['customer' => $customer]);
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame(['customer' => []], $serialized);
+    }
+
+    public function testSerializeParametersRaisesExceotionOnOtherEmbeddedApiResources()
+    {
+        // This customer doesn't have an ID and therefore the library doesn't know
+        // what to do with it and throws an InvalidArgumentException because it's
+        // probably not what the user expected to happen.
+        $customer = Customer::constructFrom([]);
+
+        $obj = StripeObject::constructFrom([]);
+        $obj->customer = $customer;
+
+        try {
+            $serialized = $obj->serializeParameters();
+            $this->fail("Did not raise error");
+        } catch (\InvalidArgumentException $e) {
+            $this->assertSame(
+                "Cannot save property `customer` containing an API resource of type Stripe\Customer. " .
+                "It doesn't appear to be persisted and is not marked as `saveWithParent`.",
+                $e->getMessage()
+            );
+        } catch (\Exception $e) {
+            $this->fail("Unexpected exception: " . get_class($e));
+        }
+    }
+
+    public function testSerializeParametersForce()
+    {
+        $obj = StripeObject::constructFrom([
+            'id' => 'id',
+            'metadata' => StripeObject::constructFrom([
+                'bar' => 'foo',
+            ]),
+        ]);
+
+        $serialized = $obj->serializeParameters(true);
+        $this->assertSame(['id' => 'id', 'metadata' => ['bar' => 'foo']], $serialized);
+    }
+
+    public function testDirty()
+    {
+        $obj = StripeObject::constructFrom([
+            'id' => 'id',
+            'metadata' => StripeObject::constructFrom([
+                'bar' => 'foo',
+            ]),
+        ]);
+
+        // note that `$force` and `dirty()` are for different things, but are
+        // functionally equivalent
+        $obj->dirty();
+
+        $serialized = $obj->serializeParameters();
+        $this->assertSame(['id' => 'id', 'metadata' => ['bar' => 'foo']], $serialized);
+    }
+
+    public function testDeepCopy()
+    {
+        $opts = [
+            "api_base" => Stripe::$apiBase,
+            "api_key" => "apikey",
+        ];
+        $values = [
+            "id" => 1,
+            "name" => "Stripe",
+            "arr" => [
+                StripeObject::constructFrom(["id" => "index0"], $opts),
+                "index1",
+                2,
+            ],
+            "map" => [
+                "0" => StripeObject::constructFrom(["id" => "index0"], $opts),
+                "1" => "index1",
+                "2" => 2
+            ],
+        ];
+
+        $copyValues = $this->deepCopyReflector->invoke(null, $values);
+
+        // we can't compare the hashes directly because they have embedded
+        // objects which are different from each other
+        $this->assertEquals($values["id"], $copyValues["id"]);
+        $this->assertEquals($values["name"], $copyValues["name"]);
+        $this->assertEquals(count($values["arr"]), count($copyValues["arr"]));
+
+        // internal values of the copied StripeObject should be the same,
+        // but the object itself should be new (hence the assertNotSame)
+        $this->assertEquals($values["arr"][0]["id"], $copyValues["arr"][0]["id"]);
+        $this->assertNotSame($values["arr"][0], $copyValues["arr"][0]);
+
+        // likewise, the Util\RequestOptions instance in _opts should have
+        // copied values but be a new instance
+        $this->assertEquals(
+            $this->optsReflector->getValue($values["arr"][0]),
+            $this->optsReflector->getValue($copyValues["arr"][0])
+        );
+        $this->assertNotSame(
+            $this->optsReflector->getValue($values["arr"][0]),
+            $this->optsReflector->getValue($copyValues["arr"][0])
+        );
+
+        // scalars however, can be compared
+        $this->assertEquals($values["arr"][1], $copyValues["arr"][1]);
+        $this->assertEquals($values["arr"][2], $copyValues["arr"][2]);
+
+        // and a similar story with the hash
+        $this->assertEquals($values["map"]["0"]["id"], $copyValues["map"]["0"]["id"]);
+        $this->assertNotSame($values["map"]["0"], $copyValues["map"]["0"]);
+        $this->assertNotSame(
+            $this->optsReflector->getValue($values["arr"][0]),
+            $this->optsReflector->getValue($copyValues["arr"][0])
+        );
+        $this->assertEquals(
+            $this->optsReflector->getValue($values["map"]["0"]),
+            $this->optsReflector->getValue($copyValues["map"]["0"])
+        );
+        $this->assertNotSame(
+            $this->optsReflector->getValue($values["map"]["0"]),
+            $this->optsReflector->getValue($copyValues["map"]["0"])
+        );
+        $this->assertEquals($values["map"]["1"], $copyValues["map"]["1"]);
+        $this->assertEquals($values["map"]["2"], $copyValues["map"]["2"]);
+    }
+
+    public function testDeepCopyMaintainClass()
+    {
+        $charge = Charge::constructFrom(["id" => 1], null);
+        $copyCharge = $this->deepCopyReflector->invoke(null, $charge);
+        $this->assertEquals(get_class($charge), get_class($copyCharge));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/StripeTest.php b/htdocs/includes/stripe/tests/Stripe/StripeTest.php
new file mode 100644
index 00000000000..f594518d13d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/StripeTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Stripe;
+
+class StripeTest extends TestCase
+{
+    /**
+     * @before
+     */
+    public function saveOriginalValues()
+    {
+        $this->orig = [
+            'caBundlePath' => Stripe::$caBundlePath,
+        ];
+    }
+
+    /**
+     * @after
+     */
+    public function restoreOriginalValues()
+    {
+        Stripe::$caBundlePath = $this->orig['caBundlePath'];
+    }
+
+    public function testCABundlePathAccessors()
+    {
+        Stripe::setCABundlePath('path/to/ca/bundle');
+        $this->assertEquals('path/to/ca/bundle', Stripe::getCABundlePath());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/SubscriptionItemTest.php b/htdocs/includes/stripe/tests/Stripe/SubscriptionItemTest.php
new file mode 100644
index 00000000000..09e766c1bec
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/SubscriptionItemTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionItemTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'si_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/subscription_items'
+        );
+        $resources = SubscriptionItem::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/subscription_items/' . self::TEST_RESOURCE_ID
+        );
+        $resource = SubscriptionItem::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/subscription_items'
+        );
+        $resource = SubscriptionItem::create([
+            "plan" => "plan",
+            "subscription" => "sub_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = SubscriptionItem::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/subscription_items/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/subscription_items/' . self::TEST_RESOURCE_ID
+        );
+        $resource = SubscriptionItem::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resource);
+    }
+
+    public function testIsDeletable()
+    {
+        $resource = SubscriptionItem::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/subscription_items/' . $resource->id
+        );
+        $resource->delete();
+        $this->assertInstanceOf("Stripe\\SubscriptionItem", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/SubscriptionTest.php b/htdocs/includes/stripe/tests/Stripe/SubscriptionTest.php
new file mode 100644
index 00000000000..4a42e218224
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/SubscriptionTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'sub_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/subscriptions'
+        );
+        $resources = Subscription::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Subscription", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/subscriptions/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Subscription::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/subscriptions'
+        );
+        $resource = Subscription::create([
+            "customer" => "cus_123",
+            "plan" => "plan"
+        ]);
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Subscription::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/subscriptions/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/subscriptions/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Subscription::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testIsCancelable()
+    {
+        $resource = Subscription::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/subscriptions/' . $resource->id,
+            [
+                'at_period_end' => 'true',
+            ]
+        );
+        $resource->cancel([
+            'at_period_end' => true,
+        ]);
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testCanDeleteDiscount()
+    {
+        $resource = Subscription::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'delete',
+            '/v1/subscriptions/' . $resource->id . '/discount'
+        );
+        $resource->deleteDiscount();
+        $this->assertInstanceOf("Stripe\\Subscription", $resource);
+    }
+
+    public function testSerializeParametersItems()
+    {
+        $obj = Util\Util::convertToStripeObject([
+            'object' => 'subscription',
+            'items' => Util\Util::convertToStripeObject([
+                'object' => 'list',
+                'data' => [],
+            ], null),
+        ], null);
+        $obj->items = [
+            ['id' => 'si_foo', 'deleted' => true],
+            ['plan' => 'plan_bar'],
+        ];
+        $expected = [
+            'items' => [
+                0 => ['id' => 'si_foo', 'deleted' => true],
+                1 => ['plan' => 'plan_bar'],
+            ],
+        ];
+        $this->assertSame($expected, $obj->serializeParameters());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/ThreeDSecureTest.php b/htdocs/includes/stripe/tests/Stripe/ThreeDSecureTest.php
new file mode 100644
index 00000000000..f56e649cbc1
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/ThreeDSecureTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+class ThreeDSecureTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'tdsrc_123';
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/3d_secure/' . self::TEST_RESOURCE_ID
+        );
+        $resource = ThreeDSecure::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\ThreeDSecure", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/3d_secure'
+        );
+        $resource = ThreeDSecure::create([
+            "amount" => 100,
+            "currency" => "usd",
+            "return_url" => "url"
+        ]);
+        $this->assertInstanceOf("Stripe\\ThreeDSecure", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/TokenTest.php b/htdocs/includes/stripe/tests/Stripe/TokenTest.php
new file mode 100644
index 00000000000..36bb4bc8283
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/TokenTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Stripe;
+
+class TokenTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'tok_123';
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/tokens/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Token::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Token", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/tokens'
+        );
+        $resource = Token::create(["card" => "tok_visa"]);
+        $this->assertInstanceOf("Stripe\\Token", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/TopupTest.php b/htdocs/includes/stripe/tests/Stripe/TopupTest.php
new file mode 100644
index 00000000000..994447636c6
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/TopupTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Stripe;
+
+class TopupTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'tu_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/topups'
+        );
+        $resources = Topup::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Topup", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/topups/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Topup::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Topup", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/topups'
+        );
+        $resource = Topup::create([
+            "amount" => 100,
+            "currency" => "usd",
+            "source" => "tok_123",
+            "description" => "description",
+            "statement_descriptor" => "statement descriptor"
+        ]);
+        $this->assertInstanceOf("Stripe\\Topup", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Topup::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/topups/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Topup", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/topups/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Topup::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Topup", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/TransferReversalTest.php b/htdocs/includes/stripe/tests/Stripe/TransferReversalTest.php
new file mode 100644
index 00000000000..37101c73208
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/TransferReversalTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Stripe;
+
+class TransferReversalTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'trr_123';
+    const TEST_TRANSFER_ID = 'tr_123';
+
+    public function testIsSaveable()
+    {
+        $resource = Transfer::retrieveReversal(self::TEST_TRANSFER_ID, self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . $resource->transfer . '/reversals/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\TransferReversal", $resource);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/TransferTest.php b/htdocs/includes/stripe/tests/Stripe/TransferTest.php
new file mode 100644
index 00000000000..d60d560e7c5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/TransferTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Stripe;
+
+class TransferTest extends TestCase
+{
+    const TEST_RESOURCE_ID = 'tr_123';
+    const TEST_REVERSAL_ID = 'trr_123';
+
+    public function testIsListable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/transfers'
+        );
+        $resources = Transfer::all();
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\Transfer", $resources->data[0]);
+    }
+
+    public function testIsRetrievable()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Transfer::retrieve(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+    }
+
+    public function testIsCreatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers'
+        );
+        $resource = Transfer::create([
+            "amount" => 100,
+            "currency" => "usd",
+            "destination" => "acct_123"
+        ]);
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+    }
+
+    public function testIsSaveable()
+    {
+        $resource = Transfer::retrieve(self::TEST_RESOURCE_ID);
+        $resource->metadata["key"] = "value";
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . $resource->id
+        );
+        $resource->save();
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+    }
+
+    public function testIsUpdatable()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID
+        );
+        $resource = Transfer::update(self::TEST_RESOURCE_ID, [
+            "metadata" => ["key" => "value"],
+        ]);
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+    }
+
+    public function testIsReversable()
+    {
+        $resource = Transfer::retrieve(self::TEST_RESOURCE_ID);
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . $resource->id . '/reversals'
+        );
+        $resource->reverse();
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+    }
+
+    public function testIsCancelable()
+    {
+        $transfer = Transfer::retrieve(self::TEST_RESOURCE_ID);
+
+        // stripe-mock does not support this anymore so we stub it
+        $this->stubRequest(
+            'post',
+            '/v1/transfers/' . $transfer->id . '/cancel'
+        );
+        $resource = $transfer->cancel();
+        $this->assertInstanceOf("Stripe\\Transfer", $resource);
+        $this->assertSame($resource, $transfer);
+    }
+
+    public function testCanCreateReversal()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID . '/reversals'
+        );
+        $resource = Transfer::createReversal(self::TEST_RESOURCE_ID);
+        $this->assertInstanceOf("Stripe\\TransferReversal", $resource);
+    }
+
+    public function testCanRetrieveReversal()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID . '/reversals/' . self::TEST_REVERSAL_ID
+        );
+        $resource = Transfer::retrieveReversal(self::TEST_RESOURCE_ID, self::TEST_REVERSAL_ID);
+        $this->assertInstanceOf("Stripe\\TransferReversal", $resource);
+    }
+
+    public function testCanUpdateReversal()
+    {
+        $this->expectsRequest(
+            'post',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID . '/reversals/' . self::TEST_REVERSAL_ID
+        );
+        $resource = Transfer::updateReversal(
+            self::TEST_RESOURCE_ID,
+            self::TEST_REVERSAL_ID,
+            [
+                "metadata" => ["key" => "value"],
+            ]
+        );
+        $this->assertInstanceOf("Stripe\\TransferReversal", $resource);
+    }
+
+    public function testCanListReversal()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/transfers/' . self::TEST_RESOURCE_ID . '/reversals'
+        );
+        $resources = Transfer::allReversals(self::TEST_RESOURCE_ID);
+        $this->assertTrue(is_array($resources->data));
+        $this->assertInstanceOf("Stripe\\TransferReversal", $resources->data[0]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/Util/DefaultLoggerTest.php b/htdocs/includes/stripe/tests/Stripe/Util/DefaultLoggerTest.php
new file mode 100644
index 00000000000..711af03c4a0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/Util/DefaultLoggerTest.php
@@ -0,0 +1,28 @@
+<?php
+
+// Test in a slightly different namespace than usual. See comment on
+// `error_log` below.
+namespace Stripe\Util;
+
+class UtilLoggerTest extends \Stripe\TestCase
+{
+    public function testDefaultLogger()
+    {
+        $logger = new DefaultLogger();
+        $logger->error("message");
+
+        global $lastMessage;
+        $this->assertSame($lastMessage, "message");
+    }
+}
+
+// This is a little terrible, but unfortunately there's no clean way to stub a
+// call to `error_log`. Here we overwrite it so that we can get the last arguments
+// that went to it. This is obviously bad, but luckily it's constrained to
+// being just in \Stripe\Util (i.e. won't interfere with PHPUnit for example)
+// and _just_ present when tests are running.
+function error_log($message)
+{
+    global $lastMessage;
+    $lastMessage = $message;
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/Util/RequestOptionsTest.php b/htdocs/includes/stripe/tests/Stripe/Util/RequestOptionsTest.php
new file mode 100644
index 00000000000..558f73982ea
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/Util/RequestOptionsTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Stripe;
+
+class RequestOptionsTest extends TestCase
+{
+    public function testStringAPIKey()
+    {
+        $opts = Util\RequestOptions::parse("foo");
+        $this->assertSame("foo", $opts->apiKey);
+        $this->assertSame([], $opts->headers);
+    }
+
+    public function testNull()
+    {
+        $opts = Util\RequestOptions::parse(null);
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame([], $opts->headers);
+    }
+
+    public function testEmptyArray()
+    {
+        $opts = Util\RequestOptions::parse([]);
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame([], $opts->headers);
+    }
+
+    public function testAPIKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            [
+                'api_key' => 'foo',
+            ]
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame([], $opts->headers);
+    }
+
+    public function testIdempotentKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            [
+                'idempotency_key' => 'foo',
+            ]
+        );
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(['Idempotency-Key' => 'foo'], $opts->headers);
+    }
+
+    public function testKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            [
+                'idempotency_key' => 'foo',
+                'api_key' => 'foo'
+            ]
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame(['Idempotency-Key' => 'foo'], $opts->headers);
+    }
+
+    /**
+     * @expectedException Stripe\Error\Api
+     */
+    public function testWrongType()
+    {
+        $opts = Util\RequestOptions::parse(5);
+    }
+
+    public function testDiscardNonPersistentHeaders()
+    {
+        $opts = Util\RequestOptions::parse(
+            [
+                'stripe_account' => 'foo',
+                'idempotency_key' => 'foo',
+            ]
+        );
+        $opts->discardNonPersistentHeaders();
+        $this->assertSame(['Stripe-Account' => 'foo'], $opts->headers);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/Util/UtilTest.php b/htdocs/includes/stripe/tests/Stripe/Util/UtilTest.php
new file mode 100644
index 00000000000..cf5130208db
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/Util/UtilTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Stripe;
+
+class UtilTest extends TestCase
+{
+    public function testIsList()
+    {
+        $list = [5, 'nstaoush', []];
+        $this->assertTrue(Util\Util::isList($list));
+
+        $notlist = [5, 'nstaoush', [], 'bar' => 'baz'];
+        $this->assertFalse(Util\Util::isList($notlist));
+    }
+
+    public function testThatPHPHasValueSemanticsForArrays()
+    {
+        $original = ['php-arrays' => 'value-semantics'];
+        $derived = $original;
+        $derived['php-arrays'] = 'reference-semantics';
+
+        $this->assertSame('value-semantics', $original['php-arrays']);
+    }
+
+    public function testConvertStripeObjectToArrayIncludesId()
+    {
+        $customer = Util\Util::convertToStripeObject([
+            'id' => 'cus_123',
+            'object' => 'customer',
+        ], null);
+        $this->assertTrue(array_key_exists("id", $customer->__toArray(true)));
+    }
+
+    public function testUtf8()
+    {
+        // UTF-8 string
+        $x = "\xc3\xa9";
+        $this->assertSame(Util\Util::utf8($x), $x);
+
+        // Latin-1 string
+        $x = "\xe9";
+        $this->assertSame(Util\Util::utf8($x), "\xc3\xa9");
+
+        // Not a string
+        $x = true;
+        $this->assertSame(Util\Util::utf8($x), $x);
+    }
+
+    public function testUrlEncode()
+    {
+        $a = [
+            'my' => 'value',
+            'that' => ['your' => 'example'],
+            'bar' => 1,
+            'baz' => null
+        ];
+
+        $enc = Util\Util::urlEncode($a);
+        $this->assertSame('my=value&that%5Byour%5D=example&bar=1', $enc);
+
+        $a = ['that' => ['your' => 'example', 'foo' => null]];
+        $enc = Util\Util::urlEncode($a);
+        $this->assertSame('that%5Byour%5D=example', $enc);
+
+        $a = ['that' => 'example', 'foo' => ['bar', 'baz']];
+        $enc = Util\Util::urlEncode($a);
+        $this->assertSame('that=example&foo%5B%5D=bar&foo%5B%5D=baz', $enc);
+
+        $a = [
+            'my' => 'value',
+            'that' => ['your' => ['cheese', 'whiz', null]],
+            'bar' => 1,
+            'baz' => null
+        ];
+
+        $enc = Util\Util::urlEncode($a);
+        $expected = 'my=value&that%5Byour%5D%5B%5D=cheese'
+              . '&that%5Byour%5D%5B%5D=whiz&bar=1';
+        $this->assertSame($expected, $enc);
+
+        // Ignores an empty array
+        $enc = Util\Util::urlEncode(['foo' => [], 'bar' => 'baz']);
+        $expected = 'bar=baz';
+        $this->assertSame($expected, $enc);
+
+        $a = ['foo' => [['bar' => 'baz'], ['bar' => 'bin']]];
+        $enc = Util\Util::urlEncode($a);
+        $this->assertSame('foo%5B0%5D%5Bbar%5D=baz&foo%5B1%5D%5Bbar%5D=bin', $enc);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/Stripe/WebhookTest.php b/htdocs/includes/stripe/tests/Stripe/WebhookTest.php
new file mode 100644
index 00000000000..dcd82671afc
--- /dev/null
+++ b/htdocs/includes/stripe/tests/Stripe/WebhookTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Stripe;
+
+class WebhookTest extends TestCase
+{
+    const EVENT_PAYLOAD = "{
+  \"id\": \"evt_test_webhook\",
+  \"object\": \"event\"
+}";
+    const SECRET = "whsec_test_secret";
+
+    private function generateHeader($opts = [])
+    {
+        $timestamp = array_key_exists('timestamp', $opts) ? $opts['timestamp'] : time();
+        $payload = array_key_exists('payload', $opts) ? $opts['payload'] : self::EVENT_PAYLOAD;
+        $secret = array_key_exists('secret', $opts) ? $opts['secret'] : self::SECRET;
+        $scheme = array_key_exists('scheme', $opts) ? $opts['scheme'] : WebhookSignature::EXPECTED_SCHEME;
+        $signature = array_key_exists('signature', $opts) ? $opts['signature'] : null;
+        if ($signature === null) {
+            $signedPayload = "$timestamp.$payload";
+            $signature = hash_hmac("sha256", $signedPayload, $secret);
+        }
+        return "t=$timestamp,$scheme=$signature";
+    }
+
+    public function testValidJsonAndHeader()
+    {
+        $sigHeader = $this->generateHeader();
+        $event = Webhook::constructEvent(self::EVENT_PAYLOAD, $sigHeader, self::SECRET);
+        $this->assertEquals("evt_test_webhook", $event->id);
+    }
+
+    /**
+     * @expectedException \UnexpectedValueException
+     */
+    public function testInvalidJson()
+    {
+        $payload = "this is not valid JSON";
+        $sigHeader = $this->generateHeader(["payload" => $payload]);
+        Webhook::constructEvent($payload, $sigHeader, self::SECRET);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\SignatureVerification
+     */
+    public function testValidJsonAndInvalidHeader()
+    {
+        $sigHeader = "bad_header";
+        Webhook::constructEvent(self::EVENT_PAYLOAD, $sigHeader, self::SECRET);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\SignatureVerification
+     * @expectedExceptionMessage Unable to extract timestamp and signatures from header
+     */
+    public function testMalformedHeader()
+    {
+        $sigHeader = "i'm not even a real signature header";
+        WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\SignatureVerification
+     * @expectedExceptionMessage No signatures found with expected scheme
+     */
+    public function testNoSignaturesWithExpectedScheme()
+    {
+        $sigHeader = $this->generateHeader(["scheme" => "v0"]);
+        WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\SignatureVerification
+     * @expectedExceptionMessage No signatures found matching the expected signature for payload
+     */
+    public function testNoValidSignatureForPayload()
+    {
+        $sigHeader = $this->generateHeader(["signature" => "bad_signature"]);
+        WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET);
+    }
+
+    /**
+     * @expectedException \Stripe\Error\SignatureVerification
+     * @expectedExceptionMessage Timestamp outside the tolerance zone
+     */
+    public function testTimestampOutsideTolerance()
+    {
+        $sigHeader = $this->generateHeader(["timestamp" => time() - 15]);
+        WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET, 10);
+    }
+
+    public function testValidHeaderAndSignature()
+    {
+        $sigHeader = $this->generateHeader();
+        $this->assertTrue(WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET, 10));
+    }
+
+    public function testHeaderContainsValidSignature()
+    {
+        $sigHeader = $this->generateHeader() . ",v1=bad_signature";
+        $this->assertTrue(WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET, 10));
+    }
+
+    public function testTimestampOffButNoTolerance()
+    {
+        $sigHeader = $this->generateHeader(["timestamp" => 12345]);
+        $this->assertTrue(WebhookSignature::verifyHeader(self::EVENT_PAYLOAD, $sigHeader, self::SECRET));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/data/test.png b/htdocs/includes/stripe/tests/data/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..1914264c08781d1f30ee0b8482bccf44586f2dc1
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?ju0VQumF+E%TuG2$FoVOh
l8)-lem#2$k2*>s01R$G<f$@>z9%CSj!PC{xWt~$(697H@6ZHT9

literal 0
HcmV?d00001


From 8c128a29854d48f3736c2d9f9cf32c3c8a929c3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 19:28:04 +0100
Subject: [PATCH 356/386] Stripe has drop PHP 5.3

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

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 8a11d6884db..dc46b886fc4 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -71,7 +71,7 @@ class modStripe extends DolibarrModules
         // Dependencies
         $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,3);					// Minimum version of PHP required by module
+        $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");
 

From e5bb6030eb1a797a522b896a30a6e7b961e97de1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Mar 2018 19:33:43 +0100
Subject: [PATCH 357/386] Fix phpcs

---
 htdocs/blockedlog/class/blockedlog.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 8b7a3c150cc..6a38bc3ab49 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -675,8 +675,9 @@ class BlockedLog
 	/**
 	 * Decode data
 	 *
+	 * @param	string	$data	Data to unserialize
 	 * @param	string	$mode	0=unserialize, 1=json_decode
-	 * @return string			Value unserialized
+	 * @return 	string			Value unserialized
 	 */
 	public function dolDecodeBlockedData($data, $mode=0)
 	{

From a0b587acc0766502a53031e3d83c916bcc3a1c26 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Wed, 7 Mar 2018 20:04:13 +0100
Subject: [PATCH 358/386] NEW introduce stripe.class.php

TODO: more powerful saving infos ?
---
 htdocs/stripe/class/stripe.class.php | 320 +++++++++++++++++++++++++++
 1 file changed, 320 insertions(+)
 create mode 100644 htdocs/stripe/class/stripe.class.php

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
new file mode 100644
index 00000000000..c3fded06264
--- /dev/null
+++ b/htdocs/stripe/class/stripe.class.php
@@ -0,0 +1,320 @@
+<?php
+/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.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 <http://www.gnu.org/licenses/>.
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
+/**                                                                                                
+ *	\class      Rewards
+ *	\brief      Class for Rewards
+ */
+class Stripe extends CommonObject
+{
+	public $rowid;
+  public $fk_soc;
+  public $fk_key;
+  public $id;
+  public $mode;  
+  public $entity;
+  public $statut;
+  public $type;
+  public $code;
+  public $message;
+	
+	/**
+	 * 	Constructor
+	 *
+	 * 	@param	DoliDB		$db			Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+	}
+	
+
+public function GetStripeAccount($id) // TODO: move /transforme optimize function/data
+	{
+		global $conf;
+
+		$sql = "SELECT key_account";
+		$sql.= " FROM ".MAIN_DB_PREFIX."stripe_entity";
+		$sql.= " WHERE entity = ".$id.""; 
+
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+    if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+    $key=$obj->key_account;
+    }
+    else {$key=0;}
+    }
+    else {$key=0;}
+    
+return $key;
+	} 
+  
+public function GetStripeCustomerAccount($id)
+	{
+		global $conf;
+
+		$sql = "SELECT s.key_account as key_account, s.entity, e.fk_object";
+		$sql.= " FROM ".MAIN_DB_PREFIX."stripe_entity as s";
+    $sql.= " JOIN ".MAIN_DB_PREFIX."entity_extrafields as e ON s.entity=e.fk_object";
+		$sql.= " WHERE e.fk_soc=".$id." "; 
+
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+    if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+    $key=$obj->key_account;
+    }
+    else {$key=NULL;}
+    }
+    else {$key=NULL;}
+    
+return $key;
+	}  
+   
+public function CustomerStripe($id,$key)
+	{
+global $conf;
+if (empty($conf->global->STRIPECONNECT_LIVE))
+{
+$mode=0;
+}
+else 
+{
+if (empty($conf->global->STRIPE_LIVE))
+{
+$mode=0;
+}
+else
+{	
+$mode=$conf->global->STRIPE_LIVE;
+}
+}  
+		$sql = "SELECT rowid,fk_soc,fk_key,mode,entity";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_stripe";
+		$sql.= " WHERE fk_soc = ".$id." "; 
+		$sql.= " AND  mode=".$mode." AND entity IN (" . getEntity('stripe') . ")";
+
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+    $soc = new Societe($this->db);
+    $soc->fetch($id);
+    $num=$this->db->num_rows($resql);
+			if ($num) {
+			$obj = $this->db->fetch_object($resql);
+      $tiers = $obj->fk_key; 
+      if ($conf->entity==1){
+      $customer = \Stripe\Customer::retrieve("$tiers");
+      }else{
+      $customer = \Stripe\Customer::retrieve("$tiers",array("stripe_account" => $key));
+      }}
+      else {
+      if ($conf->entity==1){
+      $customer = \Stripe\Customer::create(array(
+      "email" => $soc->email,
+      "description" => $soc->name
+      ));
+      }else{
+      $customer = \Stripe\Customer::create(array(
+      "email" => $soc->email,
+      "description" => $soc->name
+      ), array("stripe_account" => $key));
+      }
+      $customer_id = "".$customer->id."";
+      $sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_stripe (fk_soc,fk_key,mode,entity)";
+      $sql .= " VALUES ($id,'$customer_id',".$mode.",".$conf->entity.")"; 
+      dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+      $resql = $this->db->query($sql);
+      }}
+return $customer;
+	}
+  
+public function CreatePaymentStripe($amount,$currency,$origin,$item,$source,$customer,$account)
+{
+global $conf;
+if (empty($conf->global->STRIPECONNECT_LIVE))
+{
+$mode=0;
+}
+else 
+{
+if (empty($conf->global->STRIPE_LIVE))
+{
+$mode=0;
+}
+else
+{	
+$mode=$conf->global->STRIPE_LIVE;
+}
+} 
+		$sql = "SELECT fk_soc,fk_key,mode,entity";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_stripe";
+		$sql.= " WHERE fk_key = '$customer' "; 
+		$sql.= " AND mode=".$mode." "; 
+
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+    if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+    $entite=$obj->entity;
+    $fksoc=$obj->fk_soc;
+    }
+    }
+$stripeamount=round($amount*100);   
+$societe = new Societe($this->db);
+$societe->fetch($fksoc);
+
+if ($origin==order){
+$order=new Commande($this->db);
+$order->fetch($item);
+$ref=$order->ref;
+$description="ORD=".$ref.".CUS=".$societe->code_client;
+}
+elseif ($origin==invoice) {
+$invoice=new Facture($this->db);
+$invoice->fetch($item);
+$ref=$invoice->ref;
+$description="INV=".$ref.".CUS=".$societe->code_client;
+} 
+
+$metadata = array(
+    "source" => "".$origin."",
+    "idsource" => "".$item."",
+    "idcustomer" => "".$societe->id.""
+  );
+$return = new StripeConnexion($this->db);   
+try {
+if ($stripeamount>=100) {
+if ($entite=='1' or empty($conf->stripeconnect->enabled)){
+if (preg_match('/acct_/i',$source)){
+   $charge = \Stripe\Charge::create(array(
+  "amount" => "$stripeamount",
+  "currency" => "$currency",
+//  "statement_descriptor" => " ",
+  "metadata" => $metadata,
+  "source" => "$source"
+)
+);
+} else {
+$charge = \Stripe\Charge::create(array(
+  "amount" => "$stripeamount",
+  "currency" => "$currency",
+//  "statement_descriptor" => " ",
+  "description" => "$description",
+  "metadata" => $metadata,
+  "receipt_email" => $societe->email,
+  "source" => "$source",
+  "customer" => "$customer") 
+ ,array("idempotency_key" => "$ref")
+); 
+}}else{
+$fee=round(($amount*($conf->global->STRIPE_APPLICATION_FEE_PERCENT/100)+$conf->global->STRIPE_APPLICATION_FEE)*100);
+if ($fee<($conf->global->STRIPE_APPLICATION_FEE_MINIMAL*100)){
+$fee=round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL*100);
+}
+$charge = \Stripe\Charge::create(array(
+  "amount" => "$stripeamount",
+  "currency" => "$currency",
+//  "statement_descriptor" => " ",
+  "description" => "$description",
+  "metadata" => $metadata,
+  "source" => "$source",
+  "customer" => "$customer",
+  "application_fee" => "$fee"
+), array("idempotency_key" => "$ref","stripe_account" => "$account"));
+}
+if (isset($charge->id)){
+
+}
+}
+
+$return->statut = 'success';
+$return->id = $charge->id;
+if ($charge->source->type=='card'){
+$return->message = $charge->source->card->brand." ****".$charge->source->card->last4;
+}elseif ($charge->source->type=='three_d_secure'){
+$stripeconnect=new StripeConnexion($this->db);
+$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+$return->message = $src->card->brand." ****".$src->card->last4;
+}else {
+$return->message = $charge->id;
+}
+
+} catch(\Stripe\Error\Card $e) {
+        // Since it's a decline, \Stripe\Error\Card will be caught
+        $body = $e->getJsonBody();
+        $err  = $body['error'];
+        
+$return->statut = 'error';        
+$return->id = $err['charge'];
+$return->type = $err['type'];
+$return->code = $err['code'];
+$return->message = $err['message'];
+$body = "Une erreur de paiement est survenue. Voici le code d'erreur: <br />".$return->id." ".$return->message." "; 
+$subject = '[NOTIFICATION] Erreur de paiement';
+$headers = 'From: "ptibogxiv.net" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers); 
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (\Stripe\Error\RateLimit $e) {
+        // Too many requests made to the API too quickly
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (\Stripe\Error\InvalidRequest $e) {
+        // Invalid parameters were supplied to Stripe's API
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (\Stripe\Error\Authentication $e) {
+        // Authentication with Stripe's API failed
+        // (maybe you changed API keys recently)
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (\Stripe\Error\ApiConnection $e) {
+        // Network communication with Stripe failed
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (\Stripe\Error\Base $e) {
+        // Display a very generic error to the user, and maybe send
+        // yourself an email
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    } catch (Exception $e) {
+        // Something else happened, completely unrelated to Stripe
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+    }      
+        return $return;
+} 
+   
+}

From 197ce2fc3d3b240a6d1e7da82e25f874a125cd51 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Thu, 8 Mar 2018 02:08:14 +0100
Subject: [PATCH 359/386] Fix set default

---
 htdocs/societe/paymentmodes.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7f969f64e56..cbafeb68a09 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -272,13 +272,13 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setasdefault')
+	if ($action == 'setasbankdefault')
 	{
 		$account = new CompanyBankAccount($db);
 		$res = $account->setAsDefault(GETPOST('ribid','int'));
 		if ($res)
 		{
-			$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
+			$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
 		}
@@ -337,19 +337,20 @@ if (class_exists('Stripe'))
 	$stripe=new Stripe($db);
 	$customerstripe=$stripe->CustomerStripe($socid,$stripe->GetStripeAccount($conf->entity));
 	if ($customerstripe->id) {
-	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."",array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));}
+	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."");} 
+
 	$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-	if ($action == 'setasdefault')
+	if ($action == 'setassourcedefault')
 	{
 	$cu->default_source = "$source"; // obtained with Stripe.js
 	$cu->save();
-
-	header('Location: '.$url);
-	exit;
+ 
+	//header('Location: '.$url);
+	//exit;
 	}
 	elseif ($action == 'delete')
 	{
-	$cu->sources->retrieve("$source")->delete();
+	$cu->sources->retrieve("$source")->detach();
 
 	header('Location: '.$url);
 	exit;
@@ -365,8 +366,9 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 
 llxHeader();
-
+    
 $head=societe_prepare_head($object);
+
 if (! $id)
 {
 	$account->fetch(0,$object->id);
@@ -505,7 +507,7 @@ if ($socid && $action != 'edit' && $action != "create")
 				print '<td align="center" width="50">';
 				if (($cu->default_source!=$src->id))
 				{
-				                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
+				                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault">';
 				                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
 				                print '</a>';
 				} else {
@@ -515,7 +517,7 @@ if ($socid && $action != 'edit' && $action != "create")
 				print '<td align="center">';
 				if ($user->rights->societe->creer)
 				{
-				//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
+				//            	print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
 				//            	print img_picto($langs->trans("Modify"),'edit');
 				//            	print '</a>';
 				//           		print '&nbsp;';
@@ -634,7 +636,7 @@ if ($socid && $action != 'edit' && $action != "create")
 			// Default
 			print '<td align="center" width="70">';
 			if (!$rib->default_rib) {
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasdefault">';
+				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
 				print img_picto($langs->trans("Disabled"),'off');
 				print '</a>';
 			} else {

From c3e211f3f78d2ff2e4ea7185fc0871c402c1d788 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Thu, 8 Mar 2018 02:08:43 +0100
Subject: [PATCH 360/386] Delete gateway.php

---
 htdocs/societe/gateway.php | 985 -------------------------------------
 1 file changed, 985 deletions(-)
 delete mode 100644 htdocs/societe/gateway.php

diff --git a/htdocs/societe/gateway.php b/htdocs/societe/gateway.php
deleted file mode 100644
index 79a9a60bb96..00000000000
--- a/htdocs/societe/gateway.php
+++ /dev/null
@@ -1,985 +0,0 @@
-<?php
-/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
- * Copyright (C) 2015-2016 Marcos García        <marcosgdf@gmail.com>
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/societe/rib.php
- *      \ingroup    societe
- *		\brief      BAN tab for companies
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("banks");
-$langs->load("bills");
-
-// Security check
-$socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$id=GETPOST("id","int");
-$source=GETPOST("source","alpha");
-$ribid=GETPOST("ribid","int");
-$action=GETPOST("action", 'alpha', 3);
-
-$object = new Societe($db);
-$object->fetch($socid);
-
-$account = new CompanyBankAccount($db);
-$prelevement = new BonPrelevement($db);
-
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$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('thirdpartybancard','globalcard'));
-
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartybancard'));
-
-
-
-/*
- *	Actions
- */
-
-$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-$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 ($cancel)
-	{
-		$action='';
-		if (! empty($backtopage))
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-	}
-
-
-	if ($action == 'update' && ! $_POST["cancel"])
-	{
-		// Modification
-		if (! GETPOST('label'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$action='edit';
-			$error++;
-		}
-		if (! GETPOST('bank'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='edit';
-			$error++;
-		}
-		if ($account->needIBAN() == 1)
-		{
-			if (! GETPOST('iban'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-			if (! GETPOST('bic'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-		}
-
-		$account->fetch($id);
-		if (! $error)
-		{
-			$account->socid           = $object->id;
-
-			$account->bank            = GETPOST('bank','alpha');
-			$account->label           = GETPOST('label','alpha');
-			$account->courant         = GETPOST('courant','alpha');
-			$account->clos            = GETPOST('clos','alpha');
-			$account->code_banque     = GETPOST('code_banque','alpha');
-			$account->code_guichet    = GETPOST('code_guichet','alpha');
-			$account->number          = GETPOST('number','alpha');
-			$account->cle_rib         = GETPOST('cle_rib','alpha');
-			$account->bic             = GETPOST('bic','alpha');
-			$account->iban            = GETPOST('iban','alpha');
-			$account->domiciliation   = GETPOST('domiciliation','alpha');
-			$account->proprio         = GETPOST('proprio','alpha');
-			$account->owner_address   = GETPOST('owner_address','alpha');
-			$account->frstrecur       = GETPOST('frstrecur','alpha');
-			$account->rum             = GETPOST('rum','alpha');
-			if (empty($account->rum))
-			{
-				$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-				$account->date_rum = dol_now();
-			}
-
-			$result = $account->update($user);
-			if (! $result)
-			{
-				setEventMessages($account->error, $account->errors, 'errors');
-			}
-			else
-			{
-				// If this account is the default bank account, we disable others
-				if ($account->default_rib)
-				{
-					$account->setAsDefault($id);	// This will make sure there is only one default rib
-				}
-
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-		}
-	}
-
-	if ($action == 'add' && ! $_POST["cancel"])
-	{
-		$error=0;
-
-		if (! GETPOST('label'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-		if (! GETPOST('bank'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-
-		if (! $error)
-		{
-			// Ajout
-			$account = new CompanyBankAccount($db);
-
-			$account->socid           = $object->id;
-
-			$account->bank            = GETPOST('bank','alpha');
-			$account->label           = GETPOST('label','alpha');
-			$account->courant         = GETPOST('courant','alpha');
-			$account->clos            = GETPOST('clos','alpha');
-			$account->code_banque     = GETPOST('code_banque','alpha');
-			$account->code_guichet    = GETPOST('code_guichet','alpha');
-			$account->number          = GETPOST('number','alpha');
-			$account->cle_rib         = GETPOST('cle_rib','alpha');
-			$account->bic             = GETPOST('bic','alpha');
-			$account->iban            = GETPOST('iban','alpha');
-			$account->domiciliation   = GETPOST('domiciliation','alpha');
-			$account->proprio         = GETPOST('proprio','alpha');
-			$account->owner_address   = GETPOST('owner_address','alpha');
-			$account->frstrecur       = GETPOST('frstrecur');
-			$account->rum             = GETPOST('rum','alpha');
-			$account->datec			  = dol_now();
-
-			$db->begin();
-
-			// This test can be done only once properties were set
-			if ($account->needIBAN() == 1)
-			{
-				if (! GETPOST('iban'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-				if (! GETPOST('bic'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $account->create($user);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($account->error, $account->errors, 'errors');
-					$action='create';     // Force chargement page création
-				}
-
-				if (empty($account->rum))
-				{
-					$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-					$account->date_rum = dol_now();
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $account->update($user);	// This will set the UMR number.
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($account->error, $account->errors, 'errors');
-					$action='create';
-				}
-			}
-
-			if (! $error)
-			{
-				$db->commit();
-
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-	}
-
-	if ($action == 'setasdefault')
-	{
-		$account = new CompanyBankAccount($db);
-		$res = $account->setAsDefault(GETPOST('ribid','int'));
-		if ($res)
-		{
-			$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
-			header('Location: '.$url);
-			exit;
-		}
-		else
-		{
-			setEventMessages($db->lasterror, null, 'errors');
-		}
-	}
-
-	if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
-	{
-		$account = new CompanyBankAccount($db);
-		if ($account->fetch($ribid?$ribid:$id))
-		{
-			$result = $account->delete($user);
-			if ($result > 0)
-			{
-				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				setEventMessages($account->error, $account->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($account->error, $account->errors, 'errors');
-		}
-	}
-
-	$savid=$id;
-
-	// Actions to build doc
-	if ($action == 'builddocrib')
-	{
-		$action = 'builddoc';
-		$moreparams = array(
-			'use_companybankid'=>GETPOST('companybankid'),
-			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
-		);
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
-		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
-	}
-	$id = $socid;
-	$upload_dir = $conf->societe->multidir_output[$object->entity];
-	$permissioncreate=$user->rights->societe->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-	$id = $savid;
-}
-
-$stripeconnect=new StripeConnexion($db);
-$customer=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
-if ($customer->id) {
-$cu = \Stripe\Customer::retrieve("".$customer->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
-$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
-if ($action == 'setasdefault')
-{
-$cu->default_source = "$source"; // obtained with Stripe.js
-$cu->save();
-
-header('Location: '.$url);
-exit;
-}
-elseif ($action == 'delete')
-{
-$cu->sources->retrieve("$source")->delete();
-
-header('Location: '.$url);
-exit;
-}
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-llxHeader();
-
-$head=societe_prepare_head($object);
-if (! $id)
-{
-	$account->fetch(0,$object->id);
-}
-else
-{
-	$account->fetch($id);
-}
-if (empty($account->socid)) $account->socid=$object->id;
-
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
-}
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-}
-
-
-// View
-if ($socid && $action != 'edit' && $action != "create")
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
-
-	// Confirm delete third party
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
-	}
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-if (! (empty($conf->stripe->enabled))){
-print '<tr><td class="titlefield">';
-print $langs->trans('StripeGateways').'</td><td colspan="3">';
-if ($stripeconnect->GetStripeAccount($conf->entity)) {
-$customer=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
-}
-
-if ($customer->id) {
-$input=$customer->sources->data;
-}
-print '<table class="liste" width="100%">'."\n";
-print '<tr class="liste_titre">';
-print '<td align="left">'.$langs->trans('Type').'</td>';
-print '<td align="left">'.$langs->trans('Informations').'</td>';
-print '<td align="left"></td>';
-print '<td align="center">'.$langs->trans('Default').'</td>';
-print "<td></td></tr>\n";
-    
-foreach ($input as $src) {
-print '<tr>';
-print '<td>';
-if ($src->object=='card'){
-if ($src->brand == 'Visa') {$brand='cc-visa';}
-elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
-elseif ($src->brand == 'American Express') {$brand='cc-amex';}
-elseif ($src->brand == 'Discover') {$brand='cc-discover';}
-elseif ($src->brand == 'JCB') {$brand='cc-jcb';}
-elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
-else {$brand='credit-card';}
-print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
-}
-elseif ($src->object=='source' && $src->type=='card'){
-if ($src->card->brand == 'Visa') {$brand='cc-visa';}
-elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
-elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
-elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
-elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
-elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
-else {$brand='credit-card';}
-
-print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
-}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
-print '<span class="fa fa-university fa-3x fa-fw"></span>';
-}
-print'</td><td valign="middle">';
-if ($src->object=='card'){
-print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
-print '</td><td>';
- if ($src->country)
-	{
-		$img=picto_from_langcode($src->country);
-		print $img?$img.' ':'';
-		print getCountry($src->country,1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-elseif ($src->object=='source' && $src->type=='card'){
-print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
-print '</td><td>';
- if ($src->card->country)
-	{
-		$img=picto_from_langcode($src->card->country);
-		print $img?$img.' ':'';
-		print getCountry($src->card->country,1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
-print 'info sepa';
-print '</td><td>';
- if ($src->sepa_debit->country)
-	{
-		$img=picto_from_langcode($src->sepa_debit->country);
-		print $img?$img.' ':'';
-		print getCountry($src->sepa_debit->country,1);
-	}
-	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-}
-print '</td>';
-            // Default
-            print '<td align="center" width="50">';
-            if (($cu->default_source!=$src->id)) {
-                print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
-                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
-                print '</a>';
-            } else {
-                print "<SPAN class=' fa fa-check-circle  fa-2x'></SPAN>";
-            }
-            print '</td>';
-print '<td align="center">';
-            if ($user->rights->societe->creer)
-            {
-//            	print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&id='.$src->id.'&action=edit">';
-//            	print img_picto($langs->trans("Modify"),'edit');
-//            	print '</a>';
-//           		print '&nbsp;';
-           		print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=delete">';
-           		print "<SPAN class='fa fa-trash fa-2x'></SPAN>";
-           		print '</a>';
-            }
-print '</td></tr>';
-}
-if (empty($input))
-{
-print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
-}	
-print "</table>";
-}
-
-	// List of bank accounts
-
-	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
-
-	print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
-
-	$rib_list = $object->get_all_rib();
-	$var = false;
-	if (is_array($rib_list))
-	{
-		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" width="100%">';
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("LabelRIB");
-		print_liste_field_titre("Bank");
-		print_liste_field_titre("RIB");
-		print_liste_field_titre("IBAN");
-		print_liste_field_titre("BIC");
-		if (! empty($conf->prelevement->enabled))
-		{
-			print print_liste_field_titre("RUM");
-			print print_liste_field_titre("WithdrawMode");
-		}
-		print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
-		print_liste_field_titre('', '', '', '', '', 'align="center"');
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print "</tr>\n";
-
-		foreach ($rib_list as $rib)
-		{
-			print '<tr class="oddeven">';
-			// Label
-			print '<td>'.$rib->label.'</td>';
-			// Bank name
-			print '<td>'.$rib->bank.'</td>';
-			// Account number
-			print '<td>';
-			$string='';
-			foreach ($rib->getFieldsToShow() as $val) {
-
-				if ($val == 'BankCode') {
-					$string .= $rib->code_banque.' ';
-				} elseif ($val == 'BankAccountNumber') {
-					$string .= $rib->number.' ';
-				} elseif ($val == 'DeskCode') {
-					$string .= $rib->code_guichet.' ';
-				} elseif ($val == 'BankAccountNumberKey') {
-					$string .= $rib->cle_rib.' ';
-				/* Already output after
-                }elseif ($val == 'BIC') {
-                    $string .= $rib->bic.' ';
-                }elseif ($val == 'IBAN') {
-                    $string .= $rib->iban.' ';*/
-				}
-			}
-			if (! empty($rib->label) && $rib->number) {
-				if (! checkBanForAccount($rib)) {
-					$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-
-			print $string;
-			print '</td>';
-			// IBAN
-			print '<td>'.$rib->iban;
-   			if (! empty($rib->iban)) {
-				if (! checkIbanForAccount($rib)) {
-					print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("IbanValid"),'info');
-				}
-			}
-			print '</td>';
-			// BIC
-			print '<td>'.$rib->bic;
-			if (! empty($rib->bic)) {
-				if (! checkSwiftForAccount($rib)) {
-					print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("SwiftValid"),'info');
-				}
-			}
-			print '</td>';
-
-			if (! empty($conf->prelevement->enabled))
-			{
-				// RUM
-				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
-				print '<td>'.$rib->rum.'</td>';
-
-				// FRSTRECUR
-				print '<td>'.$rib->frstrecur.'</td>';
-			}
-
-			// Default
-			print '<td align="center" width="70">';
-			if (!$rib->default_rib) {
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasdefault">';
-				print img_picto($langs->trans("Disabled"),'off');
-				print '</a>';
-			} else {
-				print img_picto($langs->trans("Enabled"),'on');
-			}
-			print '</td>';
-
-			// Generate doc
-			print '<td align="center">';
-
-			$buttonlabel = $langs->trans("BuildDoc");
-			$forname='builddocrib'.$rib->id;
-
-			include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-			$modellist=ModeleBankAccountDoc::liste_modeles($db);
-
-			$out = '';
-			if (is_array($modellist) && count($modellist))
-			{
-				$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
-				$out.= '<input type="hidden" name="action" value="builddocrib">';
-				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
-				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
-				}
-				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
-
-				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				$out.= ajax_combobox('modelrib'.$rib->id);
-
-				// Language code (if multilang)
-				if ($conf->global->MAIN_MULTILANGS)
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-					$formadmin=new FormAdmin($db);
-					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-					$morecss='maxwidth150';
-					if (! empty($conf->browser->phone)) $morecss='maxwidth100';
-					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
-				}
-				// Button
-				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-				$genbutton.= '>';
-				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-				{
-					$langs->load("errors");
-					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-				}
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-				$out.= $genbutton;
-				$out.= '</form>';
-			}
-			print $out;
-			print '</td>';
-
-			// Edit/Delete
-			print '<td align="right">';
-			if ($user->rights->societe->creer)
-			{
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
-				print img_picto($langs->trans("Modify"),'edit');
-				print '</a>';
-
-		   		print '&nbsp;';
-
-		   		print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
-		   		print img_picto($langs->trans("Delete"),'delete');
-		   		print '</a>';
-			}
-			print '</td>';
-
-			print '</tr>';
-		}
-
-		if (count($rib_list) == 0)
-		{
-			$colspan=8;
-			if (! empty($conf->prelevement->enabled)) $colspan+=2;
-			print '<tr '.$bc[0].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
-		}
-
-		print '</table>';
-		print '</div>';
-	} else {
-		dol_print_error($db);
-	}
-
-	dol_fiche_end();
-/*
-	if ($socid && $action != 'edit' && $action != 'create')
-	{
-		// Barre d'actions
-		print '<div class="tabsAction">';
-
-		if ($user->rights->societe->creer)
-		{
-			print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
-		}
-
-		print '</div>';
-	}
-*/
-	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		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;
-
-		$var=true;
-
-		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		print '</div></div></div>';
-
-		print '<br>';
-	}
-	/*
-    include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-    $modellist=ModeleBankAccountDoc::liste_modeles($db);
-    //print '<td>';
-    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-    {
-        $arraykeys=array_keys($modellist);
-        $modelselected=$arraykeys[0];
-    }
-    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-    $out.= ajax_combobox('model');
-    //print $out;
-    $buttonlabel=$langs->trans("Generate");
-    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-    $genbutton.= '>';
-    print $genbutton;
-    //print '</td>';     // TODO Add link to generate doc
-    */
-}
-
-// Edit
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><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>';
-
-	// Show fields of bank account
-	foreach ($account->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-			$content = $account->code_banque;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-			$content = $account->code_guichet;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-			$content = $account->number;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-			$content = $account->cle_rib;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			$content = $account->iban;
-			if ($account->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			$content = $account->bic;
-			if ($account->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
-	print $account->domiciliation;
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
-	print $account->owner_address;
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-
-		// RUM
-		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	print '<div align="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>';
-}
-
-
-// Create
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="nofichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
-	print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
-
-	// Show fields of bank account
-	foreach ($account->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			if ($account->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			if ($account->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('domiciliation');
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('owner_address');
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		// RUM
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	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 '</div>';
-}
-
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	print '</form>';
-}
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	print '</form>';
-}
-
-
-llxFooter();
-
-$db->close();

From 5c04c2886ca681cd08d3089569e45e51b9d1412d Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Thu, 8 Mar 2018 02:09:27 +0100
Subject: [PATCH 361/386] Delete because replace by paymentmodes.php

---
 htdocs/societe/rib.php | 932 -----------------------------------------
 1 file changed, 932 deletions(-)
 delete mode 100644 htdocs/societe/rib.php

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
deleted file mode 100644
index d4263cc0b21..00000000000
--- a/htdocs/societe/rib.php
+++ /dev/null
@@ -1,932 +0,0 @@
-<?php
-/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
- * Copyright (C) 2015-2016 Marcos García        <marcosgdf@gmail.com>
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/societe/rib.php
- *      \ingroup    societe
- *		\brief      BAN tab for companies
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("banks");
-$langs->load("bills");
-
-// Security check
-$socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$id=GETPOST("id","int");
-$ribid=GETPOST("ribid","int");
-$action=GETPOST("action", 'alpha', 3);
-
-$object = new Societe($db);
-$object->fetch($socid);
-
-$account = new CompanyBankAccount($db);
-$prelevement = new BonPrelevement($db);
-
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$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('thirdpartybancard','globalcard'));
-
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartybancard'));
-
-
-
-/*
- *	Actions
- */
-
-$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-$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 ($cancel)
-	{
-		$action='';
-		if (! empty($backtopage))
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-	}
-
-
-	if ($action == 'update' && ! $_POST["cancel"])
-	{
-		// Modification
-		if (! GETPOST('label'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$action='edit';
-			$error++;
-		}
-		if (! GETPOST('bank'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='edit';
-			$error++;
-		}
-		if ($account->needIBAN() == 1)
-		{
-			if (! GETPOST('iban'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-			if (! GETPOST('bic'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-		}
-
-		$account->fetch($id);
-		if (! $error)
-		{
-			$account->socid           = $object->id;
-
-			$account->bank            = GETPOST('bank','alpha');
-			$account->label           = GETPOST('label','alpha');
-			$account->courant         = GETPOST('courant','alpha');
-			$account->clos            = GETPOST('clos','alpha');
-			$account->code_banque     = GETPOST('code_banque','alpha');
-			$account->code_guichet    = GETPOST('code_guichet','alpha');
-			$account->number          = GETPOST('number','alpha');
-			$account->cle_rib         = GETPOST('cle_rib','alpha');
-			$account->bic             = GETPOST('bic','alpha');
-			$account->iban            = GETPOST('iban','alpha');
-			$account->domiciliation   = GETPOST('domiciliation','alpha');
-			$account->proprio         = GETPOST('proprio','alpha');
-			$account->owner_address   = GETPOST('owner_address','alpha');
-			$account->frstrecur       = GETPOST('frstrecur','alpha');
-			$account->rum             = GETPOST('rum','alpha');
-			if (empty($account->rum))
-			{
-				$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-				$account->date_rum = dol_now();
-			}
-
-			$result = $account->update($user);
-			if (! $result)
-			{
-				setEventMessages($account->error, $account->errors, 'errors');
-			}
-			else
-			{
-				// If this account is the default bank account, we disable others
-				if ($account->default_rib)
-				{
-					$account->setAsDefault($id);	// This will make sure there is only one default rib
-				}
-
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-		}
-	}
-
-	if ($action == 'add' && ! $_POST["cancel"])
-	{
-		$error=0;
-
-		if (! GETPOST('label'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-		if (! GETPOST('bank'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-
-		if (! $error)
-		{
-			// Ajout
-			$account = new CompanyBankAccount($db);
-
-			$account->socid           = $object->id;
-
-			$account->bank            = GETPOST('bank','alpha');
-			$account->label           = GETPOST('label','alpha');
-			$account->courant         = GETPOST('courant','alpha');
-			$account->clos            = GETPOST('clos','alpha');
-			$account->code_banque     = GETPOST('code_banque','alpha');
-			$account->code_guichet    = GETPOST('code_guichet','alpha');
-			$account->number          = GETPOST('number','alpha');
-			$account->cle_rib         = GETPOST('cle_rib','alpha');
-			$account->bic             = GETPOST('bic','alpha');
-			$account->iban            = GETPOST('iban','alpha');
-			$account->domiciliation   = GETPOST('domiciliation','alpha');
-			$account->proprio         = GETPOST('proprio','alpha');
-			$account->owner_address   = GETPOST('owner_address','alpha');
-			$account->frstrecur       = GETPOST('frstrecur');
-			$account->rum             = GETPOST('rum','alpha');
-			$account->datec			  = dol_now();
-
-			$db->begin();
-
-			// This test can be done only once properties were set
-			if ($account->needIBAN() == 1)
-			{
-				if (! GETPOST('iban'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-				if (! GETPOST('bic'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $account->create($user);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($account->error, $account->errors, 'errors');
-					$action='create';     // Force chargement page création
-				}
-
-				if (empty($account->rum))
-				{
-					$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-					$account->date_rum = dol_now();
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $account->update($user);	// This will set the UMR number.
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($account->error, $account->errors, 'errors');
-					$action='create';
-				}
-			}
-
-			if (! $error)
-			{
-				$db->commit();
-
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-	}
-
-	if ($action == 'setasdefault')
-	{
-		$account = new CompanyBankAccount($db);
-		$res = $account->setAsDefault(GETPOST('ribid','int'));
-		if ($res)
-		{
-			$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-			header('Location: '.$url);
-			exit;
-		}
-		else
-		{
-			setEventMessages($db->lasterror, null, 'errors');
-		}
-	}
-
-	if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
-	{
-		$account = new CompanyBankAccount($db);
-		if ($account->fetch($ribid?$ribid:$id))
-		{
-			$result = $account->delete($user);
-			if ($result > 0)
-			{
-				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				setEventMessages($account->error, $account->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($account->error, $account->errors, 'errors');
-		}
-	}
-
-	$savid=$id;
-
-	// Actions to build doc
-	if ($action == 'builddocrib')
-	{
-		$action = 'builddoc';
-		$moreparams = array(
-			'use_companybankid'=>GETPOST('companybankid'),
-			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
-		);
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid'));
-		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid'));
-	}
-	$id = $socid;
-	$upload_dir = $conf->societe->multidir_output[$object->entity];
-	$permissioncreate=$user->rights->societe->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-	$id = $savid;
-}
-
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-llxHeader();
-
-$head=societe_prepare_head($object);
-if (! $id)
-{
-	$account->fetch(0,$object->id);
-}
-else
-{
-	$account->fetch($id);
-}
-if (empty($account->socid)) $account->socid=$object->id;
-
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
-}
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-}
-
-
-// View
-if ($socid && $action != 'edit' && $action != "create")
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
-
-	// Confirm delete third party
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
-	}
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-
-	print load_fiche_titre($langs->trans("DefaultRIB"), '', '');
-
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
-
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
-	print '<td>'.$account->label.'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("BankName").'</td>';
-	print '<td>'.$account->bank.'</td></tr>';
-
-	// Show fields of bank account
-	foreach($account->getFieldsToShow(1) as $val)
-	{
-		if ($val == 'BankCode') {
-			$content = $account->code_banque;
-		} elseif ($val == 'DeskCode') {
-			$content = $account->code_guichet;
-		} elseif ($val == 'BankAccountNumber') {
-			$content = $account->number;
-			if (! empty($account->label) && $account->number) {
-				if (! checkBanForAccount($account)) {
-					$content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$content.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-		} elseif ($val == 'BankAccountNumberKey') {
-			$content = $account->cle_rib;
-		} elseif ($val == 'IBAN') {
-			$content = $account->iban;
-			if (! empty($account->iban)) {
-				if (! checkIbanForAccount($account)) {
-					$content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$content.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-		} elseif ($val == 'BIC') {
-			$content = $account->bic;
-			if (! empty($account->bic)) {
-				if (! checkSwiftForAccount($account)) {
-					$content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$content.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-		}
-
-		print '<tr><td>'.$langs->trans($val).'</td>';
-		print '<td>'.$content.'</td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print $account->domiciliation;
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td>';
-	print $account->proprio;
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print $account->owner_address;
-	print "</td></tr>\n";
-
-	print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-	// List of bank accounts
-
-	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
-
-	print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
-
-	$rib_list = $object->get_all_rib();
-	$var = false;
-	if (is_array($rib_list))
-	{
-		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" width="100%">';
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("LabelRIB");
-		print_liste_field_titre("Bank");
-		print_liste_field_titre("RIB");
-		print_liste_field_titre("IBAN");
-		print_liste_field_titre("BIC");
-		if (! empty($conf->prelevement->enabled))
-		{
-			print print_liste_field_titre("RUM");
-			print print_liste_field_titre("WithdrawMode");
-		}
-		print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
-		print_liste_field_titre('', '', '', '', '', 'align="center"');
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print "</tr>\n";
-
-		foreach ($rib_list as $rib)
-		{
-			print '<tr class="oddeven">';
-			// Label
-			print '<td>'.$rib->label.'</td>';
-			// Bank name
-			print '<td>'.$rib->bank.'</td>';
-			// Account number
-			print '<td>';
-			$string='';
-			foreach ($rib->getFieldsToShow() as $val) {
-
-				if ($val == 'BankCode') {
-					$string .= $rib->code_banque.' ';
-				} elseif ($val == 'BankAccountNumber') {
-					$string .= $rib->number.' ';
-				} elseif ($val == 'DeskCode') {
-					$string .= $rib->code_guichet.' ';
-				} elseif ($val == 'BankAccountNumberKey') {
-					$string .= $rib->cle_rib.' ';
-				/* Already output after
-                }elseif ($val == 'BIC') {
-                    $string .= $rib->bic.' ';
-                }elseif ($val == 'IBAN') {
-                    $string .= $rib->iban.' ';*/
-				}
-			}
-			if (! empty($rib->label) && $rib->number) {
-				if (! checkBanForAccount($rib)) {
-					$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-
-			print $string;
-			print '</td>';
-			// IBAN
-			print '<td>'.$rib->iban;
-   			if (! empty($rib->iban)) {
-				if (! checkIbanForAccount($rib)) {
-					print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("IbanValid"),'info');
-				}
-			}
-			print '</td>';
-			// BIC
-			print '<td>'.$rib->bic;
-			if (! empty($rib->bic)) {
-				if (! checkSwiftForAccount($rib)) {
-					print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("SwiftValid"),'info');
-				}
-			}
-			print '</td>';
-
-			if (! empty($conf->prelevement->enabled))
-			{
-				// RUM
-				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
-				print '<td>'.$rib->rum.'</td>';
-
-				// FRSTRECUR
-				print '<td>'.$rib->frstrecur.'</td>';
-			}
-
-			// Default
-			print '<td align="center" width="70">';
-			if (!$rib->default_rib) {
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasdefault">';
-				print img_picto($langs->trans("Disabled"),'off');
-				print '</a>';
-			} else {
-				print img_picto($langs->trans("Enabled"),'on');
-			}
-			print '</td>';
-
-			// Generate doc
-			print '<td align="center">';
-
-			$buttonlabel = $langs->trans("BuildDoc");
-			$forname='builddocrib'.$rib->id;
-
-			include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-			$modellist=ModeleBankAccountDoc::liste_modeles($db);
-
-			$out = '';
-			if (is_array($modellist) && count($modellist))
-			{
-				$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
-				$out.= '<input type="hidden" name="action" value="builddocrib">';
-				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
-				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
-				}
-				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
-
-				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				$out.= ajax_combobox('modelrib'.$rib->id);
-
-				// Language code (if multilang)
-				if ($conf->global->MAIN_MULTILANGS)
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-					$formadmin=new FormAdmin($db);
-					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-					$morecss='maxwidth150';
-					if (! empty($conf->browser->phone)) $morecss='maxwidth100';
-					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
-				}
-				// Button
-				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-				$genbutton.= '>';
-				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-				{
-					$langs->load("errors");
-					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-				}
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-				$out.= $genbutton;
-				$out.= '</form>';
-			}
-			print $out;
-			print '</td>';
-
-			// Edit/Delete
-			print '<td align="right">';
-			if ($user->rights->societe->creer)
-			{
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
-				print img_picto($langs->trans("Modify"),'edit');
-				print '</a>';
-
-		   		print '&nbsp;';
-
-		   		print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
-		   		print img_picto($langs->trans("Delete"),'delete');
-		   		print '</a>';
-			}
-			print '</td>';
-
-			print '</tr>';
-		}
-
-		if (count($rib_list) == 0)
-		{
-			$colspan=8;
-			if (! empty($conf->prelevement->enabled)) $colspan+=2;
-			print '<tr '.$bc[0].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
-		}
-
-		print '</table>';
-		print '</div>';
-	} else {
-		dol_print_error($db);
-	}
-
-	dol_fiche_end();
-
-
-	/*
-	if ($socid && $action != 'edit' && $action != 'create')
-	{
-		// Barre d'actions
-		print '<div class="tabsAction">';
-
-		if ($user->rights->societe->creer)
-		{
-			print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
-		}
-
-		print '</div>';
-	}
-	*/
-
-
-
-	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		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;
-
-		$var=true;
-
-		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		print '</div></div></div>';
-
-		print '<br>';
-	}
-	/*
-    include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-    $modellist=ModeleBankAccountDoc::liste_modeles($db);
-    //print '<td>';
-    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-    {
-        $arraykeys=array_keys($modellist);
-        $modelselected=$arraykeys[0];
-    }
-    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-    $out.= ajax_combobox('model');
-    //print $out;
-    $buttonlabel=$langs->trans("Generate");
-    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-    $genbutton.= '>';
-    print $genbutton;
-    //print '</td>';     // TODO Add link to generate doc
-    */
-}
-
-// Edit
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><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>';
-
-	// Show fields of bank account
-	foreach ($account->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-			$content = $account->code_banque;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-			$content = $account->code_guichet;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-			$content = $account->number;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-			$content = $account->cle_rib;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			$content = $account->iban;
-			if ($account->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			$content = $account->bic;
-			if ($account->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
-	print $account->domiciliation;
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
-	print $account->owner_address;
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-
-		// RUM
-		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	print '<div align="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>';
-}
-
-
-// Create
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="nofichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
-	print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
-
-	// Show fields of bank account
-	foreach ($account->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			if ($account->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			if ($account->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('domiciliation');
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('owner_address');
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		// RUM
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	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 '</div>';
-}
-
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
-	print '</form>';
-}
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
-	print '</form>';
-}
-
-
-llxFooter();
-
-$db->close();

From e2bd0198d1bcfec9f0b1cceae41e6e36246b7cc8 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Thu, 8 Mar 2018 02:26:57 +0100
Subject: [PATCH 362/386] Fix class call

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index c3fded06264..a1eefd6ecb7 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2018 	PtibogXIV        <support@ptibogxiv.net>
+/* Copyright (C) 2018 	PtibogXIV        <support@ptibogxiv.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
@@ -213,7 +213,7 @@ $metadata = array(
     "idsource" => "".$item."",
     "idcustomer" => "".$societe->id.""
   );
-$return = new StripeConnexion($this->db);   
+$return = new Stripe($this->db);   
 try {
 if ($stripeamount>=100) {
 if ($entite=='1' or empty($conf->stripeconnect->enabled)){
@@ -264,8 +264,8 @@ $return->id = $charge->id;
 if ($charge->source->type=='card'){
 $return->message = $charge->source->card->brand." ****".$charge->source->card->last4;
 }elseif ($charge->source->type=='three_d_secure'){
-$stripeconnect=new StripeConnexion($this->db);
-$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));
+$stripe=new Stripe($this->db);
+$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."",array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
 $return->message = $src->card->brand." ****".$src->card->last4;
 }else {
 $return->message = $charge->id;

From 93a9430e49ff45bfb9559f8de4d3d8250b38bbfb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 7 Mar 2018 17:32:57 +0100
Subject: [PATCH 363/386] Fix: regression, restore primary key

---
 htdocs/admin/dict.php                         |  4 +-
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 htdocs/commande/class/commande.class.php      |  4 +-
 htdocs/compta/bank/class/account.class.php    |  4 +-
 htdocs/compta/bank/various_payment/index.php  |  2 +-
 htdocs/compta/charges/index.php               |  6 +-
 htdocs/compta/facture/card.php                |  2 +-
 .../facture/class/facture-rec.class.php       |  4 +-
 htdocs/compta/facture/class/facture.class.php |  4 +-
 .../facture/class/paymentterm.class.php       | 57 +++++++++----------
 htdocs/compta/paiement.php                    |  2 +-
 htdocs/compta/paiement/list.php               |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  4 +-
 htdocs/compta/resultat/index.php              |  4 +-
 htdocs/compta/salaries/index.php              |  2 +-
 htdocs/compta/sociales/card.php               |  2 +-
 .../sociales/class/chargesociales.class.php   |  2 +-
 .../class/paymentsocialcontribution.class.php |  2 +-
 htdocs/compta/sociales/payments.php           |  2 +-
 htdocs/compta/tva/reglement.php               |  2 +-
 htdocs/core/class/commoninvoice.class.php     | 10 +++-
 htdocs/core/class/html.form.class.php         |  8 +--
 .../modules/facture/doc/pdf_crabe.modules.php |  4 +-
 htdocs/core/modules/modFacture.class.php      |  2 +-
 htdocs/core/modules/modSalaries.class.php     |  2 +-
 htdocs/core/modules/modSociete.class.php      |  4 +-
 .../modules/rapport/pdf_paiement.class.php    |  4 +-
 .../pdf/pdf_canelle.modules.php               |  2 +-
 htdocs/don/card.php                           |  7 ++-
 htdocs/don/class/don.class.php                |  2 +-
 htdocs/don/class/paymentdonation.class.php    |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 .../class/expensereport.class.php             |  2 +-
 .../class/paymentexpensereport.class.php      |  2 +-
 .../class/fournisseur.commande.class.php      |  4 +-
 .../fourn/class/fournisseur.facture.class.php |  4 +-
 htdocs/fourn/class/paiementfourn.class.php    |  2 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/fourn/facture/paiement.php             |  2 +-
 .../install/mysql/migration/7.0.0-8.0.0.sql   |  5 +-
 .../mysql/tables/llx_c_paiement.key.sql       |  2 -
 .../mysql/tables/llx_c_payment_term.key.sql   |  2 +-
 .../mysql/tables/llx_c_payment_term.sql       |  2 +-
 htdocs/loan/card.php                          |  2 +-
 htdocs/loan/class/loanschedule.class.php      |  2 +-
 htdocs/loan/class/paymentloan.class.php       |  2 +-
 .../class/supplier_proposal.class.php         |  4 +-
 47 files changed, 104 insertions(+), 99 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index fbb0b5f38c5..e0d2c861cb2 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -383,8 +383,8 @@ $tabrowid[8] = "id";
 $tabrowid[9] = "code_iso";
 $tabrowid[10]= "";
 $tabrowid[11]= "rowid";
-$tabrowid[12]= "rowid";
-$tabrowid[13]= "id";
+$tabrowid[12]= "";
+$tabrowid[13]= "";
 $tabrowid[14]= "";
 $tabrowid[15]= "";
 $tabrowid[16]= "code";
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3adc58ecbae..67090f386dc 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1343,8 +1343,8 @@ class Propal extends CommonObject
 		$sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
 		$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."propal as p";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN ('.getEntity('c_paiement').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5cf5b6c7b40..f69ccb502fd 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1584,8 +1584,8 @@ class Commande extends CommonOrder
         $sql.= ', ca.code as availability_code, ca.label as availability_label';
         $sql.= ', dr.code as demand_reason_code';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 719a48c3e3c..2cba05f0bac 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -399,6 +399,8 @@ class Account extends CommonObject
 	 */
 	function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='', $accountancycode='')
 	{
+		global $conf;
+
 		// Deprecatîon warning
 		if (is_numeric($oper)) {
 			dol_syslog(__METHOD__ . ": using numeric operations is deprecated", LOG_WARNING);
@@ -414,7 +416,7 @@ class Account extends CommonObject
 		{
 			$sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
 			$sql.= " WHERE id=".$oper;
-			$sql.= " AND entity IN (".getEntity('c_paiement').")";
+			$sql.= " AND entity = ".$conf->entity;
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 41c0baa61d5..5e24463566c 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -102,7 +102,7 @@ $sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as
 $sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id AND pst.entity IN (" . getEntity('c_paiement').")";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 $sql.= " WHERE v.entity IN (".getEntity('payment_various').")";
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 6e765cdacb0..321fad5baf6 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -139,7 +139,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$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 AND pct.entity IN (".getEntity('c_paiement').")";
+	$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";
@@ -260,7 +260,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$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 AND pct.entity IN (".getEntity('c_paiement').")";
+		$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)
 		{
@@ -474,7 +474,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
         $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.= " 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 s.fk_typepayment = pct.id AND pct.entity IN (".getEntity('c_paiement').")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id";
 		$sql.= " , ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a08b6663c38..028a9ed42c3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -716,7 +716,7 @@ if (empty($reshook))
 
 				$sql = 'SELECT SUM(pf.amount) as total_paiements';
 				$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 AND c.entity IN (' . getEntity('c_paiement') . ')';
+				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 				$sql.= ' WHERE pf.fk_facture = '.$object->id;
 				$sql.= ' AND pf.fk_paiement = p.rowid';
 				$sql.= ' AND p.entity IN (' . getEntity('facture').')';
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f45a0a46ede..c36e6cb09d1 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -304,8 +304,8 @@ class FactureRec extends CommonInvoice
 		$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';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN ('.getEntity('c_payment_term').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql.= ' WHERE f.entity IN ('.getEntity('facture').')';
 		if ($rowid) $sql.= ' AND f.rowid='.$rowid;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7c49ff909d6..e4438d4771a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1256,8 +1256,8 @@ class Facture extends CommonInvoice
         $sql.= ', f.fk_incoterms, f.location_incoterms';
         $sql.= ", i.libelle as libelle_incoterms";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid AND c.entity IN (' . getEntity('c_payment_term').')';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 		$sql.= ' WHERE f.entity IN ('.getEntity('facture').')';
 		if ($rowid)   $sql.= " AND f.rowid=".$rowid;
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index bc13b0d5876..b0ee10aa19b 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -102,7 +102,7 @@ class PaymentTerm // extends CommonObject
 		$sql.= "decalage";
         $sql.= ") VALUES (";
 		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->entity)?getEntity('c_payment_term'):"'".$this->db->escape($this->entity)."'").",";
+		$sql.= " ".(! isset($this->entity)?$conf->entity:"'".$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)."'").",";
 		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").",";
@@ -181,7 +181,6 @@ class PaymentTerm // extends CommonObject
 
         $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
         $sql.= " WHERE t.rowid = ".$id;
-        $sql.= " AND t.entity = " . getEntity('c_payment_term');
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -221,36 +220,36 @@ class PaymentTerm // extends CommonObject
      *
      *    @return     int         <0 if KO, >0 if OK
      */
-    function getDefaultId()
-    {
-    	global $langs;
+	function getDefaultId()
+	{
+		global $conf, $langs;
 
-        $ret=0;
+		$ret=0;
 
-    	$sql = "SELECT";
+		$sql = "SELECT";
 		$sql.= " t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql.= " WHERE t.code = 'RECEP'";
-        $sql.= " AND t.entity = " . getEntity('c_payment_term');
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql.= " WHERE t.code = 'RECEP'";
+		$sql.= " AND t.entity = " . $conf->entity;
 
-    	dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-                if ($obj) $ret=$obj->rowid;
-            }
-            $this->db->free($resql);
-            return $ret;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) $ret=$obj->rowid;
+			}
+			$this->db->free($resql);
+			return $ret;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
 	/**
@@ -293,7 +292,6 @@ class PaymentTerm // extends CommonObject
 		$sql.= " nbjour=".(isset($this->nbjour)?$this->nbjour:"null").",";
 		$sql.= " decalage=".(isset($this->decalage)?$this->decalage:"null")."";
 		$sql.= " WHERE rowid = " . $this->id;
-		$sql.= " AND entity = " . getEntity('c_payment_term');
 
 		$this->db->begin();
 
@@ -350,7 +348,6 @@ class PaymentTerm // extends CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_payment_term";
 		$sql.= " WHERE rowid = " . $this->id;
-		$sql.= " AND t.entity = " . getEntity('c_payment_term');
 
 		$this->db->begin();
 
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4f17a4444f5..29528aacfa3 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -827,7 +827,7 @@ if (! GETPOST('action','aZ09'))
 
     $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.facnumber';
     $sql.=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
-    $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (' . getEntity('c_paiement').')';
+    $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('facture').')';
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 595c9e868dc..6ca9f29c16e 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -138,7 +138,7 @@ else
 	$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 AND c.entity IN (" . getEntity('c_paiement') . ")";
+    $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";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 1bbeb9f2f29..8fde6fcb78c 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -822,7 +822,7 @@ else
 				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
+				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 				$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 				$sql.= " AND p.fk_statut>=5";
 
@@ -906,7 +906,7 @@ 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 AND c.entity IN (".getEntity('c_paiement').")";
+			    $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";
 			}
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 26f12e3f7c5..26647d5f0f0 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -698,7 +698,7 @@ if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES'
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 		$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 		$sql.= " AND p.fk_statut>=5";
 
@@ -761,7 +761,7 @@ if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
         $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 AND c.entity IN (".getEntity('c_paiement').")";
+		$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))
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index f911636a7ef..4cad9117040 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -105,7 +105,7 @@ $sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.da
 $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."payment_salary as s";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id AND pst.entity IN (".getEntity('c_paiement').")";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id";
 $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";
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 23e3494a25d..cdcabc5617b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -586,7 +586,7 @@ if ($id > 0)
 		$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."c_paiement as c ON p.fk_typepaiement = c.id AND c.entity IN (" . getEntity('c_paiement').")";
+		$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;
 		$sql.= " AND p.fk_charge = cs.rowid";
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 2d75584cbda..fa4127c3af6 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -83,7 +83,7 @@ class ChargeSociales extends CommonObject
         $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 AND p.entity IN ('.getEntity('c_paiement').')';
+        $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;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 60a1a647661..4cd0dfd2b59 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -203,7 +203,7 @@ class PaymentSocialContribution extends CommonObject
 		$sql.= " t.fk_user_modif,";
 		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
 		$sql.= ' b.fk_account';
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as t LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepaiement = pt.id AND pt.entity IN (" . getEntity('c_paiement') . ")";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as t LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepaiement = pt.id";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
 		$sql.= " WHERE t.rowid = ".$id;
 		// TODO link on entity of tax;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index a7c388a26e6..879e9b69ee7 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -133,7 +133,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$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 AND pct.entity IN (".getEntity('c_paiement').")";
+	$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)
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 27e314762f8..5041450dd8b 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -100,7 +100,7 @@ $bankstatic = new Account($db);
 $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 AND pst.entity IN (".getEntity('c_paiement').")";
+$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').")";
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index ac5d3869a3d..97762482685 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -595,6 +595,8 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	function calculate_date_lim_reglement($cond_reglement=0)
 	{
+		global $conf;
+
 		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
 		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
 
@@ -602,9 +604,11 @@ abstract class CommonInvoice extends CommonObject
 
 		$sqltemp = 'SELECT c.type_cdr,c.nbjour,c.decalage';
 		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		$sqltemp.= " WHERE c.entity IN (" . getEntity('c_payment_term').")";
-		if (is_numeric($cond_reglement)) $sqltemp.= " AND c.rowid=".$cond_reglement;
-		else $sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+		else {
+			$sqltemp.= " WHERE c.entity = ".$conf->entity;
+			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+		}
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
 		$resqltemp=$this->db->query($sqltemp);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 61d21cec7e8..3c4df109818 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2784,7 +2784,7 @@ class Form
 	 */
 	function load_cache_conditions_paiements()
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$num = count($this->cache_conditions_paiements);
 		if ($num > 0) return 0;    // Cache already loaded
@@ -2793,7 +2793,7 @@ class Form
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
-		$sql.= " WHERE entity = " . getEntity('c_payment_term');
+		$sql.= " WHERE entity = " . $conf->entity;
 		$sql.= " AND active > 0";
 		$sql.= " ORDER BY sortorder";
 
@@ -2997,7 +2997,7 @@ class Form
 	 */
 	function load_cache_types_paiements()
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$num=count($this->cache_types_paiements);
 		if ($num > 0) return $num;    // Cache already loaded
@@ -3008,7 +3008,7 @@ class Form
 
 		$sql = "SELECT id, code, libelle as label, type, active";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
-		$sql.= " WHERE entity IN (".getEntity('c_paiement').")";
+		$sql.= " WHERE entity = ".$conf->entity;
 		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 8050abf811b..21adfe4edb4 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -828,7 +828,7 @@ class pdf_crabe extends ModelePDFFactures
 		$sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
 		$sql.= " cp.code";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id AND cp.entity IN (".getEntity('c_paiement').")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
 		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
 		//$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
 		$sql.= " ORDER BY p.datep";
@@ -1688,7 +1688,7 @@ class pdf_crabe extends ModelePDFFactures
 		{
 			$top_shift = $pdf->getY() - $current_y;
 		}
-		
+
 		if ($showaddress)
 		{
 			// Sender properties
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 9a23c0e5e9d..0a7154a9ce2 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -259,7 +259,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement AND pt.entity IN ('.getEntity('c_paiement').')';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
 		$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';
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 1e648c1386a..1edfd419378 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -165,7 +165,7 @@ class modSalaries extends DolibarrModules
 		$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.'payment_salary as p ON p.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_typepayment = cp.id AND cp.entity IN ('.getEntity('c_paiement').')';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_typepayment = cp.id';
 		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('user').')';
 	}
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 52e865cbdbc..711e2ead71c 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -283,8 +283,8 @@ class modSociete extends DolibarrModules
 		$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_stcomm as st ON s.fk_stcomm = st.id';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sc.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid AND payterm.entity IN ('.getEntity('c_payment_term').')';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id AND paymode.entity IN ('.getEntity('c_paiement').')';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 2bb784aa578..2594a4a0b6a 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -187,7 +187,7 @@ class pdf_paiement
 				if (! empty($conf->banque->enabled))
 					$sql.= ", ba.ref as bankaccount";
 				$sql.= ", p.rowid as prowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (" . getEntity('c_paiement').")";
+				$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.= " ".MAIN_DB_PREFIX."paiement_facture as pf,";
 				if (! empty($conf->banque->enabled))
@@ -218,7 +218,7 @@ class pdf_paiement
 				if (! empty($conf->banque->enabled))
 					$sql.= ", ba.ref as bankaccount";
 				$sql.= ", p.rowid as prowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (".getEntity('c_paiement').")";
+				$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 				$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f,";
 				$sql.= " ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
 				if (! empty($conf->banque->enabled))
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 0a57ab1e449..9cdb9ebc6a0 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -933,7 +933,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
 		$sql.= " cp.code";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf, ".MAIN_DB_PREFIX."paiementfourn as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id AND cp.entity IN (".getEntity('c_paiement').")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
 		$sql.= " WHERE pf.fk_paiementfourn = p.rowid and pf.fk_facturefourn = ".$object->id;
 		$sql.= " ORDER BY p.datep";
 		$resql=$this->db->query($sql);
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index ced8111a93f..38d7d6e6240 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+s * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016  Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>
@@ -643,8 +643,9 @@ if (! empty($id) && $action != 'edit')
 	 * Payments
 	 */
 	$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-	$sql.= " c.code as type_code,c.libelle as paiement_type";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON c.entity IN (".getEntity('c_paiement').")";
+	$sql.= "c.code as type_code,c.libelle as paiement_type";
+	$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
+	$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
 	$sql.= ", ".MAIN_DB_PREFIX."don as d";
 	$sql.= " WHERE d.rowid = '".$id."'";
 	$sql.= " AND p.fk_donation = d.rowid";
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 56a685eef12..86bfe2e6823 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -611,7 +611,7 @@ class Don extends CommonObject
         $sql.= " c.code as country_code, c.label as country";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment AND cp.entity IN (".getEntity('c_paiement').")";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
         $sql.= " WHERE d.entity IN (".getEntity('donation').")";
         if (! empty($id))
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 1023bf68b7a..8d31c292155 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -182,7 +182,7 @@ class PaymentDonation extends CommonObject
 		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
 		$sql.= ' b.fk_account';
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id AND pt.entity IN (".getEntity('c_paiement').")";
+		$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;
 
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index dd5db880bc9..d4bc45e925a 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1880,7 +1880,7 @@ else
 				$sql.= "c.code as p_code, c.libelle as payment_type,";
 				$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
 				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
+				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = 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.= " WHERE e.rowid = '".$id."'";
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 5674192906c..28870cc78de 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -450,7 +450,7 @@ class ExpenseReport extends CommonObject
         $sql.= " d.fk_statut as status, d.fk_c_paiement,";
         $sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";                             // INNER JOIN paiement
         $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id AND dp.entity IN (".getEntity('c_paiement').")";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
         if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
         else $sql.= " WHERE d.rowid = ".$id;
         //$sql.= $restrict;
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 023a9709d08..43fcacc8483 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -166,7 +166,7 @@ class PaymentExpenseReport extends CommonObject
 		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
 		$sql.= ' b.fk_account';
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id AND pt.entity IN (".getEntity('c_paiement').")";
+		$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;
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 1fd6bb84de1..b06b6188183 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -232,8 +232,8 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ', c.fk_incoterms, c.location_incoterms';
         $sql.= ', i.libelle as libelle_incoterms';
         $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (".getEntity('c_payment_term').")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (".getEntity('c_paiement').")";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON c.fk_mode_reglement = p.id";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
         $sql.= " WHERE c.entity = ".$conf->entity;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index ccbd93b46e4..51f0263a664 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -561,8 +561,8 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid AND cr.entity IN (".getEntity('c_payment_term').")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id AND p.entity IN (".getEntity('c_paiement').")";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
         if ($id)  $sql.= " WHERE t.rowid=".$id;
         if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index fc917e112f7..1a22356695a 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -80,7 +80,7 @@ class PaiementFourn extends Paiement
 		$sql.= ' c.code as paiement_code, c.libelle as paiement_type,';
 		$sql.= ' p.num_paiement, 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 AND c.entity IN ('.getEntity('c_paiement').')';
+		$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.= ' WHERE p.entity IN ('.getEntity('facture_fourn').')';
 		if ($id > 0)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1f9227ce9b6..0e2337228f6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2433,7 +2433,7 @@ else
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn 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.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN ('.getEntity('c_paiement').')';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_paiementfourn = p.rowid';
 		$sql.= ' WHERE pf.fk_facturefourn = '.$object->id;
 		$sql.= ' ORDER BY p.datep, p.tms';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 64223d4b4e9..cc636718bb7 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -745,7 +745,7 @@ if (empty($action))
     $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 AND c.entity IN ('.getEntity('c_paiement').')';
+    $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';
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 2b2bb6949d5..2a86a414dca 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
@@ -76,4 +76,7 @@ ALTER TABLE llx_c_paiement DROP INDEX uk_c_paiement;
 ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
 ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KEY;
 
-
+-- Add missing keys and primary key
+ALTER TABLE llx_c_payment_term DROP INDEX uk_c_payment_term;
+ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER AUTO_INCREMENT PRIMARY KEY;
+ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term_code(entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.key.sql b/htdocs/install/mysql/tables/llx_c_paiement.key.sql
index 1e22789d7bf..fc8147805ef 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.key.sql
@@ -17,6 +17,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement(id, entity, code);
-
 ALTER TABLE llx_c_paiement ADD UNIQUE INDEX uk_c_paiement_code(entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.key.sql b/htdocs/install/mysql/tables/llx_c_payment_term.key.sql
index 1bd86401945..fc2f49de529 100644
--- a/htdocs/install/mysql/tables/llx_c_payment_term.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_payment_term.key.sql
@@ -17,4 +17,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term(rowid, entity, code);
+ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term_code(entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql
index cc7c7a22dea..39ccaa70916 100644
--- a/htdocs/install/mysql/tables/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql
@@ -20,7 +20,7 @@
 
 create table llx_c_payment_term
 (
-  rowid				integer,
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer	DEFAULT 1 NOT NULL,	-- multi company id
   code				varchar(16),
   sortorder			smallint,
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b920c8d1a6a..17900d1772a 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -676,7 +676,7 @@ if ($id > 0)
 		$sql.= " p.amount_capital, p.amount_insurance, p.amount_interest,";
 		$sql.= " c.libelle as paiement_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
 		$sql.= ", ".MAIN_DB_PREFIX."loan as l";
 		$sql.= " WHERE p.fk_loan = ".$id;
 		$sql.= " AND p.fk_loan = l.rowid";
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index a72487e706a..ebb1820bca0 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -177,7 +177,7 @@ class LoanSchedule extends CommonObject
 		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
 		$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 AND pt.entity IN (".getEntity('c_paiement').")";
+		$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;
 
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 557262de945..022cf050f11 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -176,7 +176,7 @@ class PaymentLoan extends CommonObject
 		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
 		$sql.= ' b.fk_account';
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id AND pt.entity IN (".getEntity('c_paiement').")";
+		$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;
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 8a713bccb95..ce70fe996d3 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1153,8 +1153,8 @@ class SupplierProposal extends CommonObject
         $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
         $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN ('.getEntity('c_paiement').')';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
         $sql.= " WHERE p.fk_statut = c.id";
         $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
         if ($ref) $sql.= " AND p.ref='".$ref."'";

From fd9c79fa7f245d87495572a6c426dad6d56ae6da Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 7 Mar 2018 17:53:15 +0100
Subject: [PATCH 364/386] Fix: use getEntity if no rowid to compare

---
 htdocs/compta/bank/class/account.class.php        | 4 +---
 htdocs/compta/facture/class/paymentterm.class.php | 6 +++---
 htdocs/core/class/commoninvoice.class.php         | 4 +---
 htdocs/core/class/html.form.class.php             | 8 ++++----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2cba05f0bac..719a48c3e3c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -399,8 +399,6 @@ class Account extends CommonObject
 	 */
 	function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='', $accountancycode='')
 	{
-		global $conf;
-
 		// Deprecatîon warning
 		if (is_numeric($oper)) {
 			dol_syslog(__METHOD__ . ": using numeric operations is deprecated", LOG_WARNING);
@@ -416,7 +414,7 @@ class Account extends CommonObject
 		{
 			$sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
 			$sql.= " WHERE id=".$oper;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity IN (".getEntity('c_paiement').")";
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index b0ee10aa19b..ffe50e86ee4 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -102,7 +102,7 @@ class PaymentTerm // extends CommonObject
 		$sql.= "decalage";
         $sql.= ") VALUES (";
 		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->entity)?$conf->entity:"'".$this->db->escape($this->entity)."'").",";
+		$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)."'").",";
 		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").",";
@@ -222,7 +222,7 @@ class PaymentTerm // extends CommonObject
      */
 	function getDefaultId()
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$ret=0;
 
@@ -230,7 +230,7 @@ class PaymentTerm // extends CommonObject
 		$sql.= " t.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
 		$sql.= " WHERE t.code = 'RECEP'";
-		$sql.= " AND t.entity = " . $conf->entity;
+		$sql.= " AND t.entity IN (".getEntity('c_payment_term').")";
 
 		dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
 		$resql=$this->db->query($sql);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 97762482685..595105c5695 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -595,8 +595,6 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	function calculate_date_lim_reglement($cond_reglement=0)
 	{
-		global $conf;
-
 		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
 		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
 
@@ -606,7 +604,7 @@ abstract class CommonInvoice extends CommonObject
 		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
 		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
 		else {
-			$sqltemp.= " WHERE c.entity = ".$conf->entity;
+			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
 			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
 		}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3c4df109818..785685e9011 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2784,7 +2784,7 @@ class Form
 	 */
 	function load_cache_conditions_paiements()
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$num = count($this->cache_conditions_paiements);
 		if ($num > 0) return 0;    // Cache already loaded
@@ -2793,7 +2793,7 @@ class Form
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
-		$sql.= " WHERE entity = " . $conf->entity;
+		$sql.= " WHERE entity IN (".getEntity('c_payment_term').")";
 		$sql.= " AND active > 0";
 		$sql.= " ORDER BY sortorder";
 
@@ -2997,7 +2997,7 @@ class Form
 	 */
 	function load_cache_types_paiements()
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$num=count($this->cache_types_paiements);
 		if ($num > 0) return $num;    // Cache already loaded
@@ -3008,7 +3008,7 @@ class Form
 
 		$sql = "SELECT id, code, libelle as label, type, active";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
-		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " WHERE entity IN (".getEntity('c_paiement').")";
 		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);

From 7774b49beb6afe22087fd4c41db2addb339e7609 Mon Sep 17 00:00:00 2001
From: ptibogxiv <ptibogxiv@msn.com>
Date: Thu, 8 Mar 2018 10:03:36 +0100
Subject: [PATCH 365/386] Fix paymentmodes.php

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index cbafeb68a09..4bd19295e7a 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -345,8 +345,8 @@ if (class_exists('Stripe'))
 	$cu->default_source = "$source"; // obtained with Stripe.js
 	$cu->save();
  
-	//header('Location: '.$url);
-	//exit;
+	header('Location: '.$url);
+	exit;
 	}
 	elseif ($action == 'delete')
 	{

From 861a831e249bd8d00e10a362546e6533e8e33785 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 8 Mar 2018 11:53:46 +0100
Subject: [PATCH 366/386] Fix: debug

---
 htdocs/api/class/api_setup.class.php              | 6 ++++--
 htdocs/compta/facture/class/paymentterm.class.php | 2 --
 htdocs/compta/paiement/class/cpaiement.class.php  | 7 ++++---
 htdocs/compta/salaries/card.php                   | 2 +-
 htdocs/core/lib/functions.lib.php                 | 5 -----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 65ba8f4ff37..22c763100d4 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -66,7 +66,8 @@ class Setup extends DolibarrApi
 
         $sql = "SELECT id, code, type, libelle as label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql.= " WHERE t.active = ".$active;
+        $sql.= " WHERE t.entity IN (".getEntity('c_paiement').")";
+        $sql.= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
@@ -538,7 +539,8 @@ class Setup extends DolibarrApi
 
         $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.active = ".$active;
+        $sql.= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+        $sql.= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index ffe50e86ee4..9c1f0020d36 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -90,7 +90,6 @@ class PaymentTerm // extends CommonObject
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_payment_term(";
-		$sql.= "rowid,";
 		$sql.= "entity,";
 		$sql.= "code,";
 		$sql.= "sortorder,";
@@ -101,7 +100,6 @@ class PaymentTerm // extends CommonObject
 		$sql.= "nbjour,";
 		$sql.= "decalage";
         $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
 		$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)."'").",";
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index b089cac6aab..59f13023b24 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -107,7 +107,7 @@ class Cpaiement
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 
-		$sql.= 'id,';
+		$sql.= 'entity,';
 		$sql.= 'code,';
 		$sql.= 'libelle,';
 		$sql.= 'type,';
@@ -118,7 +118,7 @@ class Cpaiement
 
 		$sql .= ') VALUES (';
 
-		$sql .= ' '.(! isset($this->id)?'NULL':$this->id).',';
+		$sql .= ' '.(! isset($this->entity)?getEntity('c_paiement'):$this->entity).',';
 		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
 		$sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").',';
 		$sql .= ' '.(! isset($this->type)?'NULL':$this->type).',';
@@ -186,7 +186,8 @@ class Cpaiement
 		$sql .= " t.module";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if (null !== $ref) {
-			$sql .= ' WHERE t.code = ' . '\'' . $ref . '\'';
+			$sql .= ' WHERE t.entity IN ('.getEntity('c_paiement').')';
+			$sql .= ' AND t.code = ' . '\'' . $ref . '\'';
 		} else {
 			$sql .= ' WHERE t.id = ' . $id;
 		}
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 608b5a737b0..4f28e2c76c9 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -73,7 +73,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 	if (empty($datev)) $datev=$datep;
 
-	$type_payment = dol_getIdFromCode($db, GETPOST("paymenttype", 'alpha'), 'c_paiement');
+	$type_payment = dol_getIdFromCode($db, GETPOST("paymenttype", 'alpha'), 'c_paiement', 'code', 'id', 1);
 
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bc06c31b10e..b38024b3ec0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -121,11 +121,6 @@ function getEntity($element, $shared=1, $forceentity=null)
 {
 	global $conf, $mc;
 
-	// For backward compatibilty
-	if ($element == 'actioncomm') $element='agenda';
-	if ($element == 'fichinter')  $element='intervention';
-	if ($element == 'categorie')  $element='category';
-
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $forceentity);

From 73a63c1abc49b78ca57849712a9209c5f5baa8c8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 8 Mar 2018 11:57:38 +0100
Subject: [PATCH 367/386] Fix: syntax error

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

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 38d7d6e6240..78b8d01e51d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
-s * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016  Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>

From 0b316c39807585d604e271ee520ec850f4fc1ae4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 15:01:34 +0100
Subject: [PATCH 368/386] Attach invoice on email subscription confirmation

---
 htdocs/adherents/class/adherent.class.php | 69 +++++++++++++----------
 htdocs/adherents/subscription.php         | 41 ++++++++++++--
 htdocs/core/class/html.formmail.class.php |  9 ++-
 htdocs/langs/en_US/members.lang           |  5 +-
 htdocs/public/payment/paymentok.php       | 27 ++++++++-
 htdocs/public/paypal/paymentok.php        |  2 +-
 6 files changed, 113 insertions(+), 40 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 78fc662f6b4..20041333ee6 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1330,19 +1330,19 @@ class Adherent extends CommonObject
 	/**
 	 *	Do complementary actions after subscription recording.
 	 *
-	 *	@param	int			$subscriptionid		Id of created subscription
-	 *  @param	string		$option				Which action ('bankdirect', 'invoiceonly', ...)
-	 *	@param	int			$accountid			Id bank account
-	 *	@param	int			$datesubscription	Date of subscription
-	 *	@param	int			$paymentdate		Date of payment
-	 *	@param	string		$operation			Code of type of operation (if Id bank account provided). Example 'CB', ...
-	 *	@param	string		$label				Label operation (if Id bank account provided)
-	 *	@param	double		$amount     		Amount of subscription (0 accepted for some members)
-	 *	@param	string		$num_chq			Numero cheque (if Id bank account provided)
-	 *	@param	string		$emetteur_nom		Name of cheque writer
-	 *	@param	string		$emetteur_banque	Name of bank of cheque
+	 *	@param	int			$subscriptionid			Id of created subscription
+	 *  @param	string		$option					Which action ('bankdirect', 'invoiceonly', ...)
+	 *	@param	int			$accountid				Id bank account
+	 *	@param	int			$datesubscription		Date of subscription
+	 *	@param	int			$paymentdate			Date of payment
+	 *	@param	string		$operation				Code of type of operation (if Id bank account provided). Example 'CB', ...
+	 *	@param	string		$label					Label operation (if Id bank account provided)
+	 *	@param	double		$amount     			Amount of subscription (0 accepted for some members)
+	 *	@param	string		$num_chq				Numero cheque (if Id bank account provided)
+	 *	@param	string		$emetteur_nom			Name of cheque writer
+	 *	@param	string		$emetteur_banque		Name of bank of cheque
 	 *  @param	string		$autocreatethirdparty	Auto create new thirdparty if member not linked to a thirdparty.
-	 *	@return int         					<0 if KO, >0 if OK
+	 *	@return int									<0 if KO, >0 if OK
 	 */
 	function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom='', $emetteur_banque='', $autocreatethirdparty=0)
 	{
@@ -1350,6 +1350,8 @@ class Adherent extends CommonObject
 
 		$error = 0;
 
+		$this->invoice = null;	// This will contains invoice if an invoice is created
+
 		// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
 		if ($option == 'bankdirect' && $accountid)
 		{
@@ -1489,6 +1491,10 @@ class Adherent extends CommonObject
 					$this->errors=$invoice->errors;
 					$error++;
 				}
+				else
+				{
+					$this->invoice = $invoice;
+				}
 			}
 
 			if (! $error)
@@ -1524,6 +1530,11 @@ class Adherent extends CommonObject
 				}
 			}
 
+			if (! $error)
+			{
+				// TODO Link invoice with subscription ?
+			}
+
 			// Add payment onto invoice
 			if (! $error && $option == 'bankviainvoice' && $accountid)
 			{
@@ -1584,25 +1595,25 @@ class Adherent extends CommonObject
 					// Set invoice as paid
 					$invoice->set_paid($user);
 				}
+			}
 
-				if (! $error)
-				{
-					// 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 = $customer->default_lang;
-					if (! empty($newlang)) {
-							$outputlangs = new Translate("", $conf);
-							$outputlangs->setDefaultLang($newlang);
-					}
-					// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
-					//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-
-					$invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if (! $error)
+			{
+				// 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 = $customer->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
 				}
+				// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
+				//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+
+				$invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3b200ed526c..9d164307e91 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -322,11 +322,15 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
+			else
+			{
+				// If an invoice was created, it is into $object->invoice
+			}
         }
 
         if (! $error)
         {
-            $db->commit();
+//            $db->commit();
         }
         else
         {
@@ -334,6 +338,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
             $action = 'addsubscription';
         }
 
+        if (! $error)
+        {
+        	setEventMessages("SubscriptionRecorded", null, 'mesgs');
+        }
+
         // Send email
         if (! $error)
         {
@@ -343,12 +352,36 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
                 $texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
 
-                $result=$object->send_an_email($texttosend,$subjecttosend,array(),array(),array(),"","",0,-1);
+                // 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'];
+
+                	$listofpaths=array($file);
+                	$listofnames=array(basename($file));
+                	$listofmimes=array(dol_mimetype($file));
+                }
+
+                $result=$object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofnames, $listofmimes, "", "", 0, -1);
                 if ($result < 0)
                 {
                 	$errmsg=$object->error;
-        			setEventMessages($errmsg, null, 'errors');
+                	setEventMessages($object->error, $object->errors, 'errors');
                 }
+                else
+                {
+                	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+                }
+            }
+            else
+            {
+            	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
             }
         }
 
@@ -998,7 +1031,7 @@ if ($rowid > 0)
             $helpcontent.='<b>'.$langs->trans("MailText").'</b>:<br>';
             $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
 
-            print $form->textwithpicto($tmp,$helpcontent,1,'help');
+            print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
         }
         print '</td></tr>';
         print '</tbody>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8aa7f0ce54e..40274b00b76 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -148,16 +148,19 @@ class FormMail extends Form
 	 * Add a file into the list of attached files (stored in SECTION array)
 	 *
 	 * @param 	string   $path   Full absolute path on filesystem of file, including file name
-	 * @param 	string   $file   Only filename
-	 * @param 	string   $type   Mime type
+	 * @param 	string   $file   Only filename (can be basename($path))
+	 * @param 	string   $type   Mime type (can be dol_mimetype($file))
 	 * @return	void
 	 */
-	function add_attached_files($path,$file,$type)
+	function add_attached_files($path, $file='', $type='')
 	{
 		$listofpaths=array();
 		$listofnames=array();
 		$listofmimes=array();
 
+		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]);
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 2a98f700027..bfa338605f2 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -176,4 +176,7 @@ VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
\ No newline at end of file
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
\ No newline at end of file
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 83b672604cc..285bf2920eb 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -374,6 +374,8 @@ if ($ispaymentok)
 						if ($option == 'bankdirect')     $postactionmessages[] = 'Bank record created';
 						if ($option == 'invoiceonly')    $postactionmessages[] = 'Invoice recorded';
 						$ispostactionok = 1;
+
+						// If an invoice was created, it is into $object->invoice
 					}
 				}
 
@@ -395,13 +397,34 @@ if ($ispaymentok)
 						$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
 						$texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
 
-						$result=$object->send_an_email($texttosend,$subjecttosend,array(),array(),array(),"","",0,-1);
+						// 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'];
+
+							$listofpaths=array($file);
+							$listofnames=array(basename($file));
+							$listofmimes=array(dol_mimetype($file));
+						}
+
+						$result=$object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofnames, $listofmimes, "", "", 0, -1);
 						if ($result < 0)
 						{
 							$errmsg=$object->error;
 							$postactionmessages[] = $errmsg;
 							$ispostactionok = -1;
 						}
+						else
+						{
+							if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
+							else $postactionmessages[] = 'Email sent to member (without any attached document)';
+						}
 					}
 				}
 			}
@@ -601,7 +624,7 @@ if ($ispaymentok)
 		$content="";
 		if (in_array('MEM', array_keys($tmptag)))
 		{
-			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+			$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
 			$content.='<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
 			$content.=$companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
 			$content.=$companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 80ec1d8ec2b..d50dd66d903 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -212,7 +212,7 @@ if ($PAYPALTOKEN)
 				if (! empty($tmptag['MEM']))
 				{
 					$langs->load("members");
-					$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+					$url=$urlwithroot."/adherents/subscriptions/card.php?rowid=".$tmptag['MEM'];
 					$content.=$langs->trans("PaymentSubscription")."<br>\n";
 					$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
 					$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";

From 88e47e11a4a254fda2bb201f07b7f2940e0a931c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 17:44:51 +0100
Subject: [PATCH 369/386] Fix rename file

---
 htdocs/stripe/{charge => charge.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/stripe/{charge => charge.php} (100%)

diff --git a/htdocs/stripe/charge b/htdocs/stripe/charge.php
similarity index 100%
rename from htdocs/stripe/charge
rename to htdocs/stripe/charge.php

From 235db1f40515758acf6d616b6c5b1def855374d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 19:50:41 +0100
Subject: [PATCH 370/386] Enhance OAuth module to store the stripe account in
 llx_oauth_token

---
 htdocs/admin/oauth.php                        |   1 +
 htdocs/admin/oauthlogintokens.php             |  32 +-
 htdocs/core/lib/oauth.lib.php                 |  23 +-
 .../modules/oauth/github_oauthcallback.php    |   6 +-
 .../modules/oauth/google_oauthcallback.php    |   2 +-
 .../oauth/stripetest_oauthcallback.php        | 180 ++++++
 .../install/mysql/migration/7.0.0-8.0.0.sql   |   2 +
 .../install/mysql/tables/llx_oauth_token.sql  |   5 +-
 htdocs/langs/en_US/stripe.lang                |   4 +-
 htdocs/stripe/admin/stripe.php                | 116 ++--
 htdocs/stripe/charge.php                      | 137 +++--
 htdocs/stripe/class/stripe.class.php          | 528 ++++++++++--------
 htdocs/stripe/transaction.php                 | 157 +++---
 13 files changed, 728 insertions(+), 465 deletions(-)
 create mode 100644 htdocs/core/modules/oauth/stripetest_oauthcallback.php

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 3e6f165161c..99ade75fdfe 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -95,6 +95,7 @@ print '<table class="noborder" width="100%">';
 
 $i=0;
 
+// $list is defined into oauth.lib.php
 foreach ($list as $key)
 {
     $supported=0;
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 15e70897fb6..97b774edf80 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -141,13 +141,27 @@ if ($mode == 'setup' && $user->admin)
             $urltodelete=$urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltocheckperms='https://github.com/settings/applications/';
         }
-        if ($key[0] == 'OAUTH_GOOGLE_NAME')
+        elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
         {
             $OAUTH_SERVICENAME='Google';
             $urltorenew=$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltodelete=$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&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='';
+        }
+        else
+		{
+			$urltorenew='';
+			$urltodelete='';
+			$urltocheckperms='';
+		}
+
 
         // Show value of token
         $tokenobj=null;
@@ -204,7 +218,6 @@ if ($mode == 'setup' && $user->admin)
 
         print '<table class="noborder" width="100%">'."\n";
 
-        $var=false;
         print '<tr class="liste_titre">';
         print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
         print '<th></th>';
@@ -222,7 +235,6 @@ if ($mode == 'setup' && $user->admin)
         print '</td>';
         print '</tr>'."\n";
 
-        $var = ! $var;
         print '<tr class="oddeven">';
         print '<td'.($key['required']?' class="required"':'').'>';
         //var_dump($key);
@@ -237,19 +249,21 @@ if ($mode == 'setup' && $user->admin)
         if (is_object($tokenobj))
         {
             //test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
-            print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br><br>';
+            print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
         }
         // Request remote token
-        print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br><br>';
+        if ($urltorenew)
+        {
+        	print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+        }
         // Check remote access
         if ($urltocheckperms)
         {
-            print $langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
+            print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
         }
         print '</td>';
         print '</tr>';
 
-        $var = ! $var;
         print '<tr class="oddeven">';
         print '<td'.($key['required']?' class="required"':'').'>';
         //var_dump($key);
@@ -272,7 +286,6 @@ if ($mode == 'setup' && $user->admin)
         if (is_object($tokenobj))
         {
             // Token refresh
-            $var = ! $var;
             print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
@@ -283,7 +296,6 @@ if ($mode == 'setup' && $user->admin)
             print '</tr>';
 
             // Token expired
-            $var = ! $var;
             print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
@@ -294,7 +306,6 @@ if ($mode == 'setup' && $user->admin)
             print '</tr>';
 
             // Token expired at
-            $var = ! $var;
             print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
@@ -354,7 +365,6 @@ if ($mode == 'userconf' && $user->admin)
     print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
     print '<table class="noborder" width="100%">';
-    $var=true;
     print '<tr class="liste_titre">';
     print '<th>'.$langs->trans("User").'</th>';
     print '<th>'.$langs->trans("PrintModule").'</th>';
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 0149b581fa2..a1582cceca5 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -27,12 +27,15 @@
 $supportedoauth2array=array(
     'OAUTH_GOOGLE_NAME'=>'google',
 );
-
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-    $supportedoauth2array['OAUTH_GITHUB_NAME']='github';
+	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME']='stripetest';
+	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME']='stripelive';
 }
 $supportedoauth2array['OAUTH_GITHUB_NAME']='github';
+
+
+
 // API access parameters OAUTH
 $list = array (
     array(
@@ -217,7 +220,17 @@ $list = array (
         'OAUTH_STRAVA_ID',
         'OAUTH_STRAVA_SECRET',
     ),
-    array(
+	array(
+		'OAUTH_STRIPE_TEST_NAME',
+		'OAUTH_STRIPE_TEST_ID',
+		'STRIPE_TEST_SECRET_KEY',
+	),
+	array(
+		'OAUTH_STRIPE_LIVE_NAME',
+		'OAUTH_STRIPE_LIVE_ID',
+		'STRIPE_LIVE_SECRET_KEY',
+	),
+	array(
         'OAUTH_TUMBLR_NAME',
         'OAUTH_TUMBLR_ID',
         'OAUTH_TUMBLR_SECRET',
@@ -266,12 +279,12 @@ function oauthadmin_prepare_head()
     $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++;
-    
+
     complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');
 
     complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index a2f6eb08953..052964eca66 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -109,7 +109,7 @@ if (! empty($_GET['code']))     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming fr mthe 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>';
@@ -125,14 +125,14 @@ if (! empty($_GET['code']))     // We are coming from oauth provider page
         //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.
-		
+
         setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
 
         $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 8584648ba4c..b63aca5bdf6 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -109,7 +109,7 @@ if ($action == 'delete')
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
 {
-	dol_syslog("We are coming fr mthe 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>';
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
new file mode 100644
index 00000000000..3a663cd7162
--- /dev/null
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -0,0 +1,180 @@
+<?php
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/modules/oauth/stripe_oauthcallback.php
+ *      \ingroup    oauth
+ *      \brief      Page to get oauth callback
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+use OAuth\OAuth2\Service\GitHub;
+
+// 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
+
+
+
+$action = GETPOST('action', 'alpha');
+$backtourl = GETPOST('backtourl', 'alpha');
+
+
+/**
+ * Create a new instance of the URI class with the current URI, stripping the query string
+ */
+$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
+//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
+//$currentUri->setQuery('');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripe_oauthcallback.php');
+
+
+/**
+ * Load the credential for the service
+ */
+
+/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+$serviceFactory = new \OAuth\ServiceFactory();
+$httpClient = new \OAuth\Common\Http\Client\CurlClient();
+// TODO Set options for proxy and timeout
+// $params=array('CURLXXX'=>value, ...)
+//$httpClient->setCurlParameters($params);
+$serviceFactory->setHttpClient($httpClient);
+
+// Dolibarr storage
+$storage = new DoliStorage($db, $conf);
+
+// Setup the credentials for the requests
+$credentials = new Credentials(
+    $conf->global->OAUTH_STRIPE_TEST_ID,
+	$conf->global->STRIPE_TEST_SECRET_KEY,
+    $currentUri->getAbsoluteUri()
+);
+
+$requestedpermissionsarray=array();
+if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+/*if ($action != 'delete' && empty($requestedpermissionsarray))
+{
+    print 'Error, parameter state is not defined';
+    exit;
+}*/
+//var_dump($requestedpermissionsarray);exit;
+
+// Instantiate the Api service using the credentials, http client and storage mechanism for the token
+/** @var $apiService Service */
+//$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
+
+$sql="INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeTest', entity=".$conf->entity;
+$db->query($sql);
+
+// access type needed to have oauth provider refreshing token
+//$apiService->setAccessType('offline');
+
+$langs->load("oauth");
+
+
+/*
+ * Actions
+ */
+
+
+if ($action == 'delete')
+{
+    $storage->clearToken('StripeTest');
+
+    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+
+    header('Location: ' . $backtourl);
+    exit();
+}
+
+if (! empty($_GET['code']))     // We are coming from oauth provider page
+{
+	// We should have
+	//$_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"));
+
+    //$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>';
+
+    // 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.
+
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+
+        $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+        unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+        header('Location: ' . $backtourl);
+        exit();
+    } catch (Exception $e) {
+        print $e->getMessage();
+    }
+}
+else // If entry on page with no parameter, we arrive here
+{
+    $_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_TEST_ID.'&scope=read_write';
+    }
+
+    // we go on oauth provider authorization page
+    header('Location: ' . $url);
+    exit();
+}
+
+
+/*
+ * View
+ */
+
+// No view at all, just actions
+
+$db->close();
+
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 2a86a414dca..dc7b7d083ab 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
@@ -80,3 +80,5 @@ ALTER TABLE llx_c_paiement CHANGE COLUMN id id INTEGER AUTO_INCREMENT PRIMARY KE
 ALTER TABLE llx_c_payment_term DROP INDEX uk_c_payment_term;
 ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER AUTO_INCREMENT PRIMARY KEY;
 ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term_code(entity, code);
+
+ALTER TABLE llx_oauth_token ADD COLUMN tokenstring text;
diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 0ae4fed1ea8..5c7d6d62177 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -18,8 +18,9 @@
 CREATE TABLE llx_oauth_token (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     service varchar(36),
-    token text,
+    token text,						-- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
+    tokenstring text,				-- token in json format '{ "access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write" }
     fk_user integer,
     fk_adherent integer,
     entity integer DEFAULT 1
-)ENGINE=InnoDB;
\ No newline at end of file
+)ENGINE=InnoDB;
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 9bc202685dd..12b23955bc8 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -43,4 +43,6 @@ ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when payment online pay
 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
\ No newline at end of file
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 91d056aa094..80165b00273 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -116,6 +116,7 @@ if ($action=="setlive")
 }
 //TODO: import script for stripe account saving in alone or connect mode for stripe.class.php
 
+
 /*
  *	View
  */
@@ -169,62 +170,51 @@ else
 print '</A>';
 }
 print '</td></tr>';
-if (empty($conf->stripeconnect->enabled)) {
-print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
 
-print '<tr class="oddeven"><td>';
-print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
-print '<tr class="oddeven"><td>';
-print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
-print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
-print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
-print '<tr class="oddeven"><td>';
-print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
-print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
-print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-} else {
-print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
-print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
-}
-
-if (! empty($conf->banque->enabled))  //deplace here for separate stripe setting of general and common online payment settings
+if (empty($conf->stripeconnect->enabled))
 {
 	print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+	print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 	print '</td></tr>';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// target bank account for stripe transfer: automatic banktransfert with stripe webhook from stripe account (receiving funds, payment, debit fee/application fee, payment dispute) to real bank account
-	{
-		print '<tr class="oddeven"><td>';
-		print $langs->trans("BankAccountForBankTransfer").'</td><td>';
-		print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-		print '</td></tr>';
-	}
+	print '<tr class="oddeven"><td>';
+	print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
+	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print '</td></tr>';
 }
+else
+{
+	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
+	print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
+}
+
 
 print '</table>';
 
@@ -243,21 +233,17 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$con
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// autodecrement selected web stock when generate invoice or paid an order->generate linked invoice as in a POS module for a full automatic functionality (useful when there is a lot of payment)
-{
-	// Stock for automatic decrement
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
-	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
-	print '</td></tr>';
+print '<tr class="oddeven"><td>';
+print $langs->trans("BankAccount").'</td><td>';
+print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+print '</td></tr>';
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
-	{
-		print '<tr class="oddeven"><td>';
-		print $langs->trans("BankAccountForBankTransfer").'</td><td>';
-		print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-		print '</td></tr>';
-	}
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
+	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+	print '</td></tr>';
 }
 
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
@@ -297,7 +283,7 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
-print '</td></tr>'; 
+print '</td></tr>';
 
 // Payment token for URL
 print '<tr class="oddeven"><td>';
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index aaa0b0475f8..d13235c4f01 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -46,20 +46,36 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+
+
 /*
-* View
-*/ 
+ * View
+ */
+
 llxHeader('', $langs->trans("StripeChargeList"));
+
 $form = new Form($db);
 $societestatic = new societe($db);
 $acc = new Account($db);
 $stripe=new Stripe($db);
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
 {
+	$service = 'StripeTest';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
 }
-if (!$rowid){
+else
+{
+	$service = 'StripeLive';
+}
 
+$stripeaccount = $stripe->GetStripeAccount($service);
+if (empty($stripeaccount))
+{
+	print $langs->trans('ErrorStripeAccountNotDefined');
+}
+
+if (!$rowid && $stripeaccount)
+{
 	print '<FORM method="GET" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<INPUT type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<INPUT type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -85,68 +101,71 @@ if (!$rowid){
     print "</TR>\n";
 
 	print "</TR>\n";
-  
-$list=\Stripe\Charge::all(array("limit" => $limit),array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
-//print $list;
-foreach ($list->data as $charge) {
-    print '<TR class="oddeven">';
-    $societestatic->fetch($charge->metadata->idcustomer);
-    $societestatic->id=$charge->metadata->idcustomer;
-    $societestatic->lastname=$obj->lastname;
-    $societestatic->firstname=$obj->firstname;
-    $societestatic->admin=$obj->admin;
-    $societestatic->login=$obj->login;
-    $societestatic->email=$obj->email;
-    $societestatic->societe_id=$obj->fk_soc;
-        // Ref
+
+	$list=\Stripe\Charge::all(array("limit" => $limit), array("stripe_account" => $stripeaccount));
+
+	//print $list;
+	foreach ($list->data as $charge)
+	{
+	    print '<TR class="oddeven">';
+	    $societestatic->fetch($charge->metadata->idcustomer);
+	    $societestatic->id=$charge->metadata->idcustomer;
+	    $societestatic->lastname=$obj->lastname;
+	    $societestatic->firstname=$obj->firstname;
+	    $societestatic->admin=$obj->admin;
+	    $societestatic->login=$obj->login;
+	    $societestatic->email=$obj->email;
+	    $societestatic->societe_id=$obj->fk_soc;
+	    // Ref
 		print "<TD><A href='".DOL_URL_ROOT."/stripe/charge.php?rowid=".$charge->id."'>".$charge->id."</A></TD>\n";
 		// Employee
 		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
-    // Origine
+		// Origine
 		print "<TD>";
-if ($charge->metadata->source=="order"){
-$object = new Commande($db);
-$object->fetch($charge->metadata->idsource);
-    print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
-} elseif ($charge->metadata->source=="invoice"){
-$object = new Facture($db);
-$object->fetch($charge->metadata->idsource);
-    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
-}  
-    print "</TD>\n";
-		// Date payment
-    print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n";
-    // Label payment
-    print "<TD>";
-if ($charge->refunded=='1'){
-    print $langs->trans("refunded");
-} elseif ($charge->paid=='1'){
-    print $langs->trans("".$charge->status."");
-} else {
-$label="Message: ".$charge->failure_message."<BR>";
-$label.="Réseau: ".$charge->outcome->network_status."<BR>";
-$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
-   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
-}
-    print "</TD>\n";
-    // Type
-    print '<TD>';
-if ($charge->source->object=='card'){
-    print $langs->trans("card");
-}   
-elseif ($charge->source->type=='card'){
-    print $langs->trans("card");
-} elseif ($charge->source->type=='three_d_secure'){
-    print $langs->trans("card3DS");
-}    
-    print '</TD>';
-    // Amount
-    print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100)."</TD>";       
-    print "</TR>\n";
-   }       
+		if ($charge->metadata->source=="order"){
+			$object = new Commande($db);
+			$object->fetch($charge->metadata->idsource);
+			print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
+		} elseif ($charge->metadata->source=="invoice"){
+			$object = new Facture($db);
+			$object->fetch($charge->metadata->idsource);
+		    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
+		}
+	    print "</TD>\n";
+			// Date payment
+	    print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n";
+	    // Label payment
+	    print "<TD>";
+		if ($charge->refunded=='1'){
+		    print $langs->trans("refunded");
+		} elseif ($charge->paid=='1'){
+		    print $langs->trans("".$charge->status."");
+		} else {
+			$label="Message: ".$charge->failure_message."<BR>";
+			$label.="Réseau: ".$charge->outcome->network_status."<BR>";
+			$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+		   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
+		}
+	    print "</TD>\n";
+	    // Type
+	    print '<TD>';
+		if ($charge->source->object=='card')
+		{
+		    print $langs->trans("card");
+		}
+		elseif ($charge->source->type=='card'){
+		    print $langs->trans("card");
+		} elseif ($charge->source->type=='three_d_secure'){
+		    print $langs->trans("card3DS");
+		}
+	    print '</TD>';
+	    // Amount
+	    print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100)."</TD>";
+	    print "</TR>\n";
+	}
 } else {
 
-}    
+}
 
 llxFooter();
 $db->close();
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a1eefd6ecb7..4ea45b7a4b3 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -21,23 +21,24 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
-/**                                                                                                
- *	\class      Rewards
- *	\brief      Class for Rewards
+
+
+/**
+ *	Stripe class
  */
 class Stripe extends CommonObject
 {
 	public $rowid;
-  public $fk_soc;
-  public $fk_key;
-  public $id;
-  public $mode;  
-  public $entity;
-  public $statut;
-  public $type;
-  public $code;
-  public $message;
-	
+	public $fk_soc;
+	public $fk_key;
+	public $id;
+	public $mode;
+	public $entity;
+	public $statut;
+	public $type;
+	public $code;
+	public $message;
+
 	/**
 	 * 	Constructor
 	 *
@@ -48,273 +49,306 @@ class Stripe extends CommonObject
 		$this->db = $db;
 
 	}
-	
 
-public function GetStripeAccount($id) // TODO: move /transforme optimize function/data
+
+	/**
+	 * GetStripeAccount
+	 *
+	 * @param 	string	$mode		'StripeTest' or 'StripeLive'
+	 * @return 	int					???
+	 */
+	public function GetStripeAccount($mode='StripeTest')
 	{
 		global $conf;
 
-		$sql = "SELECT key_account";
-		$sql.= " FROM ".MAIN_DB_PREFIX."stripe_entity";
-		$sql.= " WHERE entity = ".$id.""; 
+		$sql = "SELECT tokenstring";
+		$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " AND service = '".$mode."'";
 
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-    if ($result)
+    	if ($result)
 		{
 			if ($this->db->num_rows($result))
 			{
 				$obj = $this->db->fetch_object($result);
-    $key=$obj->key_account;
-    }
-    else {$key=0;}
-    }
-    else {$key=0;}
-    
-return $key;
-	} 
-  
-public function GetStripeCustomerAccount($id)
+    			$tokenstring=$obj->tokenstring;
+
+    			$tmparray = dol_json_decode($tokenstring);
+    			$key = $tmparray->stripe_user_id;
+    		}
+    		else {
+    			$tokenstring='';
+    		}
+    	}
+    	else {
+    		dol_print_error($this->db);
+    	}
+
+		return $key;
+	}
+
+	/**
+	 * GetStripeCustomerAccount
+	 *
+	 * @param	int		$id		???
+	 * @return	int				???
+	 */
+	public function GetStripeCustomerAccount($id)
 	{
 		global $conf;
 
 		$sql = "SELECT s.key_account as key_account, s.entity, e.fk_object";
-		$sql.= " FROM ".MAIN_DB_PREFIX."stripe_entity as s";
-    $sql.= " JOIN ".MAIN_DB_PREFIX."entity_extrafields as e ON s.entity=e.fk_object";
-		$sql.= " WHERE e.fk_soc=".$id." "; 
+		$sql .= " FROM " . MAIN_DB_PREFIX . "stripe_entity as s";
+		$sql .= " JOIN " . MAIN_DB_PREFIX . "entity_extrafields as e ON s.entity=e.fk_object";
+		$sql .= " WHERE e.fk_soc=" . $id . " ";
 
 		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);
-    $key=$obj->key_account;
-    }
-    else {$key=NULL;}
-    }
-    else {$key=NULL;}
-    
-return $key;
-	}  
-   
-public function CustomerStripe($id,$key)
+				$key = $obj->key_account;
+			} else {
+				$key = NULL;
+			}
+		} else {
+			$key = NULL;
+		}
+
+		return $key;
+	}
+
+
+	/**
+	 * CustomerStripe
+	 *
+	 * @param int	 $id		???
+	 * @param string $key		???
+	 * @return \Stripe\StripeObject|\Stripe\ApiResource
+	 */
+	public function CustomerStripe($id,$key)
 	{
-global $conf;
-if (empty($conf->global->STRIPECONNECT_LIVE))
-{
-$mode=0;
-}
-else 
-{
-if (empty($conf->global->STRIPE_LIVE))
-{
-$mode=0;
-}
-else
-{	
-$mode=$conf->global->STRIPE_LIVE;
-}
-}  
+		global $conf;
+		if (empty($conf->global->STRIPECONNECT_LIVE)) {
+			$mode = 0;
+		} else {
+			if (empty($conf->global->STRIPE_LIVE)) {
+				$mode = 0;
+			} else {
+				$mode = $conf->global->STRIPE_LIVE;
+			}
+		}
 		$sql = "SELECT rowid,fk_soc,fk_key,mode,entity";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_stripe";
-		$sql.= " WHERE fk_soc = ".$id." "; 
-		$sql.= " AND  mode=".$mode." AND entity IN (" . getEntity('stripe') . ")";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_stripe";
+		$sql .= " WHERE fk_soc = " . $id . " ";
+		$sql .= " AND  mode=" . $mode . " AND entity IN (" . getEntity('stripe') . ")";
 
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-    $soc = new Societe($this->db);
-    $soc->fetch($id);
-    $num=$this->db->num_rows($resql);
+			$soc = new Societe($this->db);
+			$soc->fetch($id);
+			$num = $this->db->num_rows($resql);
 			if ($num) {
-			$obj = $this->db->fetch_object($resql);
-      $tiers = $obj->fk_key; 
-      if ($conf->entity==1){
-      $customer = \Stripe\Customer::retrieve("$tiers");
-      }else{
-      $customer = \Stripe\Customer::retrieve("$tiers",array("stripe_account" => $key));
-      }}
-      else {
-      if ($conf->entity==1){
-      $customer = \Stripe\Customer::create(array(
-      "email" => $soc->email,
-      "description" => $soc->name
-      ));
-      }else{
-      $customer = \Stripe\Customer::create(array(
-      "email" => $soc->email,
-      "description" => $soc->name
-      ), array("stripe_account" => $key));
-      }
-      $customer_id = "".$customer->id."";
-      $sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_stripe (fk_soc,fk_key,mode,entity)";
-      $sql .= " VALUES ($id,'$customer_id',".$mode.",".$conf->entity.")"; 
-      dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
-      $resql = $this->db->query($sql);
-      }}
-return $customer;
+				$obj = $this->db->fetch_object($resql);
+				$tiers = $obj->fk_key;
+				if ($conf->entity == 1) {
+					$customer = \Stripe\Customer::retrieve("$tiers");
+				} else {
+					$customer = \Stripe\Customer::retrieve("$tiers", array(
+					"stripe_account" => $key
+					));
+				}
+			} else {
+				if ($conf->entity == 1) {
+					$customer = \Stripe\Customer::create(array(
+					"email" => $soc->email,
+					"description" => $soc->name
+					));
+				} else {
+					$customer = \Stripe\Customer::create(array(
+					"email" => $soc->email,
+					"description" => $soc->name
+					), array(
+					"stripe_account" => $key
+					));
+				}
+				$customer_id = "" . $customer->id . "";
+				$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_stripe (fk_soc,fk_key,mode,entity)";
+				$sql .= " VALUES ($id,'$customer_id'," . $mode . "," . $conf->entity . ")";
+				dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+				$resql = $this->db->query($sql);
+			}
+		}
+		return $customer;
 	}
-  
-public function CreatePaymentStripe($amount,$currency,$origin,$item,$source,$customer,$account)
-{
-global $conf;
-if (empty($conf->global->STRIPECONNECT_LIVE))
-{
-$mode=0;
-}
-else 
-{
-if (empty($conf->global->STRIPE_LIVE))
-{
-$mode=0;
-}
-else
-{	
-$mode=$conf->global->STRIPE_LIVE;
-}
-} 
+
+	/**
+	 * CreatePaymentStripe
+	 *
+	 * @param unknown $amount			???
+	 * @param unknown $currency			???
+	 * @param unknown $origin			???
+	 * @param unknown $item				???
+	 * @param unknown $source			???
+	 * @param unknown $customer			???
+	 * @param unknown $account			???
+	 * @return Stripe
+	 */
+	public function CreatePaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account)
+	{
+		global $conf;
+		if (empty($conf->global->STRIPECONNECT_LIVE)) {
+			$mode = 0;
+		} else {
+			if (empty($conf->global->STRIPE_LIVE)) {
+				$mode = 0;
+			} else {
+				$mode = $conf->global->STRIPE_LIVE;
+			}
+		}
 		$sql = "SELECT fk_soc,fk_key,mode,entity";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_stripe";
-		$sql.= " WHERE fk_key = '$customer' "; 
-		$sql.= " AND mode=".$mode." "; 
+		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_stripe";
+		$sql .= " WHERE fk_key = '$customer' ";
+		$sql .= " AND mode=" . $mode . " ";
 
 		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);
-    $entite=$obj->entity;
-    $fksoc=$obj->fk_soc;
-    }
-    }
-$stripeamount=round($amount*100);   
-$societe = new Societe($this->db);
-$societe->fetch($fksoc);
+				$entite = $obj->entity;
+				$fksoc = $obj->fk_soc;
+			}
+		}
+		$stripeamount = round($amount * 100);
+		$societe = new Societe($this->db);
+		$societe->fetch($fksoc);
 
-if ($origin==order){
-$order=new Commande($this->db);
-$order->fetch($item);
-$ref=$order->ref;
-$description="ORD=".$ref.".CUS=".$societe->code_client;
-}
-elseif ($origin==invoice) {
-$invoice=new Facture($this->db);
-$invoice->fetch($item);
-$ref=$invoice->ref;
-$description="INV=".$ref.".CUS=".$societe->code_client;
-} 
+		if ($origin == order) {
+			$order = new Commande($this->db);
+			$order->fetch($item);
+			$ref = $order->ref;
+			$description = "ORD=" . $ref . ".CUS=" . $societe->code_client;
+		} elseif ($origin == invoice) {
+			$invoice = new Facture($this->db);
+			$invoice->fetch($item);
+			$ref = $invoice->ref;
+			$description = "INV=" . $ref . ".CUS=" . $societe->code_client;
+		}
 
-$metadata = array(
-    "source" => "".$origin."",
-    "idsource" => "".$item."",
-    "idcustomer" => "".$societe->id.""
-  );
-$return = new Stripe($this->db);   
-try {
-if ($stripeamount>=100) {
-if ($entite=='1' or empty($conf->stripeconnect->enabled)){
-if (preg_match('/acct_/i',$source)){
-   $charge = \Stripe\Charge::create(array(
-  "amount" => "$stripeamount",
-  "currency" => "$currency",
-//  "statement_descriptor" => " ",
-  "metadata" => $metadata,
-  "source" => "$source"
-)
-);
-} else {
-$charge = \Stripe\Charge::create(array(
-  "amount" => "$stripeamount",
-  "currency" => "$currency",
-//  "statement_descriptor" => " ",
-  "description" => "$description",
-  "metadata" => $metadata,
-  "receipt_email" => $societe->email,
-  "source" => "$source",
-  "customer" => "$customer") 
- ,array("idempotency_key" => "$ref")
-); 
-}}else{
-$fee=round(($amount*($conf->global->STRIPE_APPLICATION_FEE_PERCENT/100)+$conf->global->STRIPE_APPLICATION_FEE)*100);
-if ($fee<($conf->global->STRIPE_APPLICATION_FEE_MINIMAL*100)){
-$fee=round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL*100);
-}
-$charge = \Stripe\Charge::create(array(
-  "amount" => "$stripeamount",
-  "currency" => "$currency",
-//  "statement_descriptor" => " ",
-  "description" => "$description",
-  "metadata" => $metadata,
-  "source" => "$source",
-  "customer" => "$customer",
-  "application_fee" => "$fee"
-), array("idempotency_key" => "$ref","stripe_account" => "$account"));
-}
-if (isset($charge->id)){
+		$metadata = array(
+		"source" => "" . $origin . "",
+		"idsource" => "" . $item . "",
+		"idcustomer" => "" . $societe->id . ""
+		);
+		$return = new Stripe($this->db);
+		try {
+			if ($stripeamount >= 100) {
+				if ($entite == '1' or empty($conf->stripeconnect->enabled)) {
+					if (preg_match('/acct_/i', $source)) {
+						$charge = \Stripe\Charge::create(array(
+						"amount" => "$stripeamount",
+						"currency" => "$currency",
+						// "statement_descriptor" => " ",
+						"metadata" => $metadata,
+						"source" => "$source"
+						));
+					} else {
+						$charge = \Stripe\Charge::create(array(
+						"amount" => "$stripeamount",
+						"currency" => "$currency",
+						// "statement_descriptor" => " ",
+						"description" => "$description",
+						"metadata" => $metadata,
+						"receipt_email" => $societe->email,
+						"source" => "$source",
+						"customer" => "$customer"
+						), array(
+						"idempotency_key" => "$ref"
+						));
+					}
+				} else {
+					$fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
+					if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
+						$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
+					}
+					$charge = \Stripe\Charge::create(array(
+					"amount" => "$stripeamount",
+					"currency" => "$currency",
+					// "statement_descriptor" => " ",
+					"description" => "$description",
+					"metadata" => $metadata,
+					"source" => "$source",
+					"customer" => "$customer",
+					"application_fee" => "$fee"
+					), array(
+					"idempotency_key" => "$ref",
+					"stripe_account" => "$account"
+					));
+				}
+				if (isset($charge->id)) {}
+			}
+
+			$return->statut = 'success';
+			$return->id = $charge->id;
+			if ($charge->source->type == 'card') {
+				$return->message = $charge->source->card->brand . " ****" . $charge->source->card->last4;
+			} elseif ($charge->source->type == 'three_d_secure') {
+				$stripe = new Stripe($this->db);
+				$src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
+				"stripe_account" => $stripe->GetStripeAccount($conf->entity)
+				));
+				$return->message = $src->card->brand . " ****" . $src->card->last4;
+			} else {
+				$return->message = $charge->id;
+			}
+		} catch (\Stripe\Error\Card $e) {
+			// Since it's a decline, \Stripe\Error\Card will be caught
+			$body = $e->getJsonBody();
+			$err = $body['error'];
+
+			$return->statut = 'error';
+			$return->id = $err['charge'];
+			$return->type = $err['type'];
+			$return->code = $err['code'];
+			$return->message = $err['message'];
+			$body = "Une erreur de paiement est survenue. Voici le code d'erreur: <br />" . $return->id . " " . $return->message . " ";
+			$subject = '[NOTIFICATION] Erreur de paiement';
+			$headers = 'From: "ptibogxiv.net" <' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '>';
+			mail('' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '', $subject, $body, $headers);
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (\Stripe\Error\RateLimit $e) {
+			// Too many requests made to the API too quickly
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (\Stripe\Error\InvalidRequest $e) {
+			// Invalid parameters were supplied to Stripe's API
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (\Stripe\Error\Authentication $e) {
+			// Authentication with Stripe's API failed
+			// (maybe you changed API keys recently)
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (\Stripe\Error\ApiConnection $e) {
+			// Network communication with Stripe failed
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (\Stripe\Error\Base $e) {
+			// Display a very generic error to the user, and maybe send
+			// yourself an email
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		} catch (Exception $e) {
+			// Something else happened, completely unrelated to Stripe
+			$error ++;
+			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+		}
+		return $return;
+	}
 
 }
-}
-
-$return->statut = 'success';
-$return->id = $charge->id;
-if ($charge->source->type=='card'){
-$return->message = $charge->source->card->brand." ****".$charge->source->card->last4;
-}elseif ($charge->source->type=='three_d_secure'){
-$stripe=new Stripe($this->db);
-$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."",array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
-$return->message = $src->card->brand." ****".$src->card->last4;
-}else {
-$return->message = $charge->id;
-}
-
-} catch(\Stripe\Error\Card $e) {
-        // Since it's a decline, \Stripe\Error\Card will be caught
-        $body = $e->getJsonBody();
-        $err  = $body['error'];
-        
-$return->statut = 'error';        
-$return->id = $err['charge'];
-$return->type = $err['type'];
-$return->code = $err['code'];
-$return->message = $err['message'];
-$body = "Une erreur de paiement est survenue. Voici le code d'erreur: <br />".$return->id." ".$return->message." "; 
-$subject = '[NOTIFICATION] Erreur de paiement';
-$headers = 'From: "ptibogxiv.net" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers); 
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (\Stripe\Error\RateLimit $e) {
-        // Too many requests made to the API too quickly
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (\Stripe\Error\InvalidRequest $e) {
-        // Invalid parameters were supplied to Stripe's API
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (\Stripe\Error\Authentication $e) {
-        // Authentication with Stripe's API failed
-        // (maybe you changed API keys recently)
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (\Stripe\Error\ApiConnection $e) {
-        // Network communication with Stripe failed
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (\Stripe\Error\Base $e) {
-        // Display a very generic error to the user, and maybe send
-        // yourself an email
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    } catch (Exception $e) {
-        // Something else happened, completely unrelated to Stripe
-        $error++;
-        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-    }      
-        return $return;
-} 
-   
-}
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 2a37b5a55a5..143c34f7530 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -46,94 +46,109 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-/*
-* View
-*/ 
+	/*
+ * View
+ */
 llxHeader('', $langs->trans("StripeTransactionList"));
 $form = new Form($db);
 $societestatic = new societe($db);
 $acc = new Account($db);
-$stripe=new Stripe($db);
-if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
+$stripe = new Stripe($db);
+
+if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox', 'alpha')))
 {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+	$service = 'StripeTest';
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+}
+else
+{
+	$servie = 'StripeLive';
 }
-if (!$rowid){
 
-	print '<FORM method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<INPUT type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<INPUT type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$stripeaccount = $stripe->GetStripeAccount($service);
+if (empty($stripeaccount))
+{
+	print $langs->trans('ErrorStripeAccountNotDefined');
+}
+
+if (! $rowid && $stripeaccount) {
+
+	print '<FORM method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	if ($optioncss != '')
+		print '<INPUT type="hidden" name="optioncss" value="' . $optioncss . '">';
+	print '<INPUT type="hidden" name="token" value="' . $_SESSION['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="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_barre_liste($langs->trans("StripeTransactionList"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+	print_barre_liste($langs->trans("StripeTransactionList"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 
-    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("Ref",$_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"],"","","",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="left"');
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"","","",'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre("Paid",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre("Fee",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);    
-    print "</TR>\n";
+	print '<TR class="liste_titre">';
+	print_liste_field_titre("Ref", $_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"], "", "", "", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="left"');
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
+	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
+	print "</TR>\n";
 
-	print "</TR>\n";      
-    
-$txn=\Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripe->GetStripeAccount($conf->entity)));
-foreach ($txn->data as $txn) {
-    print '<TR class="oddeven">';
-    $societestatic->fetch($charge->metadata->idcustomer);
-    $societestatic->id=$charge->metadata->idcustomer;
-    $societestatic->lastname=$obj->lastname;
-    $societestatic->firstname=$obj->firstname;
-    $societestatic->admin=$obj->admin;
-    $societestatic->login=$obj->login;
-    $societestatic->email=$obj->email;
-    $societestatic->societe_id=$obj->fk_soc;
+	print "</TR>\n";
 
-    // Ref
-		print "<TD><A href='".DOL_URL_ROOT."/stripe/transaction.php?rowid=".$txn->source."'>".$txn->source."</A></TD>\n";
+	$stripeaccount = $stripe->GetStripeAccount($conf->entity);
+
+	$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeaccount));
+
+	foreach ($txn->data as $txn) {
+		print '<TR class="oddeven">';
+		$societestatic->fetch($charge->metadata->idcustomer);
+		$societestatic->id = $charge->metadata->idcustomer;
+		$societestatic->lastname = $obj->lastname;
+		$societestatic->firstname = $obj->firstname;
+		$societestatic->admin = $obj->admin;
+		$societestatic->login = $obj->login;
+		$societestatic->email = $obj->email;
+		$societestatic->societe_id = $obj->fk_soc;
+
+		// Ref
+		print "<TD><A href='" . DOL_URL_ROOT . "/stripe/transaction.php?rowid=" . $txn->source . "'>" . $txn->source . "</A></TD>\n";
 		// Employee
-		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
-    // Origine
+		print "<TD>" . $societestatic->getNomUrl(1) . "</TD>\n";
+		// Origine
 		print "<TD>";
-if ($charge->metadata->source=="order"){
-$object = new Commande($db);
-$object->fetch($charge->metadata->idsource);
-    print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$txn->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
-} elseif ($txn->metadata->source=="invoice"){
-$object = new Facture($db);
-$object->fetch($txn->metadata->idsource);
-    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$txn->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
-}  
-    print "</TD>\n";
+		if ($charge->metadata->source == "order") {
+			$object = new Commande($db);
+			$object->fetch($charge->metadata->idsource);
+			print "<A href='" . DOL_URL_ROOT . "/commande/card.php?id=" . $txn->metadata->idsource . "'>" . img_picto('', 'object_order') . " " . $object->ref . "</A>";
+		} elseif ($txn->metadata->source == "invoice") {
+			$object = new Facture($db);
+			$object->fetch($txn->metadata->idsource);
+			print "<A href='" . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $txn->metadata->idsource . "'>" . img_picto('', 'object_invoice') . " " . $object->ref . "</A>";
+		}
+		print "</TD>\n";
 		// Date payment
-    print '<TD align="center">'.dol_print_date($txn->created,'%d/%m/%Y %H:%M')."</TD>\n";
-    // Label payment
-    print "<TD>";
+		print '<TD align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</TD>\n";
+		// Label payment
+		print "<TD>";
 
-    print "</TD>\n";
-    // Type
-    print '<TD>'.$txn->type.'</TD>';
-    // Amount
-    print "<TD align=\"right\">".price(($txn->amount)/100)."</TD>";
-    print "<TD align=\"right\">".price(($txn->fee)/100)."</TD>";        
-    print "</TR>\n";
-   }    
-    print "</TABLE>";
-    print '</DIV>';
-	  print '</FORM>';    
-}else{
-
-}
+		print "</TD>\n";
+		// Type
+		print '<TD>' . $txn->type . '</TD>';
+		// Amount
+		print "<TD align=\"right\">" . price(($txn->amount) / 100) . "</TD>";
+		print "<TD align=\"right\">" . price(($txn->fee) / 100) . "</TD>";
+		print "</TR>\n";
+	}
+	print "</TABLE>";
+	print '</DIV>';
+	print '</FORM>';
+} else {}
 
 llxFooter();
 $db->close();

From b07fdafa656238056b914a918c95eda18bc0c70e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 19:57:22 +0100
Subject: [PATCH 371/386] Trans

---
 htdocs/langs/en_US/stripe.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 12b23955bc8..4782294ef78 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -45,4 +45,5 @@ 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_...)
\ No newline at end of file
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
\ No newline at end of file

From e0af4f8489720ae7e5524b4b58fe34308beb826c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 19:58:11 +0100
Subject: [PATCH 372/386] Trans

---
 htdocs/langs/en_US/stripe.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 4782294ef78..5c7b782f593 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -39,7 +39,7 @@ 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 payment online payment is done (TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when payment 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)

From bf1bada4351481f457c4a68a8b990c46d11de35b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 20:35:50 +0100
Subject: [PATCH 373/386] Contact tab after main tab

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

diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 44e7774cae6..ac956abf524 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -34,7 +34,7 @@
 function facturefourn_prepare_head($object)
 {
 	global $db, $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -102,7 +102,7 @@ function facturefourn_prepare_head($object)
 function ordersupplier_prepare_head($object)
 {
 	global $db, $langs, $conf, $user;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -111,15 +111,6 @@ function ordersupplier_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-	{
-		$langs->load("stocks");
-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("OrderDispatch");
-		$head[$h][2] = 'dispatch';
-		$h++;
-	}
-
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
@@ -130,7 +121,16 @@ function ordersupplier_prepare_head($object)
 		$h++;
 	}
 
-    // Show more tabs from modules
+	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+	{
+		$langs->load("stocks");
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("OrderDispatch");
+		$head[$h][2] = 'dispatch';
+		$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
@@ -193,7 +193,7 @@ function supplierorder_admin_prepare_head()
 	$head[$h][1] = $langs->trans("SuppliersInvoice");
 	$head[$h][2] = 'invoice';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
 	$head[$h][1] = $langs->trans("SuppliersPayment");
 	$head[$h][2] = 'supplierpayment';

From e983e0709f41acefda6e20790e9f67680a2d067d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 20:49:37 +0100
Subject: [PATCH 374/386] Fix not visible template selector for supplier
 order/invoice emails

---
 htdocs/fourn/commande/card.php |  2 +-
 htdocs/fourn/facture/card.php  | 40 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index faf0cba82a8..13027312f44 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2740,7 +2740,7 @@ elseif (! empty($object->id))
 		}
 
 		// Presend form
-		$modelmail='supplier_order_send';
+		$modelmail='order_supplier_send';
 		$defaulttopic='SendOrderRef';
 		$diroutput = $conf->fournisseur->commande->dir_output;
 		$trackid = 'sor'.$object->id;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c90336f8a4b..0ae8b0669c8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -266,7 +266,7 @@ if (empty($reshook))
 			$action='';
 		}
 	}
-	
+
 	// Delete link of credit note to invoice
 	else if ($action == 'unlinkdiscount' && $user->rights->fournisseur->facture->creer)
 	{
@@ -388,7 +388,7 @@ if (empty($reshook))
 	elseif ($action == "setabsolutediscount" && $user->rights->fournisseur->facture->creer)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
-	
+
 		// We use the credit to reduce amount of invoice
 		if (! empty($_POST["remise_id"])) {
 			$ret = $object->fetch($id);
@@ -407,7 +407,7 @@ if (empty($reshook))
 			require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($_POST["remise_id_for_payment"]);
-			
+
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
 			if ($discount->amount_ttc > $object->getRemainToPay(0))
@@ -425,7 +425,7 @@ if (empty($reshook))
 				}
 			}
 		}
-		
+
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
 			$outputlangs = $langs;
@@ -437,7 +437,7 @@ if (empty($reshook))
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
-			
+
 			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -448,7 +448,7 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 		//$object->fetch_lines();	// Already done into fetch
-		
+
 		// Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
 		$discountcheck=new DiscountAbsolute($db);
 		$result=$discountcheck->fetch(0,0,$object->id);
@@ -459,9 +459,9 @@ if (empty($reshook))
 		if ($canconvert)
 		{
 			$db->begin();
-			
+
 			$amount_ht = $amount_tva = $amount_ttc = array();
-			
+
 			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line)
@@ -474,7 +474,7 @@ if (empty($reshook))
 					$i ++;
 				}
 			}
-			
+
 			// Insert one discount by VAT rate category
 			$discount = new DiscountAbsolute($db);
 			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
@@ -489,13 +489,13 @@ if (empty($reshook))
 			$discount->discount_type = 1; // Supplier discount
 			$discount->fk_soc = $object->socid;
 			$discount->fk_invoice_supplier_source = $object->id;
-			
+
 			$error = 0;
-				
+
 			if ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION)
 			{
 				// If we're on a standard invoice, we have to get excess paid to create a discount in TTC without VAT
-				
+
 				$sql = 'SELECT SUM(pf.amount) as total_paiements';
 				$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'paiementfourn as p';
 				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (' . getEntity('c_paiement') . ')';
@@ -509,7 +509,7 @@ if (empty($reshook))
 
 				$res = $db->fetch_object($resql);
 				$total_paiements = $res->total_paiements;
-				
+
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
@@ -519,7 +519,7 @@ if (empty($reshook))
 				{
 					$error++;
 				}
-				
+
 			}
 			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT)
 			{
@@ -529,7 +529,7 @@ if (empty($reshook))
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
 					$discount->tva_tx = abs($tva_tx);
-					
+
 					$result = $discount->create($user);
 					if ($result < 0)
 					{
@@ -537,9 +537,9 @@ if (empty($reshook))
 						break;
 					}
 				}
-				
+
 			}
-			
+
 			if (empty($error))
 			{
 				if($object->type != FactureFournisseur::TYPE_DEPOSIT) {
@@ -565,7 +565,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 
 	// Delete payment
 	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
@@ -2141,7 +2141,7 @@ else
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
 		}
-		
+
 		$absolute_discount = $societe->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);
 		$absolute_creditnote = $societe->getAvailableDiscounts('', $filtercreditnote, 0, 1);
 		$absolute_discount = price2num($absolute_discount, 'MT');
@@ -3166,7 +3166,7 @@ else
 		}
 
 		// Presend form
-		$modelmail='order_supplier_send';
+		$modelmail='invoice_supplier_send';
 		$defaulttopic='SendBillRef';
 		$diroutput = $conf->fournisseur->facture->dir_output;
 		$trackid = 'sin'.$object->id;

From 2cd0122d3448f3da93332d65b86df9a8de44c105 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 20:59:23 +0100
Subject: [PATCH 375/386] Fix phpcs

---
 htdocs/stripe/charge.php             |  2 +-
 htdocs/stripe/class/stripe.class.php | 18 +++++++++---------
 htdocs/stripe/transaction.php        |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index d13235c4f01..9ba246cf9a8 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -68,7 +68,7 @@ else
 	$service = 'StripeLive';
 }
 
-$stripeaccount = $stripe->GetStripeAccount($service);
+$stripeaccount = $stripe->getStripeAccount($service);
 if (empty($stripeaccount))
 {
 	print $langs->trans('ErrorStripeAccountNotDefined');
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 4ea45b7a4b3..a9df01d6acb 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -52,12 +52,12 @@ class Stripe extends CommonObject
 
 
 	/**
-	 * GetStripeAccount
+	 * Return stripe account
 	 *
 	 * @param 	string	$mode		'StripeTest' or 'StripeLive'
 	 * @return 	int					???
 	 */
-	public function GetStripeAccount($mode='StripeTest')
+	public function getStripeAccount($mode='StripeTest')
 	{
 		global $conf;
 
@@ -90,12 +90,12 @@ class Stripe extends CommonObject
 	}
 
 	/**
-	 * GetStripeCustomerAccount
+	 * getStripeCustomerAccount
 	 *
 	 * @param	int		$id		???
 	 * @return	int				???
 	 */
-	public function GetStripeCustomerAccount($id)
+	public function getStripeCustomerAccount($id)
 	{
 		global $conf;
 
@@ -122,13 +122,13 @@ class Stripe extends CommonObject
 
 
 	/**
-	 * CustomerStripe
+	 * customerStripe
 	 *
 	 * @param int	 $id		???
 	 * @param string $key		???
 	 * @return \Stripe\StripeObject|\Stripe\ApiResource
 	 */
-	public function CustomerStripe($id,$key)
+	public function customerStripe($id,$key)
 	{
 		global $conf;
 		if (empty($conf->global->STRIPECONNECT_LIVE)) {
@@ -186,7 +186,7 @@ class Stripe extends CommonObject
 	}
 
 	/**
-	 * CreatePaymentStripe
+	 * createPaymentStripe
 	 *
 	 * @param unknown $amount			???
 	 * @param unknown $currency			???
@@ -197,7 +197,7 @@ class Stripe extends CommonObject
 	 * @param unknown $account			???
 	 * @return Stripe
 	 */
-	public function CreatePaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account)
+	public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account)
 	{
 		global $conf;
 		if (empty($conf->global->STRIPECONNECT_LIVE)) {
@@ -299,7 +299,7 @@ class Stripe extends CommonObject
 			} elseif ($charge->source->type == 'three_d_secure') {
 				$stripe = new Stripe($this->db);
 				$src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
-				"stripe_account" => $stripe->GetStripeAccount($conf->entity)
+				"stripe_account" => $stripe->getStripeAccount($conf->entity)
 				));
 				$return->message = $src->card->brand . " ****" . $src->card->last4;
 			} else {
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 143c34f7530..56d94c36dee 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -62,10 +62,10 @@ if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || emp
 }
 else
 {
-	$servie = 'StripeLive';
+	$service = 'StripeLive';
 }
 
-$stripeaccount = $stripe->GetStripeAccount($service);
+$stripeaccount = $stripe->getStripeAccount($service);
 if (empty($stripeaccount))
 {
 	print $langs->trans('ErrorStripeAccountNotDefined');
@@ -101,7 +101,7 @@ if (! $rowid && $stripeaccount) {
 
 	print "</TR>\n";
 
-	$stripeaccount = $stripe->GetStripeAccount($conf->entity);
+	$stripeaccount = $stripe->getStripeAccount($service);
 
 	$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeaccount));
 

From 7a277a8d2b649d9ae98d18c58b28e35a410c6723 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 21:32:52 +0100
Subject: [PATCH 376/386] Debug list of charges. Compatible with the metadata
 FULLTAG used by dolibarr native online payment page.

---
 htdocs/langs/en_US/stripe.lang |  5 ++-
 htdocs/stripe/charge.php       | 82 +++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 5c7b782f593..782c49ce61e 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -46,4 +46,7 @@ ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error C
 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
\ No newline at end of file
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeCustomer=Stripe customer id
\ No newline at end of file
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 9ba246cf9a8..2c937e318a4 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -18,6 +18,8 @@
 // Put here all includes required by your class file
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 //require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -55,7 +57,8 @@ $pagenext = $page + 1;
 llxHeader('', $langs->trans("StripeChargeList"));
 
 $form = new Form($db);
-$societestatic = new societe($db);
+$societestatic = new Societe($db);
+$memberstatic = new Adherent($db);
 $acc = new Account($db);
 $stripe=new Stripe($db);
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')))
@@ -92,12 +95,13 @@ if (!$rowid && $stripeaccount)
 
     print '<TR class="liste_titre">';
     print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    print_liste_field_titre("StripeCustomer",$_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"],"","","",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="left"');
     print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"","","",'align="left"',$sortfield,$sortorder);
     print_liste_field_titre("Paid",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="left"');
     print "</TR>\n";
 
 	print "</TR>\n";
@@ -107,21 +111,48 @@ if (!$rowid && $stripeaccount)
 	//print $list;
 	foreach ($list->data as $charge)
 	{
+		// 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']))
+		{
+			$societestatic->fetch($tmparray['CUS']);
+		}
+		else
+		{
+			$societestatic->id = 0;
+		}
+		if (! empty($tmparray['MEM']))
+		{
+			$memberstatic->fetch($tmparray['MEM']);
+		}
+		else
+		{
+			$memberstatic->id = 0;
+		}
+
 	    print '<TR class="oddeven">';
-	    $societestatic->fetch($charge->metadata->idcustomer);
-	    $societestatic->id=$charge->metadata->idcustomer;
-	    $societestatic->lastname=$obj->lastname;
-	    $societestatic->firstname=$obj->firstname;
-	    $societestatic->admin=$obj->admin;
-	    $societestatic->login=$obj->login;
-	    $societestatic->email=$obj->email;
-	    $societestatic->societe_id=$obj->fk_soc;
 	    // Ref
 		print "<TD><A href='".DOL_URL_ROOT."/stripe/charge.php?rowid=".$charge->id."'>".$charge->id."</A></TD>\n";
+		// Stripe customer
+		print "<TD>".$charge->customer."</TD>\n";
 		// Employee
-		print "<TD>".$societestatic->getNomUrl(1)."</TD>\n";
+		print "<TD>";
+		if ($societestatic->id > 0)
+		{
+			print $societestatic->getNomUrl(1);
+		}
+		if ($memberstatic->id > 0)
+		{
+			print $memberstatic->getNomUrl(1);
+		}
+		print "</TD>\n";
 		// Origine
 		print "<TD>";
+		print $FULLTAG;
 		if ($charge->metadata->source=="order"){
 			$object = new Commande($db);
 			$object->fetch($charge->metadata->idsource);
@@ -132,21 +163,8 @@ if (!$rowid && $stripeaccount)
 		    print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
 		}
 	    print "</TD>\n";
-			// Date payment
+		// Date payment
 	    print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n";
-	    // Label payment
-	    print "<TD>";
-		if ($charge->refunded=='1'){
-		    print $langs->trans("refunded");
-		} elseif ($charge->paid=='1'){
-		    print $langs->trans("".$charge->status."");
-		} else {
-			$label="Message: ".$charge->failure_message."<BR>";
-			$label.="Réseau: ".$charge->outcome->network_status."<BR>";
-			$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
-		   print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
-		}
-	    print "</TD>\n";
 	    // Type
 	    print '<TD>';
 		if ($charge->source->object=='card')
@@ -161,6 +179,20 @@ if (!$rowid && $stripeaccount)
 	    print '</TD>';
 	    // Amount
 	    print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100)."</TD>";
+	    // Status
+	    print "<TD>";
+	    if ($charge->refunded=='1'){
+	    	print $langs->trans("refunded");
+	    } elseif ($charge->paid=='1'){
+	    	print $langs->trans("".$charge->status."");
+	    } else {
+	    	$label="Message: ".$charge->failure_message."<br>";
+	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
+	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+	    	print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1);
+	    }
+	    print "</TD>\n";
+
 	    print "</TR>\n";
 	}
 } else {

From 489dde4db4c70c9555c9bd7d46ace9a03c447abe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 22:26:42 +0100
Subject: [PATCH 377/386] Prepare database to store payment modes of customers

---
 .../install/mysql/migration/7.0.0-8.0.0.sql   | 20 +++++++++
 .../install/mysql/tables/llx_societe_rib.sql  | 28 ++++++++++--
 .../canvas/company/tpl/card_view.tpl.php      |  2 +-
 .../canvas/individual/tpl/card_view.tpl.php   |  2 +-
 htdocs/societe/class/societe.class.php        | 20 ++++-----
 htdocs/societe/paymentmodes.php               | 45 +++++++++++--------
 htdocs/stripe/class/stripe.class.php          |  6 ++-
 7 files changed, 88 insertions(+), 35 deletions(-)

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 eb3c865c106..227562ea9bc 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
@@ -97,3 +97,23 @@ ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER AUTO_INCREMENT
 ALTER TABLE llx_c_payment_term ADD UNIQUE INDEX uk_c_payment_term_code(entity, code);
 
 ALTER TABLE llx_oauth_token ADD COLUMN tokenstring text;
+
+-- Add field for payment modes
+ALTER TABLE llx_societe_rib ADD COLUMN type varchar(32) DEFAULT 'ban' after rowid;
+ALTER TABLE llx_societe_rib ADD COLUMN last_four varchar(4);
+ALTER TABLE llx_societe_rib ADD COLUMN card_type varchar(255);
+ALTER TABLE llx_societe_rib ADD COLUMN cvn varchar(255);										
+ALTER TABLE llx_societe_rib ADD COLUMN exp_date_month INTEGER;
+ALTER TABLE llx_societe_rib ADD COLUMN exp_date_year INTEGER;
+ALTER TABLE llx_societe_rib ADD COLUMN country_code varchar(10);
+ALTER TABLE llx_societe_rib ADD COLUMN approved integer DEFAULT 0;
+ALTER TABLE llx_societe_rib ADD COLUMN email varchar(255);
+ALTER TABLE llx_societe_rib ADD COLUMN ending_date date;
+ALTER TABLE llx_societe_rib ADD COLUMN max_total_amount_of_all_payments double(24,8);
+ALTER TABLE llx_societe_rib ADD COLUMN preapproval_key varchar(255);
+ALTER TABLE llx_societe_rib ADD COLUMN starting_date date;
+ALTER TABLE llx_societe_rib ADD COLUMN total_amount_of_all_payments double(24,8);
+ALTER TABLE llx_societe_rib ADD COLUMN stripe_card_ref varchar(128);
+ALTER TABLE llx_societe_rib ADD COLUMN status integer NOT NULL DEFAULT 1;
+   
+
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 168a2803c9d..6157af37830 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -17,15 +17,19 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Table with the payment modes of a thirdparty (BAN, Paypal, Card, ...)
 -- =============================================================================
 
 create table llx_societe_rib
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
+  type           varchar(32) DEFAULT 'ban',							-- 'ban' or 'paypal' or 'card' or 'stripe'
+  label          varchar(30),
   fk_soc         integer NOT NULL,
   datec          datetime,
   tms            timestamp,
-  label          varchar(30),
+  
+  -- For BAN
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
   code_guichet   varchar(6),    -- desk code
@@ -37,10 +41,28 @@ create table llx_societe_rib
   proprio        varchar(60),
   owner_address  varchar(255),
   default_rib    smallint NOT NULL DEFAULT 0,
-  
+  -- For BAN direct debit feature  
   rum            varchar(32),	 				-- RUM value to use for SEPA generation
   date_rum		 date,							-- Date of mandate
   frstrecur      varchar(16) default 'FRST',    -- 'FRST' or 'RECUR'
-  	
+  --For credit card
+  last_four varchar(4),										-- last 4
+  card_type varchar(255),									-- card type 'VISA', 'MC' , ...
+  cvn varchar(255),										
+  exp_date_month INTEGER,
+  exp_date_year INTEGER,
+  country_code varchar(10),
+  --For Paypal
+  approved INTEGER DEFAULT 0,
+  email varchar(255),
+  ending_date date,
+  max_total_amount_of_all_payments double(24,8),
+  preapproval_key varchar(255),
+  starting_date date,
+  total_amount_of_all_payments double(24,8),
+  --For Stripe
+  stripe_card_ref varchar(128),								-- 'card_...'
+
+  status integer NOT NULL DEFAULT 1,						-- 1=ACTIVE, 0=IN_TRASH
   import_key     varchar(14)    -- import key
 )ENGINE=innodb;
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 3865e9b95a0..24ddfbaaaac 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -185,7 +185,7 @@ for ($i=1; $i<=4; $i++) {
 			<td><?php echo $langs->trans('RIB'); ?></td>
 			<td align="right">
 			<?php if ($user->rights->societe->creer) { ?>
-			<a href="<?php echo DOL_URL_ROOT.'/societe/rib.php?socid='.$this->control->tpl['id']; ?>"><?php echo $this->control->tpl['image_edit']; ?></a>
+			<a href="<?php echo DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->control->tpl['id']; ?>"><?php echo $this->control->tpl['image_edit']; ?></a>
 			<?php } else { ?>
 			&nbsp;
 			<?php } ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 359f4ec7b44..fd9b3487f50 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -144,7 +144,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
 			<td><?php echo $langs->trans('RIB'); ?></td>
 			<td align="right">
 			<?php if ($user->rights->societe->creer) { ?>
-			<a href="<?php echo DOL_URL_ROOT.'/societe/rib.php?socid='.$this->control->tpl['id']; ?>"><?php echo $this->control->tpl['image_edit']; ?></a>
+			<a href="<?php echo DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->control->tpl['id']; ?>"><?php echo $this->control->tpl['image_edit']; ?></a>
 			<?php } else { ?>
 			&nbsp;
 			<?php } ?>
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b936a431080..f7098d88478 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1662,7 +1662,7 @@ class Societe extends CommonObject
 			return 1;
 		}
 	}
-	
+
 	/**
 	 *  Definit la societe comme un client
 	 *
@@ -1674,7 +1674,7 @@ class Societe extends CommonObject
 	function set_remise_supplier($remise, $note, User $user)
 	{
 		global $conf, $langs;
-		
+
 		// Nettoyage parametres
 		$note=trim($note);
 		if (! $note)
@@ -1682,15 +1682,15 @@ class Societe extends CommonObject
 			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
 			return -2;
 		}
-		
+
 		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
-		
+
 		if ($this->id)
 		{
 			$this->db->begin();
-			
+
 			$now=dol_now();
-			
+
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
 			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
@@ -1702,7 +1702,7 @@ class Societe extends CommonObject
 				$this->error=$this->db->error();
 				return -1;
 			}
-			
+
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
 			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
@@ -1710,7 +1710,7 @@ class Societe extends CommonObject
 			$sql.= " '".$this->db->escape($note)."',";
 			$sql.= " ".$user->id;
 			$sql.= ")";
-			
+
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -1718,7 +1718,7 @@ class Societe extends CommonObject
 				$this->error=$this->db->lasterror();
 				return -1;
 			}
-			
+
 			$this->db->commit();
 			return 1;
 		}
@@ -2037,7 +2037,7 @@ class Societe extends CommonObject
 		else if ($option == 'ban')
 		{
 			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$this->id;
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 4bd19295e7a..bf7f05ba50a 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -23,9 +23,9 @@
  */
 
 /**
- *	    \file       htdocs/societe/rib.php
+ *	    \file       htdocs/societe/paymentmodes.php
  *      \ingroup    societe
- *		\brief      BAN tab for companies
+ *		\brief      Tab of payment modes for the customer
  */
 
 require '../main.inc.php';
@@ -162,7 +162,7 @@ if (empty($reshook))
 					$account->setAsDefault($id);	// This will make sure there is only one default rib
 				}
 
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
 			}
@@ -261,7 +261,7 @@ if (empty($reshook))
 			{
 				$db->commit();
 
-				$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
 			}
@@ -332,19 +332,23 @@ if (empty($reshook))
 	$id = $savid;
 }
 
-if (class_exists('Stripe'))
+if (! empty($conf->stripe->enabled) && class_exists('Stripe'))
 {
 	$stripe=new Stripe($db);
-	$customerstripe=$stripe->CustomerStripe($socid,$stripe->GetStripeAccount($conf->entity));
+
+	if (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')) $service = 'StripeTest';
+	else $service = 'StripeLive';
+
+	$customerstripe=$stripe->customerStripe($socid, $stripe->getStripeAccount($service));
 	if ($customerstripe->id) {
-	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."");} 
+	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."");}
 
 	$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 	if ($action == 'setassourcedefault')
 	{
 	$cu->default_source = "$source"; // obtained with Stripe.js
 	$cu->save();
- 
+
 	header('Location: '.$url);
 	exit;
 	}
@@ -366,7 +370,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 
 llxHeader();
-    
+
 $head=societe_prepare_head($object);
 
 if (! $id)
@@ -381,14 +385,14 @@ if (empty($account->socid)) $account->socid=$object->id;
 
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
 }
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
-	print '<form action="rib.php?socid='.$object->id.'" method="post">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
 }
@@ -414,9 +418,12 @@ if ($socid && $action != 'edit' && $action != "create")
 	{
 		print load_fiche_titre($langs->trans('StripeGateways'), '', '');
 
-		if (is_object($stripe) && $stripe->GetStripeAccount($conf->entity))
+		if (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')) $service = 'StripeTest';
+		else $service = 'StripeLive';
+
+		if (is_object($stripe) && $stripe->getStripeAccount($service))
 		{
-			$customerstripe=$stripe->CustomerStripe($object->id,$stripe->GetStripeAccount($conf->entity));
+			$customerstripe=$stripe->customerStripe($object->id,$stripe->getStripeAccount($service));
 		}
 
 		if ($customerstripe->id) {
@@ -538,7 +545,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
 	// List of bank accounts
 
-	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+	$morehtmlright='<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
 
 	print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
 
@@ -636,7 +643,7 @@ if ($socid && $action != 'edit' && $action != "create")
 			// Default
 			print '<td align="center" width="70">';
 			if (!$rib->default_rib) {
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
 				print img_picto($langs->trans("Disabled"),'off');
 				print '</a>';
 			} else {
@@ -704,13 +711,13 @@ if ($socid && $action != 'edit' && $action != "create")
 			print '<td align="right">';
 			if ($user->rights->societe->creer)
 			{
-				print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
 				print img_picto($langs->trans("Modify"),'edit');
 				print '</a>';
 
 		   		print '&nbsp;';
 
-		   		print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
+		   		print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
 		   		print img_picto($langs->trans("Delete"),'delete');
 		   		print '</a>';
 			}
@@ -741,7 +748,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
 		if ($user->rights->societe->creer)
 		{
-			print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
 		}
 
 		print '</div>';
@@ -879,7 +886,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
 		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
+		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur','alpha')?GETPOST('frstrecur','alpha'):$account->frstrecur), 0);
 		print '</td></tr>';
 
 		print '</table>';
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a9df01d6acb..4167c6a0d81 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -200,6 +200,7 @@ class Stripe extends CommonObject
 	public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account)
 	{
 		global $conf;
+
 		if (empty($conf->global->STRIPECONNECT_LIVE)) {
 			$mode = 0;
 		} else {
@@ -292,6 +293,9 @@ class Stripe extends CommonObject
 				if (isset($charge->id)) {}
 			}
 
+			if (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')) $service = 'StripeTest';
+			else $service = 'StripeLive';
+
 			$return->statut = 'success';
 			$return->id = $charge->id;
 			if ($charge->source->type == 'card') {
@@ -299,7 +303,7 @@ class Stripe extends CommonObject
 			} elseif ($charge->source->type == 'three_d_secure') {
 				$stripe = new Stripe($this->db);
 				$src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
-				"stripe_account" => $stripe->getStripeAccount($conf->entity)
+				"stripe_account" => $stripe->getStripeAccount($service)
 				));
 				$return->message = $src->card->brand . " ****" . $src->card->last4;
 			} else {

From 9f42e1b17238dff317d5c379fcd74171cabb10ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 22:33:40 +0100
Subject: [PATCH 378/386] Prepare code to introduce different payment modes
 than BAN

---
 .../class/bonprelevement.class.php            |  8 ++------
 .../class/companybankaccount.class.php        | 19 ++++++++++---------
 htdocs/societe/class/societe.class.php        |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index d0aa788fe48..e2517bdfada 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -726,16 +726,12 @@ class BonPrelevement extends CommonObject
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		//if ($banque || $agence) $sql.=", ".MAIN_DB_PREFIX."societe_rib as sr";
 		$sql.= " WHERE f.fk_statut = 1";
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.rowid = pfd.fk_facture";
 		$sql.= " AND f.paye = 0";
 		$sql.= " AND pfd.traite = 0";
 		$sql.= " AND f.total_ttc > 0";
-		//if ($banque || $agence) $sql.= " AND f.fk_soc = sr.rowid";
-		//if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
-		//if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
 
 		dol_syslog(get_class($this)."::SommeAPrelever");
 		$resql = $this->db->query($sql);
@@ -805,9 +801,8 @@ class BonPrelevement extends CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 			$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-			//if ($banque || $agence) $sql.= ", ".MAIN_DB_PREFIX."societe_rib as sr";
 			$sql.= " WHERE f.rowid = pfd.fk_facture";
-			$sql.= " AND f.entity = ".$conf->entity;
+			$sql.= " AND f.entity IN (".getEntity('facture').')';
 			$sql.= " AND s.rowid = f.fk_soc";
 			//if ($banque || $agence) $sql.= " AND s.rowid = sr.fk_soc";
 			$sql.= " AND f.fk_statut = 1";
@@ -1340,6 +1335,7 @@ class BonPrelevement extends CommonObject
 			$sql.= " AND soc.rowid = f.fk_soc";
 			$sql.= " AND rib.fk_soc = f.fk_soc";
 			$sql.= " AND rib.default_rib = 1";
+			$sql.= " AND rib.type = 'ban'";
 			//print $sql;
 
 			// Define $fileDebiteurSection. One section DrctDbtTxInf per invoice.
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 428f5b96f42..97c8871202e 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -72,7 +72,7 @@ class CompanyBankAccount extends Account
 		$now	= dol_now();
 		$error	= 0;
 		// Correct default_rib to be sure to have always one default
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
    		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -81,8 +81,8 @@ class CompanyBankAccount extends Account
 			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
 		}
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec)";
-		$sql.= " VALUES (".$this->socid.", '".$this->db->idate($now)."')";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
+		$sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -204,7 +204,7 @@ class CompanyBankAccount extends Account
 	{
 		if (empty($id) && empty($socid)) return -1;
 
-		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
 		if ($id)    $sql.= " WHERE rowid = ".$id;
@@ -220,6 +220,7 @@ class CompanyBankAccount extends Account
 				$this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
 
 				$this->id			   = $obj->rowid;
+				$this->type			   = $obj->type;
 				$this->socid           = $obj->fk_soc;
 				$this->bank            = $obj->bank;
 				$this->code_banque     = $obj->code_banque;
@@ -321,7 +322,7 @@ class CompanyBankAccount extends Account
 	}
 
 	/**
-	 * Set RIB as Default
+	 * Set a BAN as Default
 	 *
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
@@ -345,13 +346,13 @@ class CompanyBankAccount extends Account
 
 				$this->db->begin();
 
-				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0 ";
-				$sql2.= "WHERE fk_soc = ".$obj->fk_soc;
+				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
+				$sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
-				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1 ";
-				$sql3.= "WHERE rowid = ".$obj->id;
+				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
+				$sql3.= " WHERE rowid = ".$obj->id;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f7098d88478..dbf3015ba1e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2433,7 +2433,7 @@ class Societe extends CommonObject
 	function get_all_rib()
 	{
 		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc = ".$this->id;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
 		if (!$result) {
 			$this->error++;

From 3ad95e46c0a8a506ea46590161b17cb55834c6fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 22:40:42 +0100
Subject: [PATCH 379/386] Fix phpunit

---
 htdocs/install/mysql/tables/llx_oauth_token.sql | 2 +-
 test/phpunit/CodingSqlTest.php                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 5c7d6d62177..81ae99c6ce6 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_oauth_token (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     service varchar(36),
     token text,						-- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
-    tokenstring text,				-- token in json format '{ "access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write" }
+    tokenstring text,				-- token in json format '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
     fk_user integer,
     fk_adherent integer,
     entity integer DEFAULT 1
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 0b29b29240d..57be8fc62a9 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -163,10 +163,10 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 $result=strpos($filecontent,'"');
                 if ($result)
                 {
-                    $result=! strpos($filecontent,'["');
+                	$result=(! strpos($filecontent,'["') && ! strpos($filecontent,'{"'));
                 }
                 print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found double quote that is not [" (used for json content) into '.$file.'. Bad.');
+                $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";

From b68b66edcb0c08e4799a28b339d4b43cda4938bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Mar 2018 23:16:55 +0100
Subject: [PATCH 380/386] Fix phpcs

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 4167c6a0d81..a87d80c265e 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -319,9 +319,9 @@ class Stripe extends CommonObject
 			$return->type = $err['type'];
 			$return->code = $err['code'];
 			$return->message = $err['message'];
-			$body = "Une erreur de paiement est survenue. Voici le code d'erreur: <br />" . $return->id . " " . $return->message . " ";
+			$body = "Error: <br>" . $return->id . " " . $return->message . " ";
 			$subject = '[NOTIFICATION] Erreur de paiement';
-			$headers = 'From: "ptibogxiv.net" <' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '>';
+			$headers = 'From: "noreply" <' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '>';
 			mail('' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '', $subject, $body, $headers);
 			$error ++;
 			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');

From 82057b35233fa22d72c2f6978647c49531d4f3d2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 9 Mar 2018 08:11:02 +0100
Subject: [PATCH 381/386] Fix: use code instead id

---
 htdocs/compta/facture/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8319f42bd97..987ed926986 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -276,7 +276,7 @@ if ($massaction == 'withdrawrequest')
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
 				}
-				if(!($objecttmp->statut > Facture::STATUS_DRAFT)){
+				if (!($objecttmp->statut > Facture::STATUS_DRAFT)){
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
 				}
@@ -298,11 +298,11 @@ if ($massaction == 'withdrawrequest')
 					$numprlv = $db->num_rows($result_sql);
 				}
 
-				if($numprlv>0){
+				if ($numprlv>0){
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
 				}
-				if(!empty($objecttmp->mode_reglement_id ) && $objecttmp->mode_reglement_id != 3){
+				if (!empty($objecttmp->mode_reglement_code ) && $objecttmp->mode_reglement_code != 'PRE'){
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
 				}

From ea175cd6c176c3722c627d7be26cf398dfd267a8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 9 Mar 2018 09:37:23 +0100
Subject: [PATCH 382/386] Fix: compatibility with multicompany dictionnary
 sharing

---
 htdocs/comm/propal/card.php       | 2 +-
 htdocs/commande/card.php          | 2 +-
 htdocs/fourn/facture/card.php     | 2 +-
 htdocs/supplier_proposal/card.php | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2e9c184dd11..0b5fcd547e7 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1371,7 +1371,7 @@ if ($action == 'create')
 
 			$soc = $objectsrc->thirdparty;
 
-			$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
+			$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:0)); // TODO maybe add default value option
 			$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
 			$remise_percent 	= (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
 			$remise_absolue 	= (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index cf70d422130..f11c4778b0b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1450,7 +1450,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 
 			$soc = $objectsrc->thirdparty;
-			$cond_reglement_id	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
+			$cond_reglement_id	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:0)); // TODO maybe add default value option
 			$mode_reglement_id	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
 			$fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
 			$availability_id	= (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0));
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ae8b0669c8..5b1be2239f1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1626,7 +1626,7 @@ if ($action == 'create')
 			//$ref_client			= (!empty($objectsrc->ref_client)?$object->ref_client:'');
 
 			$soc = $objectsrc->thirdparty;
-			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:1));
+			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:0));
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_supplier_id)?$soc->mode_reglement_supplier_id:0));
 			$fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
 			$remise_percent 	= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_supplier_percent)?$soc->remise_supplier_percent:0));
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5585d3ba87b..e12e1e34505 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -998,7 +998,7 @@ if ($action == 'create')
 		$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 		$soc = $objectsrc->thirdparty;
 
-		$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
+		$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:0)); // TODO maybe add default value option
 		$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
 		$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));
@@ -1056,7 +1056,7 @@ if ($action == 'create')
 	if ($soc->id > 0)
 	{
 		// Discounts for third party
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';		
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 
 		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);
 

From f4f81482e776010fa42492da348a10d5524da75d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 9 Mar 2018 09:39:57 +0100
Subject: [PATCH 383/386] Fix: add todo if you use the good id by entities

---
 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 5b1be2239f1..d69e1be6c3a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1626,7 +1626,7 @@ if ($action == 'create')
 			//$ref_client			= (!empty($objectsrc->ref_client)?$object->ref_client:'');
 
 			$soc = $objectsrc->thirdparty;
-			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:0));
+			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:0)); // TODO maybe add default value option
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_supplier_id)?$soc->mode_reglement_supplier_id:0));
 			$fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
 			$remise_percent 	= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_supplier_percent)?$soc->remise_supplier_percent:0));

From 3eeeaf2d2dd59ed4b7527ff360fd9f7c12ff8f2f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 9 Mar 2018 12:54:34 +0100
Subject: [PATCH 384/386] Fix: REST API must be enabled for all entities

---
 htdocs/api/admin/index.php           |  8 ++++----
 htdocs/core/modules/modApi.class.php | 29 ++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 57efe8d7cb9..7ebff2c5da6 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+/* Copyright (C) 2004		Rodolphe Quiedeville		<rodolphe@quiedeville.org>
  * Copyright (C) 2005-2016	Laurent Destailleur		<eldy@users.sourceforge.org>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2015		Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2012-2018	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.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 @@ if ($action == 'setproductionmode')
 {
 	$status = GETPOST('status','alpha');
 
-	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', $conf->entity) > 0)
+	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', 0) > 0)
 	{
 		$error=0;
 
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 3e27031fd6f..24d784585d3 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+/* Copyright (C) 2003		Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2018		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
@@ -60,12 +61,13 @@ class modApi extends DolibarrModules
 		$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);
+		// Can be enabled / disabled only in the main company with superadmin account
+		$this->core_enabled = 1;
 		// 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';
 
-
 		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
@@ -230,5 +232,24 @@ class modApi 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')
+	 *      @return int 1 if OK, 0 if KO
+	 */
+	function remove($options = '')
+	{
+		// Remove old constants with entity fields different of 0
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API', 1),
+			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('API_PRODUCTION_MODE', 1)
+		);
+
+		return $this->_remove($sql, $options);
+	}
 }
 

From d6b4bc14e4f7e42c784ffb903980d8732dc0cf71 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Fri, 9 Mar 2018 16:52:06 +0100
Subject: [PATCH 385/386] NEW: syslog file autoclean

---
 htdocs/admin/syslog.php                 |  17 ++++
 htdocs/core/class/utils.class.php       | 112 +++++++++++++++++++++++-
 htdocs/core/modules/modSyslog.class.php |   5 ++
 htdocs/langs/en_US/admin.lang           |   3 +
 4 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index d850e7eeb11..e434f669f45 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -146,6 +146,16 @@ if ($action == 'setlevel')
 	dol_syslog("admin/syslog: level ".$level);
 
 	if (! $res > 0) $error++;
+
+	if (! $error)
+	{
+		$file_saves = GETPOST("file_saves");
+		$res = dolibarr_set_const($db,"SYSLOG_FILE_SAVES",$file_saves,'chaine',0,'',0);
+		dol_syslog("admin/syslog: file saves  ".$file_saves);
+
+		if (! $res > 0) $error++;
+	}
+
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -284,6 +294,13 @@ print '<option value="'.LOG_INFO.'" '.($conf->global->SYSLOG_LEVEL==LOG_INFO?'SE
 print '<option value="'.LOG_DEBUG.'" '.($conf->global->SYSLOG_LEVEL>=LOG_DEBUG?'SELECTED':'').'>LOG_DEBUG ('.LOG_DEBUG.')</option>';
 print '</select>';
 print '</td></tr>';
+
+if(! empty($conf->loghandlers['mod_syslog_file']) && ! empty($conf->cron->enabled)) {
+	print '<tr class="oddeven"><td width="140">'.$langs->trans("SyslogFileNumberOfSaves").'</td>';
+	print '<td colspan="2"><input type="number" name="file_saves" placeholder="14" min="0" step="1" value="'.$conf->global->SYSLOG_FILE_SAVES.'" />';
+	print ' (<a href="'.dol_buildpath('/cron/list.php', 1).'?search_label=CompressSyslogs&status=-1">'.$langs->trans('ConfigureCleaningCronjobToSetFrequencyOfSaves').'</a>)</td></tr>';
+}
+
 print '</table>';
 print "</form>\n";
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 37ccea748f1..e60070f1179 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -93,7 +93,7 @@ class Utils
 			// Define files log
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 			}
 
 			$filelog='';
@@ -668,4 +668,112 @@ class Utils
 
 		return -1;
 	}
-}
+
+	/**
+	 * This saves syslog files and compresses older ones
+	 * Used from cronjob
+	 * 
+	 * @return	int		 0 if OK, < 0 if KO 
+	 */
+	function compressSyslogs() {
+		global $conf;
+
+		if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
+			return 0;
+		}
+
+		if(! function_exists('gzopen')) {
+			return -1;
+		}
+
+		dol_include_once('/core/lib/files.lib.php');
+
+		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+
+		if(empty($conf->global->SYSLOG_FILE)) {
+			$mainlogdir = DOL_DATA_ROOT;
+			$mainlog = 'dolibarr.log';
+		} else {
+			$mainlogfull = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+			$mainlogdir = dirname($mainlogfull);
+			$mainlog = basename($mainlogfull);
+		}
+
+		$tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
+		$tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
+
+		foreach($tabfiles as $file) {
+
+			$logname = $file['name'];
+			$logpath = $file['path'];
+
+			// Handle already compressed files
+
+			$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
+
+			$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
+			$gzfiles = array();
+
+			foreach($gzfilestmp as $gzfile) {
+				$tabmatches = array();
+				preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
+
+				$numsave = intval($tabmatches[1]);
+
+				$gzfiles[$numsave] = $gzfile;
+			}
+
+			krsort($gzfiles, SORT_NUMERIC);
+
+			foreach($gzfiles as $numsave => $dummy) {
+				if(dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
+					return -2;
+				}
+
+				if($numsave >= $nbSaves) {
+					dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz');
+				} else {
+					dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
+				}
+			}
+
+			// Compress last save
+
+			if(dol_is_file($logpath.'/'.$logname.'.1')) {
+				if($nbSaves > 1) {
+					$gzfilehandle = gzopen($logpath.'/'.$logname.'.2.gz', 'wb9');
+
+					if(empty($gzfilehandle)) {
+						return -3;
+					}
+
+					$sourcehandle = fopen($logpath.'/'.$logname.'.1', 'r');
+
+					if(empty($sourcehandle)) {
+						return -4;
+					}
+
+					while(! feof($sourcehandle)) {
+						gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
+					}
+
+					fclose($sourcehandle);
+					gzclose($gzfilehandle);
+				} else {
+					dol_delete_file($logpath.'/'.$logname.'.1');
+				}
+			}
+
+			// Compress current file et recreate it
+
+			if(dol_is_file($logpath.'/'.$logname)) {
+				if(dol_move($logpath.'/'.$logname, $logpath.'/'.$logname.'.1', 0, 1, 0, 0)) {
+					$newlog = fopen($logpath.'/'.$logname, 'a+');
+					fclose($newlog);
+				}
+			}
+		}
+
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 97c7b71ae21..8c84214ca47 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -79,5 +79,10 @@ class modSyslog extends DolibarrModules
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'syslog';
+
+		// Cronjobs
+		$this->cronjobs = array(
+		    0=>array('label'=>'CompressSyslogs', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'compressSyslogs', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>1, 'unitfrequency'=> 3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>true),
+		);
 	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d6514db4d2c..6648e43501e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1444,6 +1444,9 @@ 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
+CompressSyslogs=Syslog files compression and backup
+SyslogFileNumberOfSaves=Log backups
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt

From d858426b7b5735775181359cc82d38b6f365d065 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Mar 2018 22:33:39 +0100
Subject: [PATCH 386/386] Update modSyslog.class.php

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

diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 8c84214ca47..b3e83f90ca2 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -82,7 +82,7 @@ class modSyslog extends DolibarrModules
 
 		// Cronjobs
 		$this->cronjobs = array(
-		    0=>array('label'=>'CompressSyslogs', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'compressSyslogs', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>1, 'unitfrequency'=> 3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>true),
+		    0=>array('label'=>'CompressSyslogs', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'compressSyslogs', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>1, 'unitfrequency'=> 3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>true),
 		);
 	}
 }