From 17da80832513e19d9efc40a4a7eec117aab45de4 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Fri, 8 Sep 2017 14:35:44 +0200
Subject: [PATCH 01/20] FIX wrong basePath in the swagger view

Behind a reverse proxy the basePath seems to be in http.
Forcing the basePath to DOL_MAIN_URL_ROOT fixes the problem.
---
 htdocs/api/class/api.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 40e00d01ffd..79793b0f8de 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -56,7 +56,7 @@ class DolibarrApi
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode, $refreshCache);
-
+	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT);
         $this->r->setAPIVersion(1);
     }
 

From 681c2a67bd9c7d72554d976bc2d076a19410c4ca Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 11 Sep 2017 23:22:44 +0200
Subject: [PATCH 02/20] Fix batch required for lot product error message.

---
 htdocs/langs/en_US/errors.lang                      | 2 +-
 htdocs/product/stock/class/mouvementstock.class.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8dfc02c49f1..47299634de3 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -156,7 +156,7 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
 ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 3e3eb4c28a7..25e0e9e7fce 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -96,6 +96,7 @@ class MouvementStock extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+		$langs->load("errors");
 		$error = 0;
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
@@ -141,7 +142,7 @@ class MouvementStock extends CommonObject
 		{
 			if (empty($batch))
 			{
-				$this->errors[]=$langs->trans("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->name);
+				$this->errors[]=$langs->trans("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
 				dol_syslog("Try to make a movement of a product with status_batch on without any batch data");
 
 				$this->db->rollback();

From f68d31d7c591da55f231e16ebdc65d171ea39572 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Tue, 12 Sep 2017 17:45:02 +0200
Subject: [PATCH 03/20] Add of $urlwithroot in the setBaseUrls function, to use
 Dolibarr external domain name in the configuration file

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 79793b0f8de..36eb7c1d7d2 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -56,7 +56,7 @@ class DolibarrApi
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode, $refreshCache);
-	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT);
+	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT, $urlwithroot);
         $this->r->setAPIVersion(1);
     }
 

From 815d0aff900af35cc5d9e819c143df1862a5ad90 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 19 Sep 2017 15:10:18 +0200
Subject: [PATCH 04/20] FIX for free line select unit was wrong

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a684cff7165..32480e5cf15 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3274,7 +3274,7 @@ class Form
 
         $return= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 
-        $sql = 'SELECT rowid, label from '.MAIN_DB_PREFIX.'c_units';
+        $sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
         $sql.= ' WHERE active > 0';
 
         $resql = $this->db->query($sql);

From caf4ca74517f1dc0f748bd6df315b2cca7d70c15 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Tue, 19 Sep 2017 16:56:27 +0200
Subject: [PATCH 05/20] FIX Implementation of a Luracast recommandation for the
 REST api server (#7370)

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 36eb7c1d7d2..d76759532dc 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -48,7 +48,7 @@ class DolibarrApi
      */
     function __construct($db, $cachedir='', $refreshCache=false)
     {
-        global $conf;
+        global $conf, $dolibarr_main_url_root;
 
         if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
         Defaults::$cacheDirectory = $cachedir;
@@ -57,6 +57,8 @@ class DolibarrApi
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode, $refreshCache);
 	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT, $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
         $this->r->setAPIVersion(1);
     }
 

From d5966f944fac0834fbab0ea1cb561b55d9fa0ebf Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Tue, 19 Sep 2017 16:58:09 +0200
Subject: [PATCH 06/20] FIX Implementation of a Luracast recommandation for the
 REST api server (#7370)

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index d76759532dc..55b728d2a80 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -56,9 +56,9 @@ class DolibarrApi
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode, $refreshCache);
-	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT, $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
+        $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
+	$this->r->setBaseUrls($urlwithroot);
         $this->r->setAPIVersion(1);
     }
 

From cc7aee6c3e5618855e43f95f38adb3b899c260d1 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Tue, 19 Sep 2017 16:59:19 +0200
Subject: [PATCH 07/20] FIX Implementation of a Luracast recommandation for the
 REST api server (#7370)

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 55b728d2a80..dcda8255e7c 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -58,7 +58,7 @@ class DolibarrApi
         $this->r = new Restler($production_mode, $refreshCache);
         $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
         $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	$this->r->setBaseUrls($urlwithroot);
+	$this->r->setBaseUrls(DOL_MAIN_URL_ROOT, $urlwithroot);
         $this->r->setAPIVersion(1);
     }
 

From 8123562dedfbc9521b4b903bb451562c0e3cb027 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 19 Sep 2017 18:42:29 +0200
Subject: [PATCH 08/20] Fix extrafield copy next situation invoice

---
 htdocs/compta/facture/card.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6cfed39a02f..1d621d153f5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1356,6 +1356,7 @@ if (empty($reshook))
 					{
 						$line->origin = $object->origin;
 						$line->origin_id = $line->id;
+						$line->fetch_optionals($line->id);
 					}
 				}
 
@@ -1377,7 +1378,21 @@ if (empty($reshook))
 
 				$object->situation_counter = $object->situation_counter + 1;
 				$id = $object->createFromCurrent($user);
-				if ($id <= 0) $mesg = $object->error;
+				if ($id <= 0) 
+				{
+					$mesg = $object->error;
+				}
+				else
+				{
+					$nextSituationInvoice = new Facture($db);
+					$nextSituationInvoice->fetch($id);
+					// create extrafields with data from create form
+					$extralabels = $extrafields->fetch_name_optionals_label($nextSituationInvoice->table_element);
+					$ret = $extrafields->setOptionalsFromPost($extralabels, $nextSituationInvoice);
+					if ($ret > 0) {
+						$nextSituationInvoice->insertExtraFields();
+					}
+				}
 			}
 		}
 

From 13d5471dd00357a0274cad9aa42fac9978d1031d Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 19 Sep 2017 18:43:00 +0200
Subject: [PATCH 09/20] Fix extrafield copy shipment

---
 htdocs/expedition/card.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f15c091263e..4a7df9e73b2 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -780,9 +780,15 @@ if ($action == 'create')
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
-            if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-            	print $object->showOptionals($extrafields, 'edit');
-            }
+			if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+				// copy from order
+				$orderExtrafields = new Extrafields($db);
+				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
+				if ($object->fetch_optionals($object->id, $orderExtrafieldLabels) > 0) {
+					$expe->array_options = array_merge($expe->array_options, $object->array_options);
+				}
+				print $object->showOptionals($extrafields, 'edit');
+			}
 
 
             // Incoterms
@@ -1304,9 +1310,14 @@ if ($action == 'create')
 				if (is_array($extralabelslines) && count($extralabelslines)>0)
 				{
 					$colspan=5;
+					$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
 					$line = new ExpeditionLigne($db);
 					$line->fetch_optionals($object->id,$extralabelslines);
-					print '<tr class="oddeven">';
+					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+					print '<tr '.$bc[$var].'>';
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 					print '</tr>';
 				}

From cec91ae837528050908f5506e9d80c8b68689b82 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 19 Sep 2017 18:44:49 +0200
Subject: [PATCH 10/20] Fix extrafield copy receipt

---
 htdocs/livraison/card.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 02b126306f2..e6d39ec7019 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -565,6 +565,14 @@ else
 			}
 			
 			// Other attributes
+			if ($action = 'create_delivery') {
+				// 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) {
+					$object->array_options = array_merge($object->array_options, $expedition->array_options);
+				}
+			}
 			$cols = 2;
 			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
@@ -665,6 +673,13 @@ else
 					$mode = ($object->statut == 0) ? 'edit' : 'view';
 					$line = new LivraisonLigne($db);
 					$line->fetch_optionals($object->lines[$i]->id,$extralabelslines);
+					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);
+						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+					}
 					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafieldsline, $mode, array('style'=>$bc[$var], 'colspan'=>$colspan),$i);
 					print '</tr>';

From ddeca6cc06ade604c2fc374ba5871d53fa253ada Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 19 Sep 2017 18:52:27 +0200
Subject: [PATCH 11/20] fix oddeven revert

---
 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 4a7df9e73b2..728556b3940 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1317,7 +1317,7 @@ if ($action == 'create')
 					$line = new ExpeditionLigne($db);
 					$line->fetch_optionals($object->id,$extralabelslines);
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
-					print '<tr '.$bc[$var].'>';
+					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 					print '</tr>';
 				}

From 052e025537b33e8bdd57095e23e44a34eb4b0b5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Sep 2017 11:42:05 +0200
Subject: [PATCH 12/20] Better detection of log to include merge labels

---
 build/makepack-dolibarr.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 80cc9b0856c..e0fa89d924d 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -366,7 +366,9 @@ if ($nboftargetok) {
 		}
 		else			# For a maintenance release
 		{
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			
 		}
 		print "\n";
 		if (! $ret)

From 5e2cc050472a98bd3b1517dfd0f896c645966a32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Sep 2017 11:12:47 +0200
Subject: [PATCH 13/20] Prepare 6.0.1

---
 ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index aafbbf5ff45..994e1702407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,48 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 6.0.1 compared to 6.0.* *****
+
+FIX: #7000 Dashboard link for late pending payment supplier invoices do not work
+FIX: #7325 Default VAT rate when editing template invoices is 0%
+FIX: #7330
+FIX: #7359
+FIX: #7367
+FIX: #7368
+FIX: #7391
+FIX: #7420
+FIX: Add some missing attributes in Adherent:makeSubstitution (type, phone…
+FIX: Bad const name
+FIX: Bad link to unpayed suppliers invoices
+FIX: Better protection to no send email when we change limit
+FIX: Calculation in the activity box
+FIX: Clean bad parameters when inserting line of template invoice
+FIX: dateSelector was not taken into account
+FIX: hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
+FIX: journalization for bank journal should not rely on a label.
+FIX: menu enty when url is external link
+FIX: missing supplier qty and supplier discount in available fields for product export.
+FIX: multicompany better accuracy in rounding and with revenue stamp.
+FIX: Must use pdf format page as default for merging PDF.
+FIX: PDF output was sharing 2 different currencies in same total
+FIX: Position of signature on strato template
+FIX: Protection to avoid to apply credit note discount > remain to pay
+FIX: Remove warning when using log into syslog
+FIX: Responsive
+FIX: Security fixes (filter onload js, less verbose error message in
+FIX: SEPA recording payment must save one payment in bank per customer
+FIX: Several problem with the last event box on project/tasks
+FIX: Sign of amount in origin currency on credit note created from lines
+FIX: Some page of admin were not responsive
+FIX: SQL injection
+FIX: time.php crashed without project id in param
+FIX: transfer of line extrafields from order to invoice
+FIX: Upgrade missing on field
+FIX: View of timespent for another user
+FIX: ODT generation
+FIX: CVE-2017-9840, CVE-2017-14238, CVE-2017-14239, CVE-2017-14240, CVE-2017-14241,
+     CVE-2017-14242 
+
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
 
 NEW: Add experimental BlockeLog module (to log business events in a non reversible log file).

From 77fea1983c14f3739cc0623472bdde6f52007857 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 20 Sep 2017 16:57:38 +0200
Subject: [PATCH 14/20] Fix: wrong supplier product price id

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 0c2c7044e5d..528e32fd4a4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1414,7 +1414,7 @@ class CommandeFournisseur extends CommonOrder
                             if ($remise_percent == 0 && $prod->remise_percent !=0)
                             	$remise_percent =$prod->remise_percent;
 
-				
+
                         }
                         if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
                         {
@@ -2678,14 +2678,14 @@ class CommandeFournisseur extends CommonOrder
                 if ($db->num_rows($query))
                 {
                     $obj = $db->fetch_object($query);
-    
+
                     $string = $langs->trans($obj->code);
                     if ($string == $obj->code)
                     {
                         $string = $obj->label != '-' ? $obj->label : '';
                     }
                     return $string;
-                }    
+                }
             }
             else dol_print_error($db);
         }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 56566438206..48a2e72661b 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -409,7 +409,7 @@ if (empty($reshook))
 	    			$localtax1_tx,
 	    			$localtax2_tx,
 	    			$idprod,
-	    			$productsupplier->id,
+	    			$productsupplier->product_fourn_price_id,
 	    			$productsupplier->fourn_ref,
 	    			$remise_percent,
 	    			'HT',
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a6a4ef25f09..05adfc1b5c5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1532,6 +1532,7 @@ class Product extends CommonObject
                     	$obj->price = $price_result;
                     }
                 }
+                $this->product_fourn_price_id = $obj->rowid;
 				$this->buyprice = $obj->price;                      // deprecated
 				$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product of supplier
 				$this->fourn_price_base_type = 'HT';                // Price base type
@@ -1577,6 +1578,7 @@ class Product extends CommonObject
 		                    	$obj->price = $price_result;
 		                    }
 		                }
+		                $this->product_fourn_price_id = $obj->rowid;
 						$this->buyprice = $obj->price;                      // deprecated
 						$this->fourn_qty = $obj->quantity;					// min quantity for price for a virtual supplier
 						$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product for a virtual supplier

From e61032a313ebfef3ed64a4749e9b30dab2d17400 Mon Sep 17 00:00:00 2001
From: tysauron <tysauron@gmail.com>
Date: Wed, 20 Sep 2017 00:53:48 +0200
Subject: [PATCH 15/20] Bug get socid with old object sosciete

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

diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 3d834fe28b6..6cdbc204749 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -397,7 +397,7 @@ if ($id > 0 || ! empty($ref))
 
 				print '<td colspan="1">';
 				$thirdpartyofproject=$projectstatic->getListContactId('thirdparty');
-				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
+				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->socid;
 				$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, '&withproject='.$withproject);
 				print '</td>';
 

From 03ffbe55ce6f6f696f915d770008cc842f3ec46c Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 21 Sep 2017 11:34:19 +0200
Subject: [PATCH 16/20] fix ressource list

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

diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index c4d783739c0..98efb786f72 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -237,7 +237,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['ty.label']['checked']))        print_liste_field_titre($arrayfields['ty.label']['label'],$_SERVER["PHP_SELF"],"t.code","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['ty.label']['checked']))        print_liste_field_titre($arrayfields['ty.label']['label'],$_SERVER["PHP_SELF"],"ty.label","",$param,"",$sortfield,$sortorder);
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {

From f985b1ede6919ae3c2790b33a40ec5a24ae2ae4b Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Fri, 22 Sep 2017 12:00:54 +0200
Subject: [PATCH 17/20] NEW GET lines of an invoice in the REST API

Adds the ability to get lines of an invoice using the REST API
---
 .../facture/class/api_invoices.class.php      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index f841fc80050..fc45d5fb246 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -276,6 +276,36 @@ class Invoices extends DolibarrApi
         );
     }
 
+    /**
+     * Get lines of an invoice
+     *
+     * @param int   $id             Id of invoice
+     *
+     * @url     GET {id}/lines
+     *
+     * @return array
+     */
+    function getLines($id) {
+      if(! DolibarrApiAccess::$user->rights->facture->lire) {
+                        throw new RestException(401);
+                  }
+
+      $result = $this->invoice->fetch($id);
+      if( ! $result ) {
+         throw new RestException(404, 'Invoice not found');
+      }
+
+                  if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+                          throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+      }
+      $this->invoice->getLinesArray();
+      $result = array();
+      foreach ($this->invoice->lines as $line) {
+        array_push($result,$this->_cleanObjectDatas($line));
+      }
+      return $result;
+    }
+
     /**
      * Validate an order
      *

From ad6778a1cff65e368f9907d2f0bd46cefdd233e0 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Fri, 22 Sep 2017 12:08:11 +0200
Subject: [PATCH 18/20] NEW post lines of an invoice using the REST API

Adds the ability to post a new lins in an invoice using the REST API
---
 .../facture/class/api_invoices.class.php      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index fc45d5fb246..c95ce6fd496 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -305,6 +305,75 @@ class Invoices extends DolibarrApi
       }
       return $result;
     }
+    
+        /**
+     * Add a line to given invoice
+     *
+     * @param int   $id             Id of invoice to update
+     * @param array $request_data   Orderline data
+     *
+     * @url     POST {id}/lines
+     *
+     * @return string
+     */
+    function postLine($id, $request_data = NULL) {
+      if(! DolibarrApiAccess::$user->rights->facture->creer) {
+                        throw new RestException(401);
+                  }
+
+      $result = $this->invoice->fetch($id);
+      if( ! $result ) {
+         throw new RestException(404, 'Invoice not found');
+      }
+
+      if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+                          throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+      }
+      
+      $request_data = (object) $request_data;  
+            
+      // Reset fk_parent_line for no child products and special product
+      if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
+              $request_data->fk_parent_line = 0;
+      }  
+        
+      $updateRes = $this->invoice->addline(
+                              $request_data->desc,
+                              $request_data->subprice,
+                              $request_data->qty,
+                              $request_data->tva_tx,
+                              $request_data->localtax1_tx,
+                              $request_data->localtax2_tx,
+                              $request_data->fk_product,
+                              $request_data->remise_percent,
+                              $request_data->date_start,
+                              $request_data->date_end,
+                              $request_data->fk_code_ventilation,
+                              $request_data->info_bits,
+                              $request_data->fk_remise_except,
+                              'HT',
+                              0,
+                              $request_data->product_type,
+                              $request_data->rang,
+                              $request_data->special_code,
+                              'facture',
+                              $id,
+                              $request_data->fk_parent_line,
+                              $request_data->fk_fournprice,
+                              $request_data->pa_ht,
+                              $request_data->label,
+                              $request_data->array_options,
+                              $request_data->situation_percent,
+                              $request_data->fk_prev_id,
+                              $request_data->fk_unit
+      );
+
+      if ($updateRes > 0) {
+        return $this->get($id)->line->rowid;
+
+      }
+      throw new RestException(400, 'Unable to insert the new line. Check your inputs.');
+    }
 
     /**
      * Validate an order

From 1aedc4a793673060d390718f3cebd9b164a49f13 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Fri, 22 Sep 2017 12:18:11 +0200
Subject: [PATCH 19/20] Change the term 'order' by 'invoice'

---
 htdocs/compta/facture/class/api_invoices.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index c95ce6fd496..c1f6b6fdd49 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -306,15 +306,15 @@ class Invoices extends DolibarrApi
       return $result;
     }
     
-        /**
+    /**
      * Add a line to given invoice
      *
-     * @param int   $id             Id of invoice to update
-     * @param array $request_data   Orderline data
+     * @param int   $id             Id of invoice
+     * @param array $request_data   Invoiceline data
      *
      * @url     POST {id}/lines
      *
-     * @return string
+     * @return int
      */
     function postLine($id, $request_data = NULL) {
       if(! DolibarrApiAccess::$user->rights->facture->creer) {

From 9498fca5e1ae2fa32bbf7ca3f79a55b93f44f1f9 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Fri, 22 Sep 2017 12:24:42 +0200
Subject: [PATCH 20/20] Add of implementation notes with an exemple

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index c1f6b6fdd49..03b6abde947 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -277,7 +277,7 @@ class Invoices extends DolibarrApi
     }
 
     /**
-     * Get lines of an invoice
+     * Get lines of a given invoice
      *
      * @param int   $id             Id of invoice
      *
@@ -307,7 +307,9 @@ class Invoices extends DolibarrApi
     }
     
     /**
-     * Add a line to given invoice
+     * Add a line to a given invoice
+     * 
+     * Exemple of POST query : { "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000", "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0,  "info_bits": "0", "fk_remise_except": null,  "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null, "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null }   
      *
      * @param int   $id             Id of invoice
      * @param array $request_data   Invoiceline data