From 72449ddef4be0bb5150eebc04c02ef02459b7e3f Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Fri, 15 Jun 2018 16:55:23 +0200
Subject: [PATCH 01/70] add hooks on stock replenish

---
 htdocs/product/stock/replenish.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 5a61e8b2a98..27a60b09257 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -43,6 +43,9 @@ if ($user->societe_id) {
 }
 $result=restrictedArea($user,'produit|service');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('stockreplenishlist', 'globalcard'));
+
 //checks if a product has been ordered
 
 $action = GETPOST('action','alpha');
@@ -87,6 +90,9 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 $usevirtualstock=0;
 if ($mode == 'virtual') $usevirtualstock=1;
 
+$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');
 
 /*
  * Actions
@@ -670,6 +676,11 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	}
 	$i++;
 }
+
+$parameters=array('sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print '</table>';
 print '</div>';
 

From 2cdae2ec98d09f15f9c5e18e658d183b82d77085 Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Mon, 18 Jun 2018 11:30:38 +0200
Subject: [PATCH 02/70] remove globalcard context

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 27a60b09257..b2386c4b8a1 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -44,7 +44,7 @@ if ($user->societe_id) {
 $result=restrictedArea($user,'produit|service');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('stockreplenishlist', 'globalcard'));
+$hookmanager->initHooks(array('stockreplenishlist'));
 
 //checks if a product has been ordered
 

From 0ee7befa1943b33ecd7ed506b002b42713df8bb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Aug 2018 13:27:49 +0200
Subject: [PATCH 03/70] Update replenish.php

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index b2386c4b8a1..7c5189d488b 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013		Cédric Salvador		<csalvador@gpcsolutions.fr>
- * Copyright (C) 2013-2016	Laurent Destaileur	<ely@users.sourceforge.net>
+ * Copyright (C) 2013-2018	Laurent Destaileur	<ely@users.sourceforge.net>
  * Copyright (C) 2014		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2016		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2016		ATM Consulting		<support@atm-consulting.fr>

From d6a9da57e11d64ecb68f21437c50fd2e0c0e7d44 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 1 Oct 2018 14:11:19 +0200
Subject: [PATCH 04/70] FIX : need to round with 2 decimals to avoid movements
 not correctly balanced

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 9dcb924779e..50af8a6855d 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -651,8 +651,8 @@ if ($action == 'create')
 					print "</tr>\n";
 				}
 
-				$total_debit = price2num($total_debit);
-				$total_credit = price2num($total_credit);
+				$total_debit = price2num($total_debit, 2);
+				$total_credit = price2num($total_credit, 2);
 
 				if ($total_debit != $total_credit)
 				{

From 2a7b3c7d7d327128f4b33acf4287185af501daa3 Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Mon, 14 Jan 2019 10:48:34 +0100
Subject: [PATCH 05/70] FIX : Check for old picture name if the new one was not
 found

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0097eb4715c..14dad44a89d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1783,6 +1783,12 @@ foreach($mainmenuusedarray as $val)
 			$found=1;
 			break;
 		}
+		else if (file_exists($dirroot."/".$val."/img/".$val.".png"))    // Retro compatibilité
+		{
+			$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+			$found=1;
+			break;
+		}
 	}
 	// Img file not found
 	if (! $found)

From 1cf786acff1dc3c31c0006e47238c349e5179fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Tue, 22 Jan 2019 00:09:36 +0100
Subject: [PATCH 06/70] Fix #10278

Fix #10278
---
 htdocs/core/class/commonobject.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 676e76fe16a..d8d27a0378a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4932,8 +4932,6 @@ abstract class CommonObject
 						$new_array_options[$key] = price2num($this->array_options[$key]);
 						break;
 					case 'date':
-						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
-						break;
 					case 'datetime':
 						// If data is a string instead of a timestamp, we convert it
 						if (! is_int($this->array_options[$key])) {

From 4624f1b1b84d036b6eac7ca9e747217affef2555 Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Wed, 6 Feb 2019 17:19:16 +0100
Subject: [PATCH 07/70] FIX positive values creating diff on addline rounding

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 086f154184d..a006b5391b1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1665,9 +1665,9 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->rang=$rang;
 			$this->line->info_bits=$info_bits;
 			$this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-			$this->line->total_tva=      $total_tva;
-			$this->line->total_localtax1=$total_localtax1;
-			$this->line->total_localtax2=$total_localtax2;
+			$this->line->total_tva=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
+			$this->line->total_localtax1=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1);
+			$this->line->total_localtax2=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2);
 			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
 			$this->line->special_code=$this->special_code;
 			$this->line->fk_parent_line=$this->fk_parent_line;
@@ -1837,11 +1837,11 @@ class FactureFournisseur extends CommonInvoice
 	    $line->localtax2_tx = $txlocaltax2;
 		$line->localtax1_type = $localtaxes_type[0];
 		$line->localtax2_type = $localtaxes_type[2];
-	    $line->total_ht = $total_ht;
-	    $line->total_tva = $total_tva;
+		$line->total_ht = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);
+		$line->total_tva = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
 	    $line->total_localtax1 = $total_localtax1;
 	    $line->total_localtax2 = $total_localtax2;
-	    $line->total_ttc = $total_ttc;
+	    $line->total_ttc = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
 	    $line->fk_product = $idproduct;
 	    $line->product_type = $product_type;
 	    $line->info_bits = $info_bits;

From 2142ccee8a6490257e06135d87aef8a6f38b7f94 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 8 Feb 2019 15:17:40 +0100
Subject: [PATCH 08/70] FIX : better method

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 50af8a6855d..67217954467 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -651,8 +651,8 @@ if ($action == 'create')
 					print "</tr>\n";
 				}
 
-				$total_debit = price2num($total_debit, 2);
-				$total_credit = price2num($total_credit, 2);
+				$total_debit = price2num($total_debit, 'MT');
+				$total_credit = price2num($total_credit, 'MT');
 
 				if ($total_debit != $total_credit)
 				{

From b017213131e278ab1603d0e1a78402bed704e100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 17 Feb 2019 20:59:39 +0100
Subject: [PATCH 09/70] selectMulticurrency avoid malformed empty value

---
 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 58df0ad4e22..c451a83a4fb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4517,7 +4517,7 @@ class Form
 
 		$out='';
 		$out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($useempty) $out .= '<option value=""></option>';
+		if ($useempty) $out .= '<option value="">&nbsp;</option>';
 		// If company current currency not in table, we add it into list. Should always be available.
 		if (! in_array($conf->currency, $TCurrency))
 		{

From 58d82eb4779d9adcd15397034ad1b71b18d7356c Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 21 Feb 2019 11:08:55 +0100
Subject: [PATCH 10/70] FIX : function sendEmailsReminder isn't completely
 developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it

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

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index fac49dcfcde..3ea0e397c92 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -194,7 +194,7 @@ print '</tr>'."\n";
 
 
 // AGENDA REMINDER EMAIL
-if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 {
 	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).'</td>'."\n";
@@ -211,7 +211,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 }
 
 // AGENDA REMINDER BROWSER
-if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 {
     print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";

From c38b0c4dbec7414a21f94f8457aa3495b3d1261f Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 22 Feb 2019 12:17:34 +0100
Subject: [PATCH 11/70] FIX fk_default_warehouse missing in group by

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

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 761cce030f7..77fd4b1aa69 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -499,7 +499,7 @@ if ($id > 0 || ! empty($ref)) {
 		$sql .= " WHERE l.fk_commande = " . $object->id;
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			$sql .= " AND l.product_type = 0";
-		$sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
+		$sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent, p.fk_default_warehouse"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
 		$sql .= " ORDER BY p.ref, p.label";
 
 		$resql = $db->query($sql);

From 0ea7bf3b0b6ee6c7419d3a1fe306987ac78628a7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 24 Feb 2019 08:21:56 +0100
Subject: [PATCH 12/70] FIX could not create several superadmin in transversal
 mode

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 6db383ed515..adcf094e7a4 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -855,7 +855,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print '<td>';
 		print $form->selectyesno('admin',GETPOST('admin'),1);
 
-		if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		if (! empty($conf->multicompany->enabled) && ! $user->entity)
 		{
 			if (! empty($conf->use_javascript_ajax))
 			{
@@ -1992,7 +1992,7 @@ else
 				{
 					print $form->selectyesno('admin',$object->admin,1);
 
-					if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+					if (! empty($conf->multicompany->enabled) && ! $user->entity)
 					{
 						if ($conf->use_javascript_ajax)
 						{

From 435b416f939b7d906abb246c711acca8a8d25914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 24 Feb 2019 11:50:06 +0100
Subject: [PATCH 13/70] fix #10656

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 98a6956a809..4d2c81dbbfa 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -387,6 +387,7 @@ if (! $search_all)
 	$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,';
+    $sql .= ' p.title,';
 	$sql.= " typent.code,";
 	$sql.= " state.code_departement, state.nom,";
 	$sql.= ' country.code,';

From ca2eba866c641d799f378a834ef99ccd652f9179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 24 Feb 2019 11:56:17 +0100
Subject: [PATCH 14/70] Update list.php

---
 htdocs/fourn/facture/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 4d2c81dbbfa..4b208a99af7 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -387,11 +387,10 @@ if (! $search_all)
 	$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,';
-    $sql .= ' p.title,';
 	$sql.= " typent.code,";
 	$sql.= " state.code_departement, state.nom,";
 	$sql.= ' country.code,';
-	$sql.= " p.rowid, p.ref";
+	$sql.= " p.rowid, p.ref, p.title";
 
 	foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
 	{

From 2ad91213b2dd5c2bcd136b51f8a281f688df6378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 24 Feb 2019 12:09:57 +0100
Subject: [PATCH 15/70] Update combinations.php

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

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 04f53e55d21..8c8f669c0e0 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016	Marcos García	      <marcosgdf@gmail.com>
  * Copyright (C) 2017	Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,9 +31,9 @@ $langs->load("other");
 $var = false;
 $id = GETPOST('id', 'int');
 $valueid = GETPOST('valueid', 'int');
-$ref = GETPOST('ref');
-$weight_impact = (float) GETPOST('weight_impact');
-$price_impact = (float) GETPOST('price_impact');
+$ref = GETPOST('ref', 'alpha');
+$weight_impact = GETPOST('weight_impact', 'alpha');
+$price_impact = GETPOST('price_impact', 'alpha');
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
 $form = new Form($db);
 

From 2f300ae63ffa4e7adb3547da9f205db7a676a4b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 Feb 2019 20:26:54 +0100
Subject: [PATCH 16/70] Standardize code with customer invoices

---
 .../fourn/class/fournisseur.facture.class.php | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a006b5391b1..5cc47d5201a 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1646,29 +1646,33 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->fk_facture_fourn=$this->id;
 			//$this->line->label=$label;	// deprecated
 			$this->line->desc=$desc;
-			$this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
 			$this->line->ref_supplier=$ref_supplier;
 
+			$this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	     // For credit note, quantity is always positive and unit price negative
+			$this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht);  // For credit note, unit price always negative, always positive otherwise
+
 			$this->line->vat_src_code=$vat_src_code;
 			$this->line->tva_tx=$txtva;
 			$this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
 			$this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
 			$this->line->localtax1_type = $localtaxes_type[0];
 			$this->line->localtax2_type = $localtaxes_type[2];
-			$this->line->fk_product=$fk_product;
-			$this->line->product_type=$type;
-			$this->line->remise_percent=$remise_percent;
-			$this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
-			$this->line->date_start=$date_start;
-			$this->line->date_end=$date_end;
-			$this->line->ventil=$ventil;
-			$this->line->rang=$rang;
-			$this->line->info_bits=$info_bits;
+
 			$this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
 			$this->line->total_tva=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
 			$this->line->total_localtax1=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1);
 			$this->line->total_localtax2=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2);
 			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+
+			$this->line->fk_product=$fk_product;
+			$this->line->product_type=$type;
+			$this->line->remise_percent=$remise_percent;
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
+			$this->line->ventil=$ventil;
+			$this->line->rang=$rang;
+			$this->line->info_bits=$info_bits;
+
 			$this->line->special_code=$this->special_code;
 			$this->line->fk_parent_line=$this->fk_parent_line;
 			$this->line->origin=$this->origin;

From 49e03b009f72660f90235c464b346c387186ea72 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 27 Feb 2019 14:50:01 +0100
Subject: [PATCH 17/70] FIX : if empty error message, we just see "error"
 displayed

---
 htdocs/core/modules/mailings/xinputfile.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 152322c2899..a026d4b53cf 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -179,7 +179,8 @@ class mailing_xinputfile extends MailingTargets
 					        {
 					        	$i++;
 					        	$langs->load("errors");
-					        	$this->error = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
+							$msg = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
+					        	if(!empty($msg)) $this->error = $msg;
 					        }
 				        }
 				    }

From 1237a6d3e9909d1b9b39c373d991c800f09621a0 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 27 Feb 2019 14:58:10 +0100
Subject: [PATCH 18/70] FIX : same thing here

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

diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 1a97f3502b7..9fb14fe1f1d 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -188,8 +188,8 @@ class MailingTargets    // This can't be abstract as it is used for some method
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{
         				// Si erreur autre que doublon
-        				dol_syslog($this->db->error());
-        				$this->error=$this->db->error();
+        				dol_syslog($this->db->error().' : '.$targetarray['email']);
+        				$this->error=$this->db->error().' : '.$targetarray['email'];
         				$this->db->rollback();
         				return -1;
         			}

From 4ebf4780c2d684a5c1672e7baf766f28367e757e Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Thu, 28 Feb 2019 09:09:06 +0100
Subject: [PATCH 19/70] fix relative discount for prospect and supplier

---
 htdocs/comm/remise.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 6f3287b8831..7cc675b1816 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -165,11 +165,15 @@ if ($socid > 0)
 
 	print '<table class="border centpercent">';
 
-	if($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>';
-		print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td><td>';
+		if ($isCustomer) {
+			print '<input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+		}
+		if ($isSupplier) {
+			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>';
 	}
 

From 85d46a5270198d12bb6e7a458ab71a9dcc47ff1e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 28 Feb 2019 11:24:07 +0100
Subject: [PATCH 20/70] Update xinputfile.modules.php

---
 htdocs/core/modules/mailings/xinputfile.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index a026d4b53cf..e636c4885c7 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -180,7 +180,8 @@ class mailing_xinputfile extends MailingTargets
 					        	$i++;
 					        	$langs->load("errors");
 							$msg = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
-					        	if(!empty($msg)) $this->error = $msg;
+					        	if (!empty($msg)) $this->error = $msg;
+							else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email;	// We experience case where $langs->trans return an empty string.
 					        }
 				        }
 				    }

From cefaeb583ff12ad09c836fcbf6b39d01209e901b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 28 Feb 2019 11:24:43 +0100
Subject: [PATCH 21/70] Update xinputfile.modules.php

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

diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index e636c4885c7..1453f247d28 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -179,7 +179,7 @@ class mailing_xinputfile extends MailingTargets
 					        {
 					        	$i++;
 					        	$langs->load("errors");
-							$msg = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
+							$msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
 					        	if (!empty($msg)) $this->error = $msg;
 							else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email;	// We experience case where $langs->trans return an empty string.
 					        }

From 855aaaffd8f2a6df7e93019b6fa2ad68ca777a0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 28 Feb 2019 11:44:10 +0100
Subject: [PATCH 22/70] Better fix for type of discount

---
 htdocs/comm/card.php   | 63 +++++++++++++++++++++++-------------------
 htdocs/comm/remise.php | 31 +++++++++++----------
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 2cf3c120af6..be60c4fa574 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -377,38 +377,43 @@ if ($object->id > 0)
 		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_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':'').'</td>';
-	print '</tr>';
+	$isCustomer = ($object->client == 1 || $object->client == 3);
 
-	// 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)
+	// Relative discounts (Discounts-Drawbacks-Rebates)
+	if ($isCustomer)
 	{
-		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 '<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_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':'').'</td>';
+    	print '</tr>';
+
+    	// Absolute discounts (Discounts-Drawbacks-Rebates)
+    	print '<tr><td class="nowrap">';
+    	print '<table width="100%" class="nobordernopadding">';
+    	print '<tr><td class="nowrap">';
+    	print $langs->trans("CustomerAbsoluteDiscountShort");
+    	print '<td><td 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();
+    	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 '</td></tr></table>';
-	print '</td>';
-	print '<td>';
-	$amount_discount=$object->getAvailableDiscounts();
-	if ($amount_discount < 0) dol_print_error($db,$object->error);
-	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount,1,$langs,1,-1,-1,$conf->currency).'</a>';
-	//else print $langs->trans("DiscountNone");
-	print '</td>';
-	print '</tr>';
 
 	// Max outstanding bill
 	if ($object->client)
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 7cc675b1816..13e4f13ec3d 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -106,7 +106,7 @@ if ($socid > 0)
 
 	$head = societe_prepare_head($object);
 
-	$isCustomer = $object->client == 1 || $object->client == 3;
+	$isCustomer = ($object->client == 1 || $object->client == 3);
 	$isSupplier = $object->fournisseur == 1;
 
 	print '<form method="POST" action="remise.php?id='.$object->id.'">';
@@ -122,7 +122,7 @@ if ($socid > 0)
 
     print '<div class="underbanner clearboth"></div>';
 
-    if(! $isCustomer && ! $isSupplier) {
+    if (! $isCustomer && ! $isSupplier) {
     	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
     	dol_fiche_end();
@@ -136,13 +136,13 @@ if ($socid > 0)
 
 	print '<table class="border centpercent">';
 
-	if($isCustomer) {
+	if ($isCustomer) {
 		// Customer discount
 		print '<tr><td class="titlefield">';
 		print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";
 	}
 
-	if($isSupplier) {
+	if ($isSupplier) {
 		// Supplier discount
 		print '<tr><td class="titlefield">';
 		print $langs->trans("SupplierRelativeDiscount").'</td><td>'.price2num($object->remise_supplier_percent)."%</td></tr>";
@@ -155,24 +155,27 @@ if ($socid > 0)
 
 	print '<div class="underbanner clearboth"></div>';
 
-	if($isCustomer && ! $isSupplier) {
-		print '<input type="hidden" name="discount_type" value="0" />';
-	}
-
-	if(! $isCustomer && $isSupplier) {
-		print '<input type="hidden" name="discount_type" value="1" />';
-	}
+	/*if (! ($isCustomer && $isSupplier))
+	{
+	    if ($isCustomer && ! $isSupplier) {
+	        print '<input type="hidden" name="discount_type" value="0" />';
+	    }
+	    if (! $isCustomer && $isSupplier) {
+	        print '<input type="hidden" name="discount_type" value="1" />';
+	    }
+	}*/
 
 	print '<table class="border centpercent">';
 
-	if($isCustomer || $isSupplier) {
+	if ($isCustomer || $isSupplier)
+	{
 		// Discount type
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td><td>';
 		if ($isCustomer) {
-			print '<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_0" checked value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 		}
 		if ($isSupplier) {
-			print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+		    print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer?'':' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 		}
 		print '</td></tr>';
 	}

From 786c1140267c6c6977f7c636a7c15b035fa2876c Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 28 Feb 2019 16:13:45 +0100
Subject: [PATCH 23/70] FIX : project_title for display of getNomUrl()

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d26c950d4fe..0c0a9d6583b 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -482,7 +482,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " cf.rowid, cf.ref, cf.ref_supplier, cf.fk_statut, cf.billed, cf.total_ht, cf.tva as total_tva, cf.total_ttc, cf.fk_user_author, cf.date_commande as date_commande, cf.date_livraison as date_delivery,";
 $sql.= ' cf.date_creation as date_creation, cf.tms as date_update,';
-$sql.= " p.rowid as project_id, p.ref as project_ref,";
+$sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_title,";
 $sql.= " u.firstname, u.lastname, u.photo, u.login";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
@@ -988,6 +988,7 @@ if ($resql)
 		{
 			$projectstatic->id=$obj->project_id;
 			$projectstatic->ref=$obj->project_ref;
+			$projectstatic->title=$obj->project_title;
 			print '<td>';
 			if ($obj->project_id > 0) print $projectstatic->getNomUrl(1);
 			print '</td>';

From b96ac794e9f69b1d22690ea4df34c895db7beee7 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Thu, 28 Feb 2019 16:15:32 +0100
Subject: [PATCH 24/70] FIX: actioncomm export: ORDER BY clause is in wrong
 export property + event type filter does not work

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

diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 6c8fda578f2..75630b4895a 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -395,7 +395,7 @@ class modAgenda extends DolibarrModules
 		$this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
 			'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Numeric",
 			'ac.durationp'=>"Duree",
-			'cac.libelle'=>"List:c_actioncomm:libelle:id",
+			'cac.libelle'=>"List:c_actioncomm:libelle:libelle",
 			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
 			'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text',
 			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
@@ -417,7 +417,7 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
 		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
-		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
+		$this->export_sql_order[$r] .=' ORDER BY ac.datep';
 
 	}
 

From 3037e4a15730bd5f632f9902df631786123e64bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:49:53 +0100
Subject: [PATCH 25/70] Update DolibarrModules.class.php

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

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0140f850e34..9b9ed4f7a60 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -895,6 +895,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	{
 		global $conf;
 
+        $err = 0;
+
 		$sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
 		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
 		$sql.= " AND entity IN (0, ".$conf->entity.")";
@@ -921,6 +923,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	{
 		global $conf;
 
+        $err = 0;
+
 		$sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
 		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
 		$sql.= " AND entity IN (0, ".$conf->entity.")";

From 526bd1d02e28995e5485769f80df60c282c2515d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2019 17:36:43 +0100
Subject: [PATCH 26/70] Fix number format

---
 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 5dca091c56b..cdbc49da21e 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -509,7 +509,7 @@ else
 					print '<td>'.$objp->produit.'</td>';
 
 					print '<td align="right">';
-					$valtoshow=price2num($objp->value, 'MS');
+					$valtoshow=price(price2num($objp->value, 'MS'), 0, '', 0, 0);  // TODO replace with a qty() function
 					print empty($valtoshow)?'0':$valtoshow;
 					print '</td>';
 					$totalunit+=$objp->value;

From dada8c8ff57ce95538bda83a0074b585dbe5ad1c Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 4 Mar 2019 17:23:29 +0100
Subject: [PATCH 27/70] FIX : wrong redirect link on holiday refuse

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index be61223d704..b69f6fb185b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -568,7 +568,7 @@ if ($action == 'confirm_refuse')
         }
 
     } else {
-        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&error=NoMotifRefuse');
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'&error=NoMotifRefuse');
         exit;
     }
 }

From 54b9681257171e9c15215290f71295bb09384344 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2019 20:15:31 +0100
Subject: [PATCH 28/70] More log to help debug

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

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 25d5f2dc30c..eede3bf2ee6 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -80,7 +80,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (! in_array($cryptType, array('md5'))) $cryptType='md5';
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
@@ -109,8 +109,9 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				}
 				else
 				{
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
-					sleep(2);      // Anti brut force protection
+				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."', cryptType=".$cryptType);
+				    //dol_syslog("passclear=".$passclear." passtyped=".$passtyped." passcrypted=".$passcrypted);
+				    sleep(2);      // Anti brut force protection
 					$langs->load('main');
 					$langs->load('errors');
 					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

From 1bbf6737ecbf48948cb2c70f52a0ab513d2e3455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 Mar 2019 15:27:31 +0100
Subject: [PATCH 29/70] add session newtoken

---
 htdocs/exports/export.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index ec11f9c1771..6888f638a27 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -761,6 +761,7 @@ if ($step == 3 && $datatoexport)
 
 	// un formulaire en plus pour recuperer les filtres
 	print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';

From 0ff29051802d477a47071e75d5ebba9744b48f99 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 6 Mar 2019 12:10:24 +0100
Subject: [PATCH 30/70] FIX : we need to keep originline special_code

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 309230a4dcc..b0351252c0b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1386,7 +1386,7 @@ class FactureFournisseur extends CommonInvoice
      *
      *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
      */
-    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0, $ref_supplier='')
+    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0, $ref_supplier='', $special_code='')
     {
         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';
@@ -1481,7 +1481,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->total_localtax1=$total_localtax1;
 			$this->line->total_localtax2=$total_localtax2;
 			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
-			$this->line->special_code=$this->special_code;
+			$this->line->special_code=!empty($special_code) ? $special_code : $this->special_code;
 			$this->line->fk_parent_line=$this->fk_parent_line;
 			$this->line->origin=$this->origin;
 			$this->line->origin_id=$origin_id;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cc9164b753f..3e7df0b27f3 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -716,7 +716,10 @@ if (empty($reshook))
 									0,
 									$lines[$i]->array_options,
 									$lines[$i]->fk_unit,
-									$lines[$i]->id
+									$lines[$i]->id,
+									0,
+									'',
+									$lines[$i]->special_code
 								);
 
 								if ($result < 0)

From 96b8da0d6247fd0d12f77f71ba664e2dc485dee2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 6 Mar 2019 22:04:01 +0100
Subject: [PATCH 31/70] fix supllier discount

---
 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 61818d4deb9..d598c18a33e 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -268,7 +268,7 @@ else {
 		    }
 		    else
 		    {
-		        $ajaxoptions = array();
+		        $ajaxoptions = array('update' => array('remise_percent' => 'discount'));
 		        $alsoproductwithnosupplierprice=1;
 		    }
 

From e3fb228a4d148265945c5a0008019f9534b18221 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2019 12:28:19 +0100
Subject: [PATCH 32/70] Update fournisseur.facture.class.php

---
 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 b0351252c0b..4642c0bf753 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1481,7 +1481,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->total_localtax1=$total_localtax1;
 			$this->line->total_localtax2=$total_localtax2;
 			$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
-			$this->line->special_code=!empty($special_code) ? $special_code : $this->special_code;
+			$this->line->special_code=((string) $special_code != '' ? $special_code : $this->special_code);
 			$this->line->fk_parent_line=$this->fk_parent_line;
 			$this->line->origin=$this->origin;
 			$this->line->origin_id=$origin_id;

From 0349f9bfaae2331f818d3c97f7a13aa15af88457 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2019 13:26:25 +0100
Subject: [PATCH 33/70] Update objectline_create.tpl.php

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d598c18a33e..73d06b3e0aa 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -260,15 +260,17 @@ else {
 		    if ($senderissupplier != 2)
 		    {
     			$ajaxoptions=array(
-    					'update' => array('qty'=>'qty','remise_percent' => 'discount','idprod' => 'idprod'),	// html id tags that will be edited with which ajax json response key
-    					'option_disabled' => 'idthatdoesnotexists',					// html id to disable once select is done
-    					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
+    					'update' => array('qty'=>'qty','remise_percent' => 'discount','idprod' => 'idprod'),	// html id tags that will be edited with each ajax json response key
+    					'option_disabled' => 'idthatdoesnotexists',						// html id to disable once select is done
+    					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") 				// translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
     			);
     			$alsoproductwithnosupplierprice=0;
 		    }
 		    else
 		    {
-		        $ajaxoptions = array('update' => array('remise_percent' => 'discount'));
+		        $ajaxoptions = array(
+				'update' => array('remise_percent' => 'discount')				// html id tags that will be edited with each ajax json response key
+			);
 		        $alsoproductwithnosupplierprice=1;
 		    }
 

From 9a9fd15077dfe3eacac754f537ffeda956601747 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2019 14:10:33 +0100
Subject: [PATCH 34/70] Fix doxygen

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d08e8efd919..3a27690e7ac 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1501,6 +1501,7 @@ class FactureFournisseur extends CommonInvoice
      *  @param      int     $origin_id          id origin document
 	 *  @param		double	$pu_ht_devise		Amount in currency
 	 *  @param		string	$ref_supplier		Supplier ref
+     *  @param      string  $special_code       Special code
      *	@return    	int             			>0 if OK, <0 if KO
      */
     public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0, $ref_supplier='', $special_code='')

From d92665753495b317e5b8b05addd35a1f82c316be Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 8 Mar 2019 10:57:14 +0100
Subject: [PATCH 35/70] FIX: Accountancy - Format EBP import

Add doc
---
 .../iso-normes/Accountancy-format_Ebp_txt.pdf   | Bin 0 -> 18984 bytes
 .../class/accountancyexport.class.php           |  11 ++++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf

diff --git a/dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf b/dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..24e6fca05e972989f059b0853f8215b3fc1048d8
GIT binary patch
literal 18984
zcmeIaby!s07C%l1N+YEr;E>WY3@{AcNJ~jK3?U6eDo81<NOyO4w{%EKNvD*Ebov|g
z4d3^A-+O=0^Zh>0_m9f~POZK6+Ml)7-utX`)}~bulVD+E<;0;~S{@w5!348`0U&^l
z;ZqzwKA^0*HO#=?+zn<7U<1km*r41{4&Y+|n2iG{4q#*B-~s{V5qDG&cOVcppd>&G
zzyW0kut6X?0s=TNYvXG^fWQ49>HtIjtV0ZDWMd3dFtE3BK-4H|W9evR?Ev5aD%it}
z&5htT_5e1pfB;a!+!7A62TE8Pz+pd%0HwsV_(a6T#YCV`5IeU7n45zG$}J`W5)o$;
z6BT6_hj5CC3-GavNU(uKAY5#sA|et{4zREox45`Cx0tYqFefJ`ltVxVC}nL7bJ4nP
zIT(C>W@3YAA{#<PC7>+K+7xaE;NrZN$LV`J!9XP&8#sc3{X2y+0v-UEodc-iY6}CZ
zE5S^FYFcanFn|q#fdkwgW?+SbX*OqQXpFC~Z>XPlgCKYSAVMw)GDXH95yvmR)BfSc
zZC)W?EdP@mR7KwYYC_&jn3CH3JuU6sq1eW3Adn&L75mo<^jjb#1{W*>983hRzw!MI
zVF$Q@J>10}W`ctW!oj4a6@M&&gZVq^2)Nm=CH+mMq5vrPmtX?eKpej}7YYI@1K6Q|
zkzZeb!9ZVM+6W0{KomR2^R~anT_|a2hf7L~m*PE1-r6m}xXe)K6R9r^6-#?PXtwS=
z>z*9!sHhVdHS!R2^y6844GAkxBvd5HG_2rXG~x%Izey=)U~h4)2ZTjjA0q4zZtn;~
zn1LJ&ZeVNxHvn*a2VcR!6eernYU2n8KDLJaFdpFbMF)g_KtJ?@C}{*&v4_FFs}1`7
z;&)w%BKTO^nEq+02)q6XC>v`y%o^^1u#0PJRYEZ2`fdN62jZOj$2s_WMF`vZZZe4d
zwFe>S!QTx;2PkT9V=H3gq6K0_5F-9Kxj9+c!2l=+8!I=$-sBK=ZtxHH5w3xd<B#?z
z!5nNH?Tui+d5ev`vaNv;?AmpdL5MoP%ZNBeSRnYjoY%gCXbOTrMFl~?{sR>i6$Al7
z2!x;lh#!PW!x4@JK<NEDTtDh`K%9R^>Kf6XVd6xT`%P27@Jk7Edj~jx1M<5yadANr
z-2~(ZtH*{<mEl%DTh`c<d5e!A{42GC8h)alGUFZvOu4F(HdP72ap4W0=$Q7<$quKf
zv-#c6%nZ^b)fRf46aw%jy}EGu<V+4(5Ce;hy}EsrCY|z-G3K~0EvBGSPZ)Ff_G>-4
z?C>-uwS|1Zm$fUQOesf?_rQ9X#xe8lwlC&;Uvdk^<CBCjuTsfmO&MZLJ{r!Js_bbf
zABRirZ+(_Ejk1)*q@-`<*D&oUnigo(QmHR9npl18G`byl#y?dQq|?)bf<E#h@r6dH
z`CK)udFIPj)-17>(kyNVJ>|(0J<I%6SmRuj>=#$P&rNJhCrcZtG-}LMg%oF5tMfW|
z(o;cLpYXLLq6yDE3Ze({@+K~-@_<`KnDga%J7*hNW(MW&4&Vp2P8SY~d>P}<uTIjt
zlt^}rq&Q!;0S@!#;m)1vM?lI-ee<|B1I?_(CVY~n;i$>hSAhGkBlf$V#JTs&2<d(G
zBcqUJi0bpb$6!!~?X^N<plM1&or4~KGu{#0c5cAjYj#{k_VwAlLlv$up-U6)58~jH
zRI=jK^%|##@r3T@q|5B7X9>aF#0lAA_f!j0D0U2IW8Ip?$Y?2uhR8kikM9bTZ@5?N
z`sO*uGT`HI>(ZhxeOP+CX}}Z#tGH~96eo_s)*5WP>p~tG%!5`tJaKCA<p~eY%eMk{
zU1`S(!^GsM_cKd9C5(I%aE<oh7gH`Cd_%UJ4?UkHkDS~2cNr2fzSuCIA-s>)6gg#a
zs`}t-VgFobwQ0CXz1v&(z^x5B^CP~kr~AxXXS4HSjbGx=-{h)Ukgs`B6oj}i^2t)q
z^*2(!x&6#j;Ia6^`<C#}t*2CPIX(@02UoS^p6p!C7zOStP}_~fJg<}!F_>1o|F&4m
z$lc$r%(1N6?{1g%oRe&mIWABQQ?rujVGq|#3;ijsZ{T(i3wf!HKaa`0unWs&ufInm
zCFWuHg5%(DvFcK&$Ee_j+M{TAu&vM4#I|sV*e&6QCS*Z})b`ll;vd}CIykksBJW#1
zosg4m5kNmVu155U=H|YLF8g0P_8(o(zxTA?Mkj74<WGl^3<y@$u^9ysx$hR&*vQZ>
zO}}2IAz1PP)8I==_I+HStf0Vlw9=Sv9bET-%1=}h$3<~ZG<8j^QzTnDmG6vyIXm3m
zzj(*{1*gGv|7ezs&gNr}rANBKu#YO_ipSHVG^u}D)yM0|I?N)o^5qd;j1ngW$5nSX
zk>)9Bo^*b%=sBo%V9qA1wvQs)HI`pCq^E9{qnKS?>0mRdlWcC}nfB9i@_rX${x-cp
zib0vHi8Kx@%$ePzciNw_YX|h%2AHIUEN4<~d+Hn~UKK2ndN+4Q?3TT&K3ZO>OT_m3
zQpw0iB%aEchWy}-fqfSlE#m<LNrJQFv?Pl4*cH{v*5KP^V8AnW1wliKcT-tP6nP_z
zS`S)ok0Xc53GLs1hZ9lNq06$6Vj*Gv@cx&agI=RX@j`7DxpT1<o!eHEsfK_ds^lom
z0Gt#MCr0ulAgDace^f3(XX(CCJF5X{`c9T()dNoy&gSf!a3WvcK<ir}>#ke!NX6N>
zTCiGzTM0CT6%VaO6wSmb=ls<a$eKvxMdMb|cyvWLUzIB5=_lqb5C<jG0GYY@0!?1&
z>`i9*i*`&8i?K7Mf%4#DcJ+LtMTTY*0aq(*{9L^eQJ@@Z+(`Gh#JzSg7V;WDP+57(
zB3;sUfIVu6Q`i$MGI2M29w_C4u3TD6JI-BI|4(T43rJPDj76So#t(8a@=X`csf!Af
z$5r0uC)Dr=2dKVefDIIK6s}+98eC!>JyC>2cRQn=))uPF-Zhzy-N#sMT_tcf)*H){
zpEFCN)bC*Z@cE>!7Ct-UGRrr&33gjas4MBj6-0Y3CQlCjpm2BI4a#Gf+nZMd7fXIk
zFQXyz`QmId*quy$_8V!yqveVoN$v4g$n25d3Ijcc+%cpD^YLKn10VcV2?^dBdJ(wS
zdi!0tlnr|3_NQ{xK2Jd7WYj}{uvR!#$BVe&9k0dC$b-w4_*aLj_XJTqq!o69C#4i=
zi5JTv_A$+B(l9(gPARdvvTvWJzKRPT_G0rGI(K`gp#3D=?sd)?yn0jS^KFK^oN_4p
z_fFN1dB2h_)IOn57?himc(|TV)~Q9I4`k{QUogIs`dCcsp3JxO5*8=@<RFnBIJ~x$
zN_+WbXc#OG)j4}L+>ATmP%r2ZX5_d0m^d*|zm7(PO}naDUZvL9&CNwRtmB1jh0thH
ze#X+BIoPmrL9>|8aQd^JrFXmSWO$e5>5Lw`qD1zD)CJ2d%o<JwlRH@tR?z#H;^vB1
zL(m#D%Asgx5Ae2a&Br$6Rg$y<*st~urKLL!cZT#&9=0IKy;M8+We0IR-v7rA0{Yhu
zA|tBD`lAr`t6ewDxjb$&zMyfcTSHKWp)@p26(Kw+yu1QS{~emL`UZEY*O0!_P!7LI
zBOJerQyeL@mYZ+q-At3$7Y3SIhKH{^3I;QruC9mKCkj%T*ekR*1~$2FNJxd>y;U)m
z`s(>&;(4;zC$$p%&SDDjwPIU4YLqQC5sPn%H#+^kYMO1`kx6C$Msb{)$7PIi7zLTU
zP^(7ak-VA<y(GD_QtmzHy`()1oNidwSGwpHbPHTzRLV0lx0Kj==?qXDr6c9&jCf+K
zt-33=Vk4u}tkb&GCP8XsnBz|*CXf|Y^Pv-M&Xl+(gV^@7T0%~GYYzRRNqEB50{d}L
zx!zmO?D??iDs=1x`3!5taL2uHwhS@k%QsSHxl3kYzT{z&PoOpPs1Mr$s1(V&N2~ar
z%GUu(S^G%qHWw}|7=!Y*abi4W64`xZR+=TK>z=V@7?vlS#cdd*Wk@}=^jtCo^Bm6`
zDrCU>^iIq}nzc!&0MXQMRO!^Wl~>YoO@`kF8`aM<S2C@(J+aoi$ElDyD(B#>0>8LG
zN9N<;#i?~0uo`A#3=&^|^`1M&)<6{P@_pS_O4HYrX}FwP(Z|VSD<iwr>gu+n+LZ*;
z&#m6Z27d8bP8(*6jEz<+67Y`d{wE4`^UFn*swQ?|DZV7CxrF%#k2$59O>3F06av%V
zTN1LyhUat8A+zo$jq41Ce$}k@DQ=ExOf{|rWR1w2saEJ5)}*e;lR=}M)a$k%<4u_q
z?pR*Q32USSXhkn%kT>mD2fk{f^3)i2))`rH`zb7Wwh#_52Eu}qb0D&mdQ^MIP@V~E
zSqqfAR939qvjYMNTCyr%azsT5_m`Q3_c@(D-rt79-+p}`mcsMwUD4*lx)*gCA)8Y?
zMs&m>@(HWFesvRzK7P4$Y`#)7g<j0zpODuxr58)THofcR?Fq<n5_?4BN)&5CWWG<-
z!x0fRlMTiu@2S0|^o{fpAu;oNlQhpu@qqN+;^GL7*Tr(136&_M^rr$npFc>EazqN{
z3o~`-0T;bX<8PA-bcmatJnq7c);13GACd_@2X){jJQM{ND{)5Y2WN&43LE*EVFz~0
z=2HdecG8;b=~PUv8xl0_l7n8nMT?XSrKyKr>GePho=lYs`HJF?ZwkAlyO_ZV7LpO8
zyVHF+wqH8$^#uJtIxpAH4`Px58LD!RKMLVDo~!j29#O_$9%+h@-6GQr$Rmz&qvuaS
zdcwFQL@?GoA6q%0!E5n0N5l@&&_D4p))n~#S<dN+>3&C|=PE9=#d^wkzm5cu;_)83
ztS#E;tKocxCBn{Udtvc7Z$#Fcm3-8{xIFnZ&GytJ<c%X`??vvAt8&cqH@kTGR+MO0
zTWXiI^||G{Q(9RO`o!EIS*g$&aK5m5C%I*E*&6~f({!0Wc!V6T_@$r7><lZ?atPVI
zKJ3n-8>Du0AOQz~&klIzbe2J<k6J)IxcQ8#ohd>pQ{A~j#hK(@jaqEr53DKP4kWx$
zMB_N+I3CZKBU!!pRi85MArX8-Ew-!UkCBZYqS&@(rII?8kqp0Ig5eZ!sstW2Xk*Lv
zyFsCF`<<6xg&n<V8`L-wlJvqSDCl%&X`fRPH9A^tVp7p2f~71oB#qVV*<#MKt+?#9
zo~*SVm9dsAnmZl|O-nShGJROF@2KSn8~BFGbG}9s3wTh^VM}ZlM0D=GEc2i^$9_dk
zRIZPTMHIoBg(qE@|2{AfCX*QG*0f6~NunB-AG5|g{kS6Esf5M%;F*Qr*yqda4+Mgr
z-&z?yA8oh%rnji1=CSfPr9OBgOX7H9<z3X8u|SxNHr3@gdFAYR-1uQ57$tvx$>Q)x
z;8O*A8FU1P!H+T<%h_&G7&slO>}Ds=PM@jV;TNmLDYJ>h*lc7t8+iAqH;HHMr9|n}
z(A|*@V!Wh$a=y0)sB<36g}TR5d%UGF={l)U8C<z+r&+p6Vh5wvPc+zS<kk&7z5$C-
zJ1kwKSvn>BIT3e@7F5RM12p@52m%(}<Ry06vp7TAC9s{3#R|oI77OA?B2eRqA}Z{<
zUD}{Dk&xF~4Lk%yv>RIwtadf#=i#BF-f7sgu{NK#{0t@fEZ0f`_HMj^U-&i;LyF;F
zbp+DAk}H{pUpPMTA70{R8eV=m51v>@`*!0ll1>nt`7a&i`bqmgItm2L`SUcmAWH7>
zeK!18yH~^x2NX+_M#U3Ml(;n4t|G~FDD+GSA2%n|J7+q1KK9Uhsl=&1fH9+_XXTLh
zLDD1SPzA>~OJ#)7YE1ZjgSJjp4Vv!iJ|Ap7JW8|hiaUZpm1-0T;xPQ+@!k=^Vz}o-
z$O+2eQW{}j(WrjPGyG159idUZ=U~VDp|=gHtU|{$84t9-y_=e2l6}KUVm#s<Dyv1N
z6MqJLjaA5T&(Rsgcj0|31t9(;8rBh_J+F%Oa6V5wG=5X-*skE{)^dQ%r)HjPRauM5
zahj-{+}Y2!v@B)~?EI=GyczR0T<)0R*HtTotfxPKis=@OGeXU@KD67!++FR_N~V{i
zS_PcqXg1xssri}OG}2*pQho|bERwh4L`JWyhWj}~G@roA%E!J)ov9jGt0?zPY)dv-
zMBSS>4nEcJJ8$mYX*W`GwR2<Hc45(lYDv%B8<6Vi>DNK-FGR9J%G77(s@L-*p8vMv
zu8rj8+tu66(tLT^yPJHvS7rb8SslfrOilyghQ)K{UaTcBJSgkosMT(ua$TaEQ^v<&
z?@hAVv@O963AxwlR%Pkr8&TNR=^7&{_amA&KCrJp55GAZOh)(0syJ4;YS4>SGYPxS
zdj}WZO*r6#d!DawV^%&ERcDMuINE_+=uV{g5KQOhkhu9h_)E=NoVvxw(kUMwm8bLt
zbp>NBvE?>E8%YM94QXUd;rd``)^5L?R4iIg1RB1t%CVjFef%U;Z+HuncE;wGsqG`+
z$85}yi@mDYGAmU&<ub)VcSG$te-N!!1=#|7`Puev0<xnNX;xB+b<+Kd+xkc}=~U;x
zvfJ;Gq5o*NT#&!mZN(Eg3xwS^?iR-^=jm(c<$n<ArhMQRmBj(*PTfeABeRvVe5f0K
zFz+lejc3)UwJn5EMI4ee$7jBVAw<fGed{8KTH|RE*(d4YH!pha^{>>NHp=_*9lF=_
z7FUct9Iy6JqFXjLrqJYdO$TEcnTv_cU^OqxkRH}}MT<M3=5P0#I_$nhz7T~FYDZvR
zkaPG<G?J+(+QqMZVL6sv!-6n9xq3AZDW2+&g6_}0NSk@xtN*5mph3Y;5<(SOP`Ql}
zSuzu6u0#~1k`s4;#Y?AUv0uGC*q<sHZe!q>U!aevod5M%oHsAslO_*C>9u&CeoMPU
zx0iaHmb$h}s&~Rj_!nFPYO0+KvEm;<A6cXbwjHl&X%-pQNdRhnaaO&ObpVr#W}IPG
zDvIAs%KEv2Sc#F@domeX^cG%6oW(h%6iQBqiCN#N(3%mzwg9#F2Mfdqgr!2Ja>p`8
zUI<M;gN(X-A=pp9y=L}Rj>|88^-cd$><9(&W}J6cE7M)p!ZwGm$2Aj%9VX~lkic}<
zBB+)?TpO%oUB*&P9b~ncrP9MxueUgHuL{@6Gc~wICB?<ueEB9O;O%YNOBLd-SDD0M
z3EEecJGNkCrS2LMhL;PdG@SX4M!`fIwwa6XGod`MZbXBXa!?@;BLG-CHEe{WxtGLk
z)F=s^SY(p2X<!^K9=aB}D&+;bOblDiTY116H0|w?>B@n3(uRS(n@AIEMmoW|K@9#W
zW%~)MgF~us-h3i$<v^F%OAZ4(unu{%ZLUWBY+K{3T30|>890~NHK&}dO&|H%sqVJp
z=D7+13j=YLz-!{lyo2^^je%~|`{sMDyxwK*kMUBNB`9hnr{H6$$IL-5`0q*8x?{W{
z@$J)9YDDwH6OYzDc$>Sur`j5lC7;46#KOcnQ*%=(+R*)w0(#&_!M)^-Q{~*6>Ka@o
z@xU^)5f3*6mcYqlfGU?@`-w+c6N|^ht<@0QrhxRR+;ubU5zXvf)<2<cL85=pVev~J
zx{j*;M<0Sf*?;c)GoJKWBVvjTTTCuYuK4d(WoYnMLc3DMl{q{;$>J!c$8fbLt>bvi
z1e@z43WnYq_uazA@Qu!o)v$NI8-M5h4Re;!R_QOYQbYaf_c))$5$`Xpu=Dcs*EYGl
z=qWHYHC>OsQ*fdK1u_j*gjDcLXc&Y=@hFV2Xx&+Nv{RZ0M9yD-878fvI$vI<a|zR@
zWhJ_biwq)QI03lpALgC32?n;@nKwn@&|?)}aqjdw(R@K)w7ImVj#4~q*k1xAJbZk%
z{ee@u?@(2%@y0FxNn~%Okp@L@ib-P7nrfx&>#i;L25^OAU~g#tn1A4-`8HK+JQ{{~
zdFh=_!_hg4X?VQrnpg|$imGwn-c_&PS3JY~*7N%47A}8FPR3}sahG-#Td45UmzmYd
zkMGQc!hQG;q|X*2tGY{qFS>$N`<&bM^lElWL->c+Y-%PKuF%BCnSmcv=DxJuuhYU1
zZ79tDl(pLMmQ8QDy!9r=%Y!a0vk09_iFhL|f$ZEz1R*yS(XW`L-`(+VmVGQ`EZwK3
zo>Vb8v^99Y=Fng4QF!ih>9bU8Gu+{qSf2GG+hb++rLl>u2E+Pt?0zOH(_!9Y^PQ%#
zq1j4AyyXL#M}rQzqB%T1IYirFCMMBta4sotEN>3cj?zb^#uX<CwzSAi{qUSlF)|M{
zr;a9HgNIGT9AQl`{-`DxBrK`2QJEial$g!t_05Jc!nN85)gaUXt4rTTx9moOxbiNv
zs`50|rY_YaoXJTV+{SywB0Rq6_V5wzyCtRQC6$o@dB=6?GAP>fZCM5(+>?}!Zrx3!
zk`=ENYp7=|o@G2zpD?&!Tj!yfz@Ab?oq$+Au(v&ncQ=}#uZwz?^$nHu1N+?0%P$<S
zaGIV67TlPuNV)X!aS3HU2eu%&VzO-f(&B%51NV#Y`fou$2q(v1End!M420jfu6FXu
z!GFStw~G1+|G_fS2o)pMArcwBWhPZ!CXDIiw4X+P$#RKat0EA#vvNAH-`@ao>N}be
zPqf-3y<2j|ib|bfK=5MceU3D=BO<CzLsif?VfFCMcHR4;>S*Tr9%&}&;QK7h;V8CD
z+8U+nI!=$+EI=kN!39ropX!=>dn#H{)3hrDlFl0lOW!skPTVFeAliQW{?;ya#yCjg
zwK~JJXr$%HgObdnwwMalx|^_1NpS#|MV#OcT!XtEyuuhR(T<pNuqaO(fs*p_fupZG
z#7sE6g3UE;Bm9cJCskpYIV$vcDfVsH?vx*!=rckmaSypjATK8E@*^TsWYUSxR|x0V
zUM{{lZ}@T{)HgBn<&yH7QgixIEjOE&5hPSDlDE!ItJAwr9>k_Z?k2Ix*eEn5!x|Qc
zES@jPd6W1nG}g+#VpOD1$;{~Gm{d23q|T|{SEAl>0oKj)nf+)#ZRBqSGA)4u%MRZT
z%7V7)1pJId3dj6GEYlrn<^t$#pqeeIN)5mci+pZG>*C~8MJw7&L1SfiMB@Mm-NC|+
z!6DuVdwd)vd>m5zc1(svzjgA}mxfZ>1)WX?muNK<3NBwk2&Ba0<g=Ohy9iR$PhCO}
z6LA{eVOhRfFv5NAHz)u+-EA03aL<msGE{z{72Bohhvug?zP1-`d5EJZc$H?w9)>nR
z!)jc8v;R{PmD#)E0gELWbtGnuWC=I1{M>!?_X{r{hE@rDobY_tZldR2L7RM6UcRT)
zzS9JiL3765VDHt(wh_9Ga>bwzazVuMd(AbPXWp7!>)K9on1oHzBMQa%IP8%7cYOkw
zACG_WDs^b{IXns|d4YnBR2)Qq_DiGw=^f-h7&X^lra}d(ayFxgXI;cp=>8Gq{Xq{`
zmM8oi8^{^bV(Lo@&<Gl0z-=?l_IcCJ`ckf<YRa5IqQZTrwSkHFy9-t75m}ykf--s+
zbNhC3dglaB_N25j_FskCJYHQtO02Q&kmkEps0hIva?Qog>6J1SV#?*)u3n<vZhykG
zW~GHJ@(eiC-76%XYzvNz#vPg%5j__rQmC4rIy@XeX}{pt*6z0<v58(F($>{w+35NP
zC^QyV*&#J~Za;M8Wk;rYe}hjyga{YSUW=LGLj_TM(G8VAV6h%5lU$p-wr^yKyr#G{
zlawmK2EE0{lC5W*WXeyS#yHAU7o~4frB2gE#l(T7D~3rnl%D2KmJgPIC$+{U+>+Jp
zIbSosQNOn%XOxSsmEXugmz=-K==@<*=&7bdf`zvsW)~dX$+nVU7tCmsAfGEByMg*h
zOPMdL4+KX~Eci+oc<H;Di&2RadBe&vMqX<sQk^f7UB_|*sbq0E9{iLz$Z?8D@3i`J
z?MBh=NvxL@PqXPu9>jBs37TKa*E7ysk6I0W%Ew6pZ%Pdk$?0`6o}+cWe~T`kWjLzh
zQlftDRaONY8aU%8!W)b)py#A$ZyIo3?Y9lTwCj4W?=G=epZ~BNu8cL&?nt<KKA7OQ
z!_!f_=~#HSlj%Yce%aYeZHIS`^C(RX6*Sq2b|(a3+3As>j{6X84sr<D>!S`D8+E&3
zh=v_>nlAQvEs4Z2FLC363HHb#uIy|QQf)ADf0UhmM+C$x-GWTZAr>`(Wgjk$!E@Vb
zTLh_Gr`tENMcJT>6^&y)Q}!V`JZ~D9RuCa(dMIof@LXl+wf7{KTeR7Tnop^!`>xSm
zs`nvvyz`3`iUqqyqX}qXzoh43H*YTCLNOw$LoS8&{+E{i(@W%kZ|Pu8E)K+7(Z9@E
z5~5sHl$}YsUfA>`g+`XVGs4mGEI|+Dv^022enat=)GcHJ5y?q3VKFo!aWUV#NbtB7
zT;j2KB5RRRA?~>Q<_PK`X!8@af@I=#;vMLtM0wM!(cK5T$K1!xySuaVjmL@mNGT69
z^C~}pu#iH=QwF7jJ4lF$3^Op0P%!~0w~@fEg{&;Rls6Z`I%P^UXD}{;l5}r|nm1C(
z_O^h&d<$Ti*uX&&x(B^UA5m$az-w2O$Ms3}=w5<rW+dG!MZ&GU8+KJ3rB9O@*PpL(
zPq$-+sCtz%m?ny(gZ9i5)F$plLaB41&L46k521P;Q<=Rvipv)>MEQ!nPmzT-=<0<T
zfL&8~rgZ`jWxV%Mkh<X?c(u=P??>REk7m+*sFP^ad}7@)vq}*|&!G}b%dnLnf$jqm
zr7MouAdbn<Ob<7|j~vsyp8(C8HgtLGBc9sYD)QpNFz?H=;`nBTthx82;r+Eq!WURJ
zR)Xtl{Ft6DB*g<~)m0-bNWsN7TE4Dn#rK^ff%clnn@--lpJcf*aNUI)G&LO_9tu3o
zoas^-;yO#lZ5G;X80>=2#DCSd>jlS__Ik!{(iIowK{iV@6J?9qeFe#v^vF;4U0qBW
z`XbyiN#1n7%a$#CvbZzOIEL<6Nuq4=O_}foZ1ORO;6zQ0Q89Ay<joS+uSj33v5;0r
zkd!KL=Dp?)SR%u2g1>OiFV0=e3}T!eD=!L+rmGgl1%(^0>f5I`S$hl~XrQ2^pwKNK
zGwI_cc=6(+yue3k6Xx*0*#jV7@kA*h>K5i6LgLT4$&x}2_o67Futa&M&wCfOzSYAP
zKiKC@E5?^cwiM4XioCS+31ofz^wIgyiUGH%gt7gxG=y<OnO4wFMGff*0{xUynRAdB
zy;MR;z#=R|m^n8${a&S#4_SXY9#Z^t1CCpF!yQdd7%ycvB^rb>YCvImv%a;d<nC)P
z<pnYqi~?_q1-cqS-J5u=>0bm+K+jPG@br8hF8Y08M!_d-dqj4dl1hR`l1Irug3>L6
zctZmHt)j7@JvMicwlLk>N8MNv{`QL4#A%CW1aU#V!=x3&JK}!BI-d*<INZ<@MNEe#
zZlJeDEr{Qumc$6U#VEp`8U&J@lsfUZePtU0l5>%!AvhI7X7h~^V+N?=#|JdF7q+9e
zFSpCI*SBjB1Q?5dr4kPvkphQ#jfqc-Og}mchR1Tqxyfg}CGWmkxnWO<c&7!x3p)-K
zq}8LFr*2Lwp)ZO6N%M#cn`ay-cG7pz-(eVyP*Z_C5ei9JQ((&38Kd0v*u1xCwMj@C
zvL=R=2^$%!SgoL(-Ze`e%`yXiBCC6-BLYmjzp?e{!N{A@<}^VA&|T|bGYQIfE$Us9
z1JI6>xV@QRi!~!UPUV=&*pL`<NWJAzjFdqg*eFIOR<2)ojdD$Vjhf`;YG+u9ae?ai
ztu6X3bc?6~SkUB#B~E>Gqo4b0_hiwf8oMQKO!<fFsP7rx>#(*tu1VL}f5!ZL_ZZtb
z?$HW{i;^x{vEQ-Q+zp$~1S1NwB-1&40mG|+Q<?{h^?R8Yj2;iZ0lx8k%Y2zA9{h5|
zFr>pHsE=fj*@`)xB{FI@>LzosMpH#w!BQb(Aw)eyYqnIPkiU?<aI3IdBe~SW_+2?h
z_1ll|k7O0K=2#!yrcI_GA3gM+wK|QzpJN@CH?8jY95GA%tjWE?{pF?SW%dysSq<)6
z+^2rXeuHFJfw4wx>ckM=#7+}3EAnu%kk`Cq56SenF%s+(c@l7;vvyfLL5Y0{HxnN7
z4AwwvGHNSowjFCXr0t07qw1}l__xmb<rboLt9q?wcA8q00K^;^N0`?2>@(>z7Bi1#
zi{0?~+bJR`wD_A2eEEI&`uHF50o_`4TXmln7wSegV9ce?Y3?fS-WRC@NvJ=ZVM_SA
zc%E?vKM6kPJ96A(Ihb8|Hhx^G7pfOIA2ZK#`%wh*CO$c#`}*z%@c6-AGil2$$y;Vv
zP=YU3DQYQTTdjp;pBiCv;e2m-^h;_ejrxNI!4qMB8A++`XOvv+e0HyD)Gl1<DLEh&
zEC<U&cMMt$UX}P5yuiEjO6}DyMsu@JiBPS+W$Wy%>{}Y`ul;)@nagOtUUv5&Y*1s&
zY>aF8{czx?#NlH@K0`*sqYl2;he02@Jc!O^3FtKFxGDVFX*(Ue<k}sU9G3l-o8@h#
z6==8RVx+L8E#>)=#3ZGqrbFSPPaj6gILnxZiH1efCd;R08)su@KM&uG&3nurg`Q2D
zZ6#aZIOLe>wCKVk8J%S#+Z;~Wozrt7O2@`d?Le~+)JQ9cDkz_t*<RY_pL*<I=x}Cl
zy;`?U>hO4tZ9nj<(>j0Oo4(z_WbKuDv#GRwv~jdeZ|avBZ4GUSFUy0L@7QSa=@6-m
zJ%PIi=u5o|bC4;FR%N-&h|yqX5>OGL?*UFJfAwM3fiT7+Ot49fhdR2OtM3708Zm0%
z&E8wE=C8UMVj3@|+@JV9P2UuDRXNo^rLGj?FSx3r$~An}QQmvdi^ue$ptqPOh0;Qr
z<54A<Rpt@A(%n(?kTx;8NQO&;P_;bQL?StDUIXg`Yc9Xx!lIz^o#4-%k)649-F0v4
z)(>3|{YWQqre9%&B!yUz?sC#{TxQ*~isDMPw6ip~iPa=2w|vAjraA3aHc(qwZsq2>
z^i^kP?5Ouh(DB6a!1;MI)r*c&`TF;(iOy<tMKd2^<C(j4rHs!%9DVro^l&qP6WOAw
zz;(9p(^Xnmv1!S=pRVif9Sd;_zwxV@BFkAZJ=^)J!}i1J!wD`itH}?8pKUgq>)EW9
z7m+Pfo-Lfqb;Q5NLC3Y8mz}ko;p2`tdyJHUtaTMr6H5~t8ha6E7WW}uB)&L-EFmD_
zIMFz9BuOZ#D49GtDETbKJY_QVQEF8hU0PH+db(5kT83&yS0*$wH;XhYDC;uYI(s2U
zDW^S`D>pZfEbmP|O1@+MMuB$0P@!01O%Y2`YB5Q1Pzh3rW65Tze(89bOj%nww7jT-
zwj!aDurja;xyrTbOSM_`LXAevaIJK0TODs*Wj$+sb^~QYd?Rt=n<mUA-==TPZq0`+
zwk_MOrmf3udTk%yslOX*S8RXZA=A;_Dbe|^OSr4Ko4>oEho`5u7us9h2kEQo=j^W>
z;2fxY4|!iT$Te6q#646u%s1RLA~@1IDmL0VCN<XgLH@(=_>=L;3GIo6N#n^+Q<hVE
z(@xXpA3bN#W&&sNXQSrG=F;XF=8G2~3yq6ni~UQ=OCOhwmbX?MRxVb3*KpRN)*r0r
zegc1L*pS#5+SJ-y-Ll;}-+r}odne&D{pX5Zq22y3>R(p(?DxKX4c@=EpMAh_&~~VB
zICo@qbbcIoa_=PP6nffqrgpY|?tF3cBIc6evhGUeYUZ2Ow{M7NsAJ##Ux$<b`MbN{
z0t1MThOWQL{W&;bsIQ-}_-SdSm!_p9G+s?<g<|FIz1#OPTRf7yLcC&;u?fP1u*gtR
zo(pX^Tr{YlV}IEpMWyy{D!>9`DN_LT<yh$%kw<QNPSVp>LhnhwKwj$q8itYrH9`qx
z35&on@fiy+_PfE2Iz=u7(UW?LCK=qy-JDWJ&(5DN);csYqSVSpE6DJKvZkzthO=6|
zl^w|4oC9d4FQwr`%OQDs^VXO8JG82dH4oR;=os&A+<W`Uo(hScnX+JzasgyW#QO$c
z)N^Gd4NM>YwkO658PI|x)d>auV)FgZvBDo8CUS8@fB!O(jSKPJE&?miZ{ImS{+Evv
z`(x#7?sMV4`iAK>*LXo1hIIq|Vi@TqVONRHf&NL#B-SJU0!|1)=*4-{ifsga<p}MN
zDBf-HoiB^FYl)maG?`C|2^i8NL(GE98r3=(%go3;1|OW{<*L!$H+z1g!Z;$p?Addg
z;4dXU0dkFHq@v^uScK7@6+)9amJ;H{;J7bCDB_e1Sh`4LbaXfJnOzipP<1m>$Xuj&
zS6gH<B2j?`y3yGOy4(QH?fnSS=XXGrq7RfcLj<x)klg{~!Tcm!XS%L63#ex?VW4|a
z`WSsTN6-r<OrsYHZUPN;C>q2*`Ais<3e?9m^s<`6@d-@vnaj+m&uphqUQxb3lE2*w
zlV$|=P~Y{XJ@NJM-U4+-umWO`8$uH>7sO>>g#v;<`9xElEgafH@T1a(@eoCC%d{EZ
zR<gMbWS-K3r*)3t7nltlebQpS4Z_~@)u%R2T6l27(^j3hHHatgmaZ>b)&WLquxpQI
z{tewXDS*nR-9qWmpiXFwEP7fuC7UgJok(1xG-V%#l~_>E*Rb25NPGX#G2Qfzg*kwV
zzhJ1?EfHLembyJcH0H9KK&sFDE>l2BPXe*Ab^JD|45B_y$pz}wcA>^wbbMUXOIT}c
z+{|=XB>Ojg#Epe-5|-NuWyn<poOnZ<Tt{_M_$ul?7m<vX%+1KZ3zdO=i|$+8S~EP!
zl6B@UdUYHWtt~ONa`drpXx1`oN3^t_qHAE!?$w+@DX1Gwm2?otj<6<RhQ>PZer=hw
zQBCO#r~~}d#@2z@GS?qa$7hVx?-r@to0^4ly+eKWqSpP&K6{^+N-H8+etgTWe3H4#
z(Rsg2-PtsmWHjqp{qt#gQD;aI*E_fK_z!PT1t39h@(oINit6@Pm&`T!f@V)Sni5!a
zGtSS?ZV#o__dl??UANmPIG(@iR&!b*<dT253gri?dU{M+e-%AKE!Fd&=-kP2s(#SS
zC)*dTa}0~|xL70!;3IE#dT4t!c(@GOk?iVn-r9M3*eo4m6!`OI8u%|8Cfmyx5n0MC
zd}V)zb|S;;Q-WV@`6jUhKX0Rgl}Ym^8bccICGSUHq6MBw>monywO>-iDc~XzEKshj
zDlagqbSf_ptvo6($kiNWw$Lkl$84cixXf&!RfsrME<D#5*DOmnjfwY&mSykLE;HX|
zc96=pEAOXG?i>V1`;x}NSnqKfMAc@DwQH<}DTkZH$|%VRA}F7l!Z@W=t={J?I?rBt
zPJBDqMyk)NL>uBlrP+s=&biED<FlyiA!XeIY?i1*EyN?I-MNqH8Hbz(xQ_+kKowJl
z5DQtN`}bPvA?;}3&vNS^4QTkMiFHX=3?M0{8PV36w0wRnt(a!@UWACYE=}xX!b^H-
zxOhNSEonOaFfr})+SA}PF|`P@kL7^x*ZHx&pT_621roR;$`y42qz~5c^}o@Qin%t?
z4{~I)_<wz_m}D-mHMwJ>?mDn~U(7WrazeXFIAT5MtE|JcH~rw9)!3tofbV3i^MKxc
zao4Qc=RWjr0ulE~BqJUn&bhH@q-j(Q9ZtjO->L@;tjeT`F-ngOXr#=p)zd3-nR<x@
zs6^z%=fC~S{#we6G_lzvG(|&t1o?+g;sL1$a<%k3wCK-nm3$*OOlxR4Z&^!mRn%Q@
z*LN6dpa&AIo{p#NIF(Ui0V_AHtKZ-_yuMv8XA$ENIJtu-N}}RM%Tb>n2VN3Aw%%jW
zJ6-vhu)k=K(AzOKRYRK1>wd#=ulYO~yB9Vquqn1v)#Vs|YV-NCoJX0aKw*73vR8av
zbJnU!t%sYS0Pbx4#?f-q>5Hp_v^l$#(8CXdANSqP)rlEJ2ph*5)@7RAh~C9)kz#Q7
z%^n`sh5CJURo-KGvNxr=7ofh!t+}^Ruib0kSIxOSe#x2<!(@>s>+Htk(MavE!m|1e
zoI<^A;eSRQZ<F!tSp?tg3%r&OPxnB4)cvy?PoJMK2Ngu?9cn-9V&{f6R`v4b%x!<z
zs&GqsYt)k}9I3s#zKJY!w09Hz!+BHPhbZ!L%jbAFc`I%{>eVr2!@M9#YnrV{<5|NV
z`Hi6z=_p?L+7*swOy68%WmJQ_`ZYDLp~wOY0NhdS8zX*Qm?MsF(dW%~UOCk-S0k-G
z7z5m1x-7)<pKM$2mhD{~?m7BBqopl5W^Ov$wn0Wm%3um@`NcT-(;EhH7etzau>;^o
zzRNEHRzF5fDCZxeCWM{qp9jtD@Ybh9!uYTBGUxQ`^7HHS05`;JB#3Za@bLm=)I)K6
zi4S%zzXfRcmNwo>S}U0n+;@DTtfQkPBl%WSi6dj2%6%bUn&bJ#S%&J$+6g2VHF-MI
zq~jRBaAq~_m1+0p45~(!3d;x)PvHm;S>6bWfR!Pd0B0$BvQsJYgK<s!Mj5ptyp6;y
z<vJsGCNSoBH6wz9ibU7BR`_ifLGAZ(T6b(*Uff?YDyV$+6`Rs4j#2&Yb5$BLf&4Hu
z0c9zt);MFoL0Ry^@)RbI3Qm~_yK{6a{x-R2ncm4eZwpg>KX2hF6!fG3EMB}F?1DHG
zr^ewKSNXUJpJCbPVLnV51N}k{yj6?4q?xBK{E2JBwO$7J?9gupo~}dvFA_}rrp%pU
z_{Y1Hd`$ef%}mn0P1bitw?PjF8sfEKh@E=&OB3yClDKrLq2O1H4>Jtg;DxNRD%?gj
zqEC{*AoUPJf|!C%Ycz>Imq!XYrCS)~tIIS`)zD*jc?0Xm-+M{Mbnz5|@N}s=WxCu@
zVj4lVX7^G1UssuXP1U0Ajw+zXq_ek>F%uf)Xx#fEW#q}7*qTYq*HoveYsk8{<yPOY
zh*Y>SYk$6UcJ_8vFXqZH_Wsyf_gc<l#TR*OMn3j|60zw#cXSyKa5fz{*1EI1Sv%eg
z6oDT(z7jY%RLUs6^JVW%{f@nVld#e2=dTT4vqny%Z;(}TmoYqz#{7uhLAFYy5xZNb
zl5^kKVQk$@_O0Mf;J{#87uo5JMqO)x%bIUax^seLgI%Mu`R72t)wRW=eR=1)(Zs9!
zjr`9A1<&0Ycv%MVvJsty-qnk!U3hl$Xfk5jjByA#{DrOm^y1;av~@Q2-zSJ%><CK-
z|GUf;Ft|hkqyPe!sDK~}C8fj16UR~o{XmvsJYX+#PruCZz+<To#|)TKW#yt#I8uf5
zcKtoFgQL#!158pZZE0kPdF;S2x$G}w{waj~+pM0Qn+*(9b~J>4&oYyf{UOuu=}>=8
z_W1-|5cxnBFgU;vW@>KDPqka$Oa(AE=BHBQlmp4xio(pyCEe^{%5L&1Ms5~H+{RRb
z0+@U*JT6wYR*2*(fQyx-wF8d}Ka~L@dk@BgIKI9Nqyl^=fm`rX318m;sLLq;L~ZP0
z08Um2ixCKsB*o3f$_8PFutAssU=SM=$OZy}xmnmCJe*J-4({Lc(WnHjQ`7kDjZJuz
z#3X*J4spg$Wd?`a@&JL(&d#jP?5sBSra(4sZf+n53<QH&5ELv9uGVk^7Zz&=>K{yg
z=OYGlFtRtdg`3-01FrcR7$OqF_^GJ=$bq}A`?q#k+5S<HwFB$-HnJMoSOHxOY=La7
zAmG0#Bq#UJ#jLD;S<=|(k7Blt_LkopWo!h5S;DNYbITAlvi-80?N508MNGsEL?QNn
zR|uiD-%$K}DVHC`zJq@a2SNo1jq}La7@M28iXn2p1Q0soW&yFYfS@XDARaI$;+F};
z#sdQJ0slt%C$8Ulh$3<v5lNZ9@c^@cAS@s*6*e{=4g?!^CJ^`!9zRk3jmPhX{5zL_
zl;pP@!0)tw<MX`+8+#QS8%qIUBYPV|12_PY;VNff0YfB`f>_xAwutOGfSQfH@sDQx
zT;Q*~<m7n7Y>XVQ6(uDm;OJ;>%md}%fWQo3U=}Dh*now@(Ab#8klomT#e|&;kxL3Q
zGUDdo{?7KVW&ee*lr<t{)7l93J6|vdw+T0dgPnz)i`#^SgUyhW1!}?pVS%wjAqHGf
z5C;tQLtF&kpUVCVUk69Sr!XV<PfEVl^R-JT!|eWg_4gZ=<^pVdz-to3(Vq;jZ-2k~
z*Mh${?q4h7GdAKev9Y%@fD0Jd+FF_$8C<&~5Mi%;z&~&OS-~|u+#GHR`&*^gk_cP=
ztqFe$d+o+NmIl_Q{8TP1#xN5DM@u*r@NYc63;tIo--Y;leb+J=|Jir^jm!T{Nq$}H
zwLC`G&SYc%3t9fE2?Qj6q9UMbj<6;~lIZ^*P5!bnK7_(}6zpw`9gSf20zZ0sg#Q3!
z%?<4h>|L*22+<$>h3F@pUSF4ixjG}f%i(9GTyu5dQU0E{`n|_7hZzfq@gRB}FbD$T
z0&yco4e)oi|3dXw?k+r{HdeL<)~*7N5NYX_=3HD{zZLua`fv0<fcR-(_zvigtB7F-
zG2#LL81nv#^$%eG&;S3kA^+!j|H1KpmHYw4e{=9Zxc(cI{-F6ETz^3E-yHl8uKxz5
zKWP33*B?;)HwXWN>%T$i51N013-iy1W<)5ApUN5WNc@Y3@_&B&_9IO8$D$XU;OiLK
zzmFVnAR-5dkb(1i-~f{%XzcjCEW>LEm;*Twy<^i)g(PG1CQVj0$;T;VL|W7-H8$Tb
z<oRh4oqrp)`$HbYMC+dfl6@~MgUW`Fw$L1=MTj{dJML5%(YBO!lZA+g-!%Mo`j-5?
z^6s;(_z~|pig(NL>-fYu1Dy~f57S|w`7I7(*fz@x@(a+$GpT0xysf$f-{<mt6$0Vb
zHe@M2#AE(y3whi%_gc0`7*z;;d6PdhHGVvOOz^Tq$Z<h&j7f&$$SW(EpsBKy_w|cU
zq>MEZwldWTs7b?(wq&Tpoc50%D)VQ_H^@FD33g|+PFc#R7TcTWQCDMvXM&s_5ZSvP
zCD=cnwyb`Hh<9p`N<aGrR6k`&|39(b(7&!Q1mXPEvO<WM&-Vpb{$W`mBosP{L<ekH
z>}^sZ?^B#m{TURR8(AnAuP^{b5QQFGbNpy8yNJ8OH<o9HL3eBI-XA<@han*r6G{lc
TDE$RgKP@K2#s>LgIidd#ASZ!e

literal 0
HcmV?d00001

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 52b5f1c411f..6cad9372701 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -517,14 +517,19 @@ class AccountancyExport
 			print $line->id . $separator;
 			print $date . $separator;
 			print $line->code_journal . $separator;
-			print length_accountg($line->numero_compte) . $separator;
-			print substr(length_accountg($line->numero_compte),0,2) . $separator;
+
+			if (empty($line->subledger_account)) {
+                print $line->numero_compte . $separator;
+            } else {
+                print $line->subledger_account . $separator;
+            }
+			//print substr(length_accountg($line->numero_compte),0,2) . $separator;
 			print '"'.dol_trunc($line->label_operation,40,'right','UTF-8',1).'"' . $separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$separator;
 			print price2num($line->montant).$separator;
 			print $line->sens.$separator;
 			print $date . $separator;
-			print 'EUR';
+			//print 'EUR';
 			print $end_line;
 		}
 	}

From 233bd4374a3849b6cd575ecc36b78528bbd5caba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2019 19:52:26 +0100
Subject: [PATCH 36/70] Fix phpcs

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 4642c0bf753..46c50a75256 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1382,6 +1382,7 @@ class FactureFournisseur extends CommonInvoice
      *  @param      int     $origin_id          id origin document
 	 *  @param		double	$pu_ht_devise		Amount in currency
 	 *  @param		string	$ref_supplier		Supplier ref
+	 *  @param      string  $special_code       Special code
      *	@return    	int             			>0 if OK, <0 if KO
      *
      *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.

From 4022d5f5296746526ea5b6d332764bf6b9884fa2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2019 23:58:04 +0100
Subject: [PATCH 37/70] FIX Can not create contract with numbering module
 without autogen rule

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index dc94d57809f..2b9de7fc9e2 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -892,6 +892,7 @@ class Contrat extends CommonObject
 		$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
 		$sql.= ")";
 		$resql=$this->db->query($sql);
+
 		if ($resql)
 		{
 			$error=0;
@@ -908,9 +909,8 @@ class Contrat extends CommonObject
 			if ($result > 0)
 			{
 				$modCodeContract = new $module();
-
-				if (!empty($modCodeContract->code_auto)) {
-					// Mise a jour ref
+				if (! empty($modCodeContract->code_auto)) {
+					// Force the ref to a draft value if numbering module is an automatic numbering
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
 					if ($this->db->query($sql))
 					{
@@ -919,9 +919,6 @@ class Contrat extends CommonObject
 							$this->ref="(PROV".$this->id.")";
 						}
 					}
-				} else {
-					$error++;
-					$this->error='Failed to get PROV number';
 				}
 			}
 
@@ -1389,7 +1386,7 @@ class Contrat extends CommonObject
 			if (empty($remise_percent)) $remise_percent=0;
 
 			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
-			
+
 			// Clean vat code
 			$vat_src_code='';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
@@ -1397,7 +1394,7 @@ class Contrat extends CommonObject
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 			}
-			
+
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker

From ab781c32c7bcdf9e5028ae7d0a276a4ec5a4077d Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 11 Mar 2019 11:19:32 +0100
Subject: [PATCH 38/70] Wrong vat if deposit from propal with multiple vat

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b379bf31602..0f6820e1859 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1196,15 +1196,15 @@ if (empty($reshook))
 											$qualified=1;
 											if (empty($lines[$i]->qty)) $qualified=0;	// We discard qty=0, it is an option
 											if (! empty($lines[$i]->special_code)) $qualified=0;	// We discard special_code (frais port, ecotaxe, option, ...)
-											if ($qualified) $totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
+											if ($qualified){
+												$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
+												$tva_tx = $lines[$i]->tva_tx;
+												$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $valuedeposit) / 100;
+											}
+																					
 										}
 
-										if ($totalamount != 0) {
-											if ($numlines > 0) $numlines = $numlines-1;
-											$tva_tx = $lines[$numlines]->tva_tx;
-											if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
-											$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
-										} else {
+										if($totalamount == 0) {
 											$amountdeposit[0] = 0;
 										}
 									} else {
@@ -1215,7 +1215,6 @@ if (empty($reshook))
 
 								$amount_ttc_diff = $amountdeposit[0];
 							}
-
 							foreach ($amountdeposit as $tva => $amount)
 							{
 								$arraylist = array('amount' => 'FixAmount','variable' => 'VarAmount');
@@ -1226,6 +1225,7 @@ if (empty($reshook))
 								} elseif ($typeamount=='variable') {
 									$descline.= ' ('. $valuedeposit.'%)';
 								}
+								
 								$descline.= ' - '.$srcobject->ref;
 								$result = $object->addline(
 										$descline,

From 17647de4ccc1d5f653b11867a5208aed53a587c0 Mon Sep 17 00:00:00 2001
From: Joan Louis <joan@MacBook-Pro-de-Joan-2.local>
Date: Tue, 12 Mar 2019 11:24:54 +0100
Subject: [PATCH 39/70] Fix extrafields calls from cards for Dolibarr 8 See
 #10803

---
 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             | 4 ++--
 htdocs/fichinter/card.php           | 6 +++---
 htdocs/fourn/commande/card.php      | 4 ++--
 htdocs/fourn/facture/card.php       | 4 ++--
 htdocs/supplier_proposal/card.php   | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index be5494fbb75..ba68e3324bb 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -751,7 +751,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -1119,7 +1119,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 0b0348ee5e0..66f01399183 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -662,7 +662,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -1023,7 +1023,7 @@ if (empty($reshook))
 		// Extrafields Lines
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 		// Unset extrafield POST Data
 		if (is_array($extralabelsline)) {
 			foreach ($extralabelsline as $key => $value) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6568ac03eba..414a86f4c27 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1682,7 +1682,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -2089,7 +2089,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index fb70da42665..36c1aec55b9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -453,7 +453,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline))
 		{
@@ -776,7 +776,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 
 		$objectline = new FactureLigneRec($db);
 		if ($objectline->fetch(GETPOST('lineid')))
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 5f418cb0568..b681e8147a7 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -456,7 +456,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -737,7 +737,7 @@ if (empty($reshook))
 			// Extrafields
 			$extrafieldsline = new ExtraFields($db);
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
-			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+			$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 			$objectline->array_options=$array_options;
 
 			// TODO verifier price_min si fk_product et multiprix
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 15b75495c38..24aca7e9dbf 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -362,7 +362,7 @@ if (empty($reshook))
 								// Extrafields
 								$extrafieldsline = new ExtraFields($db);
 								$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-								$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+								$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 
 			                    $result = $object->addline(
 									$user,
@@ -509,7 +509,7 @@ if (empty($reshook))
 			// Extrafields
 			$extrafieldsline = new ExtraFields($db);
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+			$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 
 	        $result=$object->addline(
 				$user,
@@ -622,7 +622,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 		$objectline->array_options = $array_options;
 
 		$result = $objectline->update($user);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 9009364d4b1..41a6d030e16 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -308,7 +308,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -614,7 +614,7 @@ if (empty($reshook))
 			// Extrafields Lines
 			$extrafieldsline = new ExtraFields($db);
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+			$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 			// Unset extrafield POST Data
 			if (is_array($extralabelsline)) {
 				foreach ($extralabelsline as $key => $value) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c9715278074..a294cf3c6ad 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1056,7 +1056,7 @@ if (empty($reshook))
 			// Extrafields Lines
 			$extrafieldsline = new ExtraFields($db);
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+			$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 			// Unset extrafield POST Data
 			if (is_array($extralabelsline)) {
 				foreach ($extralabelsline as $key => $value) {
@@ -1132,7 +1132,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 7b1bf417b40..d7ac16e67ea 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -550,7 +550,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -814,7 +814,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields

From 36b44b1348f3c401ced793d01b0520ad73d9901e Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Tue, 12 Mar 2019 11:28:36 +0100
Subject: [PATCH 40/70] FIX: several hooks in shipping/delivery cards

---
 htdocs/expedition/card.php     | 1287 ++++++++++++++++----------------
 htdocs/expedition/shipment.php |  276 +++----
 htdocs/livraison/card.php      |  142 ++--
 3 files changed, 865 insertions(+), 840 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 0f45ca61804..aa85132b243 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1141,448 +1141,455 @@ if ($action == 'create')
                 $line = $object->lines[$indiceAsked];
 
 
-                // Show product and description
-                $type=$line->product_type?$line->product_type:$line->fk_product_type;
-                // Try to enhance type detection using date_start and date_end for free lines where type
-                // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
+                $parameters = array('i' => $indiceAsked, 'line' => $line, 'num' => $numAsked);
+                $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+                if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-                print '<!-- line '.$line->rowid.' for product -->'."\n";
-                print '<tr class="oddeven">'."\n";
-
-                // Product label
-                if ($line->fk_product > 0)  // If predefined product
+                if(empty($reshook))
                 {
-                    $product->fetch($line->fk_product);
-                    $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
-                    //var_dump($product->stock_warehouse[1]);
+	                // Show product and description
+	                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+	                // Try to enhance type detection using date_start and date_end for free lines where type
+	                // was not saved.
+	                if (! empty($line->date_start)) $type=1;
+	                if (! empty($line->date_end)) $type=1;
 
-                    print '<td>';
-                    print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
+	                print '<!-- line '.$line->rowid.' for product -->'."\n";
+	                print '<tr class="oddeven">'."\n";
 
-                    // Show product and description
-                    $product_static->type=$line->fk_product_type;
-                    $product_static->id=$line->fk_product;
-                    $product_static->ref=$line->ref;
-                    $product_static->status_batch=$line->product_tobatch;
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
+	                // Product label
+	                if ($line->fk_product > 0)  // If predefined product
+	                {
+	                    $product->fetch($line->fk_product);
+	                    $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
+	                    //var_dump($product->stock_warehouse[1]);
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+	                    print '<td>';
+	                    print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
-                    // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-                    {
-                        print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
-                    }
+	                    // Show product and description
+	                    $product_static->type=$line->fk_product_type;
+	                    $product_static->id=$line->fk_product;
+	                    $product_static->ref=$line->ref;
+	                    $product_static->status_batch=$line->product_tobatch;
+	                    $text=$product_static->getNomUrl(1);
+	                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+	                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
+	                    print $form->textwithtooltip($text,$description,3,'','',$i);
 
-                    print '</td>';
-                }
-                else
-				{
-				    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
+	                    // Show range
+	                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
 
-                    if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
-                    } else {
-                    	print $text.' '.nl2br($line->desc);
-                    }
+	                    // Add description in form
+	                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+	                    {
+	                        print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
+	                    }
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
-                    print "</td>\n";
-                }
-
-                // Qty
-                print '<td align="center">'.$line->qty;
-                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-                print '</td>';
-                $qtyProdCom=$line->qty;
-
-                // Qty already shipped
-                print '<td align="center">';
-                $quantityDelivered = $object->expeditions[$line->id];
-                print $quantityDelivered;
-                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-                print '</td>';
-
-                // Qty to ship
-                $quantityAsked = $line->qty;
-				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
-					$quantityToBeDelivered = 0;
-				}
-				else
-				{
-					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
-				}
-                $warehouse_id = GETPOST('entrepot_id','int');
-
-				$warehouseObject = null;
-				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
-				{
-				    print '<!-- Case warehouse already known or product not a predefined product -->';
-					//ship from preselected location
-					$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
-					$deliverableQty=min($quantityToBeDelivered, $stock);
-					if ($deliverableQty < 0) $deliverableQty = 0;
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
+	                    print '</td>';
+	                }
+	                else
 					{
-						// Quantity to send
-						print '<td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
-                            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.'">';
-						}
-						else print $langs->trans("NA");
-						print '</td>';
+					    print "<td>";
+	                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
+	                    else $text = img_object($langs->trans('Product'),'product');
 
-						// Stock
-						if (! empty($conf->stock->enabled))
-						{
-							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
-							{
-								// Show warehouse combo list
-								$ent = "entl".$indiceAsked;
-								$idl = "idl".$indiceAsked;
-								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
-								if ($line->fk_product > 0)
-								{
-								    print '<!-- Show warehouse selection -->';
-									print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
-									if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
-									{
-										//print $stock.' '.$quantityToBeDelivered;
-										if ($stock < $quantityToBeDelivered)
-										{
-											print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
-										}
-									}
-								}
-							}
-							else
-							{
-								print $langs->trans("Service");
-							}
-							print '</td>';
-						}
+	                    if (! empty($line->label)) {
+	                    	$text.= ' <strong>'.$line->label.'</strong>';
+	                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+	                    } else {
+	                    	print $text.' '.nl2br($line->desc);
+	                    }
 
-						print "</tr>\n";
+	                    // Show range
+	                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+	                    print "</td>\n";
+	                }
 
-						// Show subproducts of product
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-						{
-							$product->get_sousproduits_arbo();
-							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if(count($prods_arbo) > 0)
-							{
-								foreach($prods_arbo as $key => $value)
-								{
-									//print $value[0];
-									$img='';
-									if ($value['stock'] < $value['stock_alert'])
-									{
-										$img=img_warning($langs->trans("StockTooLow"));
-									}
-									print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
-										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
-										</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
-										<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
-								}
-							}
-						}
+	                // Qty
+	                print '<td align="center">'.$line->qty;
+	                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+	                print '</td>';
+	                $qtyProdCom=$line->qty;
+
+	                // Qty already shipped
+	                print '<td align="center">';
+	                $quantityDelivered = $object->expeditions[$line->id];
+	                print $quantityDelivered;
+	                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+	                print '</td>';
+
+	                // Qty to ship
+	                $quantityAsked = $line->qty;
+					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
+					{
+						$quantityToBeDelivered = 0;
 					}
 					else
 					{
-					    // Product need lot
-						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-						print '<!-- Case product need lot -->';
+						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
+					}
+	                $warehouse_id = GETPOST('entrepot_id','int');
 
-						$staticwarehouse=new Entrepot($db);
-						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
-
-						$subj=0;
-						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
+					$warehouseObject = null;
+					if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+					{
+					    print '<!-- Case warehouse already known or product not a predefined product -->';
+						//ship from preselected location
+						$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
+						$deliverableQty=min($quantityToBeDelivered, $stock);
+						if ($deliverableQty < 0) $deliverableQty = 0;
+						if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 						{
-							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
-						    {
-   						        $nbofsuggested++;
-    						}
-						}
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
-						{
-							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
+							// Quantity to send
+							print '<td align="center">';
+							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 							{
-								//var_dump($dbatch);
-								$batchStock = + $dbatch->qty;		// To get a numeric
-								$deliverableQty = min($quantityToBeDelivered,$batchStock);
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
-								print '<td colspan="3" ></td><td align="center">';
-								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
-								print '</td>';
+	                            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.'">';
+							}
+							else print $langs->trans("NA");
+							print '</td>';
 
-								print '<!-- Show details of lot -->';
+							// Stock
+							if (! empty($conf->stock->enabled))
+							{
 								print '<td align="left">';
-
-								print $staticwarehouse->getNomUrl(0).' / ';
-
-								print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-
-								$detail='';
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
-								print $detail;
-
-								$quantityToBeDelivered -= $deliverableQty;
-								if ($quantityToBeDelivered < 0)
+								if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
 								{
-									$quantityToBeDelivered = 0;
+									// Show warehouse combo list
+									$ent = "entl".$indiceAsked;
+									$idl = "idl".$indiceAsked;
+									$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
+									if ($line->fk_product > 0)
+									{
+									    print '<!-- Show warehouse selection -->';
+										print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
+										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
+										{
+											//print $stock.' '.$quantityToBeDelivered;
+											if ($stock < $quantityToBeDelivered)
+											{
+												print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
+											}
+										}
+									}
+								}
+								else
+								{
+									print $langs->trans("Service");
+								}
+								print '</td>';
+							}
+
+							print "</tr>\n";
+
+							// Show subproducts of product
+							if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+							{
+								$product->get_sousproduits_arbo();
+								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+								if(count($prods_arbo) > 0)
+								{
+									foreach($prods_arbo as $key => $value)
+									{
+										//print $value[0];
+										$img='';
+										if ($value['stock'] < $value['stock_alert'])
+										{
+											$img=img_warning($langs->trans("StockTooLow"));
+										}
+										print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
+											<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+											</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
+											<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
+									}
 								}
-								$subj++;
-								print '</td></tr>';
 							}
 						}
 						else
 						{
-						    print '<!-- Case there is no details of lot at all -->';
-						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
-							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
-							print '</td>';
+						    // Product need lot
+							print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+							print '<!-- Case product need lot -->';
 
-							print '<td align="left">';
-							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
-							print '</td></tr>';
-						}
-					}
-				}
-				else
-				{
-					// ship from multiple locations
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
-					{
-					    print '<!-- Case warehouse not already known and product does not need lot -->';
-					    print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
+							$staticwarehouse=new Entrepot($db);
+							if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
 
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						$subj=0;
-    					// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-							if ($stock_warehouse->real > 0)
+							$subj=0;
+							// Define nb of lines suggested for this order line
+							$nbofsuggested=0;
+							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
 							{
-                                $nbofsuggested++;
-						    }
-						}
-						$tmpwarehouseObject=new Entrepot($db);
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
-						{
-							$tmpwarehouseObject->fetch($warehouse_id);
-							if ($stock_warehouse->real > 0)
-							{
-								$stock = + $stock_warehouse->real; // Convert it to number
-								$deliverableQty = min($quantityToBeDelivered,$stock);
-								$deliverableQty = max(0, $deliverableQty);
-								// Quantity to send
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
-								print '<td colspan="3" ></td><td align="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
-								if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-								{
-									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-								}
-								else print $langs->trans("NA");
-								print '</td>';
-
-								// Stock
-								if (! empty($conf->stock->enabled))
-								{
-									print '<td align="left">';
-									if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-									{
-										print $tmpwarehouseObject->getNomUrl(0).' ';
-
-										print '<!-- Show details of stock -->';
-										print '('.$stock.')';
-
-									}
-									else
-									{
-										print $langs->trans("Service");
-									}
-									print '</td>';
-								}
-								$quantityToBeDelivered -= $deliverableQty;
-								if ($quantityToBeDelivered < 0)
-								{
-									$quantityToBeDelivered = 0;
-								}
-								$subj++;
-								print "</tr>\n";
+								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
+							    {
+	   						        $nbofsuggested++;
+	    						}
 							}
-						}
-						// Show subproducts of product (not recommanded)
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-						{
-							$product->get_sousproduits_arbo();
-							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if (count($prods_arbo) > 0)
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
 							{
-								foreach($prods_arbo as $key => $value)
-								{
-									//print $value[0];
-									$img='';
-									if ($value['stock'] < $value['stock_alert'])
-									{
-										$img=img_warning($langs->trans("StockTooLow"));
-									}
-									print '<tr class"oddeven"><td>';
-									print "&nbsp; &nbsp; &nbsp; ->
-									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
-									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
-									<td align=\"center\">".$value['stock']." ".$img."</td>";
-									print "</tr>";
-								}
-							}
-						}
-					}
-					else
-					{
-					    print '<!-- Case warehouse not already known and product need lot -->';
-					    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-
-						$subj=0;
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-
-						$tmpwarehouseObject=new Entrepot($db);
-						$productlotObject=new Productlot($db);
-						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-						    if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-						        foreach ($stock_warehouse->detail_batch as $dbatch)
-								{
-                                    $nbofsuggested++;
-								}
-						    }
-						}
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-							$tmpwarehouseObject->fetch($warehouse_id);
-							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-						        foreach ($stock_warehouse->detail_batch as $dbatch)
+								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
 								{
 									//var_dump($dbatch);
 									$batchStock = + $dbatch->qty;		// To get a numeric
 									$deliverableQty = min($quantityToBeDelivered,$batchStock);
-									if ($deliverableQty < 0) $deliverableQty = 0;
-									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+									print '<td colspan="3" ></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
 
+									print '<!-- Show details of lot -->';
 									print '<td align="left">';
 
-									print $tmpwarehouseObject->getNomUrl(0).' / ';
+									print $staticwarehouse->getNomUrl(0).' / ';
 
-									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 
-									//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
-									print $langs->trans("Batch").': ';
-									$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-									if ($result > 0) print $productlotObject->getNomUrl(1);
-									else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
-									print ' ('.$dbatch->qty.')';
+									$detail='';
+									$detail.= $langs->trans("Batch").': '.$dbatch->batch;
+									$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
+									$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
+									$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+									$detail.= '<br>';
+									print $detail;
+
 									$quantityToBeDelivered -= $deliverableQty;
 									if ($quantityToBeDelivered < 0)
 									{
 										$quantityToBeDelivered = 0;
 									}
-									//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
 									$subj++;
 									print '</td></tr>';
 								}
 							}
-						}
+							else
+							{
+							    print '<!-- Case there is no details of lot at all -->';
+							    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
+								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
+								print '</td>';
 
+								print '<td align="left">';
+								print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
+								print '</td></tr>';
+							}
+						}
 					}
-					if ($subj == 0) // Line not shown yet, we show it
+					else
 					{
-					    print '<!-- line not shown yet, we show it -->';
-						print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						// ship from multiple locations
+						if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 						{
-						    $disabled='';
-					        if (! empty($conf->productbatch->enabled) && $product->hasbatch())
-					        {
-                                $disabled='disabled="disabled"';
-						    }
-    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
-						}
-						else
-						{
-						    print $langs->trans("NA");
-						}
-						print '</td>';
+						    print '<!-- Case warehouse not already known and product does not need lot -->';
+						    print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
 
-						print '<td align="left">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
-							$warehouse_selected_id = GETPOST('entrepot_id','int');
-    						if ($warehouse_selected_id > 0)
-    						{
-    							$warehouseObject=new Entrepot($db);
-    							$warehouseObject->fetch($warehouse_selected_id);
-    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
-    						}
-    						else
-    						{
-    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
-    						    else print '';
-    						}
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+							$subj=0;
+	    					// Define nb of lines suggested for this order line
+							$nbofsuggested=0;
+							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+							{
+								if ($stock_warehouse->real > 0)
+								{
+	                                $nbofsuggested++;
+							    }
+							}
+							$tmpwarehouseObject=new Entrepot($db);
+							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
+							{
+								$tmpwarehouseObject->fetch($warehouse_id);
+								if ($stock_warehouse->real > 0)
+								{
+									$stock = + $stock_warehouse->real; // Convert it to number
+									$deliverableQty = min($quantityToBeDelivered,$stock);
+									$deliverableQty = max(0, $deliverableQty);
+									// Quantity to send
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+									print '<td colspan="3" ></td><td align="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
+									if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+									{
+										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
+									}
+									else print $langs->trans("NA");
+									print '</td>';
+
+									// Stock
+									if (! empty($conf->stock->enabled))
+									{
+										print '<td align="left">';
+										if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+										{
+											print $tmpwarehouseObject->getNomUrl(0).' ';
+
+											print '<!-- Show details of stock -->';
+											print '('.$stock.')';
+
+										}
+										else
+										{
+											print $langs->trans("Service");
+										}
+										print '</td>';
+									}
+									$quantityToBeDelivered -= $deliverableQty;
+									if ($quantityToBeDelivered < 0)
+									{
+										$quantityToBeDelivered = 0;
+									}
+									$subj++;
+									print "</tr>\n";
+								}
+							}
+							// Show subproducts of product (not recommanded)
+							if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+							{
+								$product->get_sousproduits_arbo();
+								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+								if (count($prods_arbo) > 0)
+								{
+									foreach($prods_arbo as $key => $value)
+									{
+										//print $value[0];
+										$img='';
+										if ($value['stock'] < $value['stock_alert'])
+										{
+											$img=img_warning($langs->trans("StockTooLow"));
+										}
+										print '<tr class"oddeven"><td>';
+										print "&nbsp; &nbsp; &nbsp; ->
+										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+										</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
+										<td align=\"center\">".$value['stock']." ".$img."</td>";
+										print "</tr>";
+									}
+								}
+							}
 						}
 						else
 						{
-						    print $langs->trans("Service");
+						    print '<!-- Case warehouse not already known and product need lot -->';
+						    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+
+							$subj=0;
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+
+							$tmpwarehouseObject=new Entrepot($db);
+							$productlotObject=new Productlot($db);
+							// Define nb of lines suggested for this order line
+							$nbofsuggested=0;
+							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+							{
+							    if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+							        foreach ($stock_warehouse->detail_batch as $dbatch)
+									{
+	                                    $nbofsuggested++;
+									}
+							    }
+							}
+							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+							{
+								$tmpwarehouseObject->fetch($warehouse_id);
+								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+							        foreach ($stock_warehouse->detail_batch as $dbatch)
+									{
+										//var_dump($dbatch);
+										$batchStock = + $dbatch->qty;		// To get a numeric
+										$deliverableQty = min($quantityToBeDelivered,$batchStock);
+										if ($deliverableQty < 0) $deliverableQty = 0;
+										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
+										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+										print '</td>';
+
+										print '<td align="left">';
+
+										print $tmpwarehouseObject->getNomUrl(0).' / ';
+
+										print '<!-- Show details of lot -->';
+										print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
+
+										//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
+										print $langs->trans("Batch").': ';
+										$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
+										if ($result > 0) print $productlotObject->getNomUrl(1);
+										else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+										print ' ('.$dbatch->qty.')';
+										$quantityToBeDelivered -= $deliverableQty;
+										if ($quantityToBeDelivered < 0)
+										{
+											$quantityToBeDelivered = 0;
+										}
+										//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
+										$subj++;
+										print '</td></tr>';
+									}
+								}
+							}
+
 						}
-						print '</td>';
+						if ($subj == 0) // Line not shown yet, we show it
+						{
+						    print '<!-- line not shown yet, we show it -->';
+							print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
+							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+							{
+							    $disabled='';
+						        if (! empty($conf->productbatch->enabled) && $product->hasbatch())
+						        {
+	                                $disabled='disabled="disabled"';
+							    }
+	    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
+							}
+							else
+							{
+							    print $langs->trans("NA");
+							}
+							print '</td>';
+
+							print '<td align="left">';
+							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+							{
+								$warehouse_selected_id = GETPOST('entrepot_id','int');
+	    						if ($warehouse_selected_id > 0)
+	    						{
+	    							$warehouseObject=new Entrepot($db);
+	    							$warehouseObject->fetch($warehouse_selected_id);
+	    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
+	    						}
+	    						else
+	    						{
+	    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
+	    						    else print '';
+	    						}
+							}
+							else
+							{
+							    print $langs->trans("Service");
+							}
+							print '</td>';
+							print '</tr>';
+						}
+					}
+
+
+					//Display lines extrafields
+					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); // fetch extrafields also available in orderline
+						$line = new ExpeditionLigne($db);
+						//$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);
 						print '</tr>';
 					}
-				}
-
-
-				//Display lines extrafields
-				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); // fetch extrafields also available in orderline
-					$line = new ExpeditionLigne($db);
-					//$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);
-					print '</tr>';
-				}
+                }
 
                 $indiceAsked++;
             }
@@ -1986,6 +1993,11 @@ else if ($id || $ref)
 	        print '</td></tr>';
 		}
 
+		// Other attributes
+		$parameters = array('colspan' => ' colspan="3"');
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print "</table>";
 
 		print '</div>';
@@ -2140,298 +2152,305 @@ else if ($id || $ref)
 		// Loop on each product to send/sent
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
-			print '<tr class="oddeven">';
+			$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => $editColspan, 'outputlangs' => $outputlangs);
+			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+			if($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-			// #
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			if(empty($reshook))
 			{
-				print '<td align="center">'.($i+1).'</td>';
-			}
+			    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+				print '<tr class="oddeven">';
 
-			// Predefined product or service
-			if ($lines[$i]->fk_product > 0)
-			{
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+				// #
+				if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 				{
-					$prod = new Product($db);
-					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+					print '<td align="center">'.($i+1).'</td>';
+				}
+
+				// Predefined product or service
+				if ($lines[$i]->fk_product > 0)
+				{
+					// Define output language
+					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					{
+						$prod = new Product($db);
+						$prod->fetch($lines[$i]->fk_product);
+						$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+					}
+					else
+						$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
+
+					print '<td>';
+
+					// Show product and description
+					$product_static->type=$lines[$i]->fk_product_type;
+					$product_static->id=$lines[$i]->fk_product;
+					$product_static->ref=$lines[$i]->ref;
+					$product_static->status_batch=$lines[$i]->product_tobatch;
+					$text=$product_static->getNomUrl(1);
+					$text.= ' - '.$label;
+					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
+					print $form->textwithtooltip($text,$description,3,'','',$i);
+					print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					{
+						print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
+					}
+					print "</td>\n";
 				}
 				else
-					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
-
-				print '<td>';
-
-				// Show product and description
-				$product_static->type=$lines[$i]->fk_product_type;
-				$product_static->id=$lines[$i]->fk_product;
-				$product_static->ref=$lines[$i]->ref;
-				$product_static->status_batch=$lines[$i]->product_tobatch;
-				$text=$product_static->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
 				{
-					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
-				}
-				print "</td>\n";
-			}
-			else
-			{
-				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+					print "<td>";
+					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
+					else $text = img_object($langs->trans('Product'),'product');
 
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
-				} else {
-					print $text.' '.nl2br($lines[$i]->description);
-				}
-
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				print "</td>\n";
-			}
-
-			// Qty ordered
-			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
-
-			// Qty in other shipments (with shipment and warehouse used)
-    		if ($origin && $origin_id > 0)
-    		{
-    			print '<td align="center" class="nowrap">';
-    			foreach ($alreadysent as $key => $val)
-    			{
-    			    if ($lines[$i]->fk_origin_line == $key)
-    			    {
-    			        $j = 0;
-    			        foreach($val as $shipmentline_id=> $shipmentline_var)
-    			        {
-    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
-
-    			            $j++;
-    			            if ($j > 1) print '<br>';
-    			            $shipment_static->fetch($shipmentline_var['shipment_id']);
-    			            print $shipment_static->getNomUrl(1);
-    			            print ' - '.$shipmentline_var['qty_shipped'];
-    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-    			            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
-    			            {
-    			                $warehousestatic->fetch($shipmentline_var['warehouse']);
-    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
-    			            }
-    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-    			        }
-    			    }
-    			}
-    		}
-			print '</td>';
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				// edit mode
-				print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
-				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
-				{
-					print '<!-- case edit 1 -->';
-					$line = new ExpeditionLigne($db);
-					foreach ($lines[$i]->detail_batch as $detail_batch)
-					{
-						print '<tr>';
-						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'">' . '</td>';
-						// Batch number managment
-						if ($lines[$i]->entrepot_id == 0)
-						{
-							// only show lot numbers from src warehouse when shipping from multiple warehouses
-							$line->fetch($detail_batch->fk_expeditiondet);
-						}
-						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
-						print '</tr>';
+					if (! empty($lines[$i]->label)) {
+						$text.= ' <strong>'.$lines[$i]->label.'</strong>';
+						print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+					} else {
+						print $text.' '.nl2br($lines[$i]->description);
 					}
-					// add a 0 qty lot row to be able to add a lot
-					print '<tr>';
-					// Qty to ship or shipped
-					print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
-					// Batch number managment
-					print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
-					print '</tr>';
+
+					print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+					print "</td>\n";
 				}
-				else if (! empty($conf->stock->enabled))
+
+				// Qty ordered
+				print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
+
+				// Qty in other shipments (with shipment and warehouse used)
+	    		if ($origin && $origin_id > 0)
+	    		{
+	    			print '<td align="center" class="nowrap">';
+	    			foreach ($alreadysent as $key => $val)
+	    			{
+	    			    if ($lines[$i]->fk_origin_line == $key)
+	    			    {
+	    			        $j = 0;
+	    			        foreach($val as $shipmentline_id=> $shipmentline_var)
+	    			        {
+	    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
+
+	    			            $j++;
+	    			            if ($j > 1) print '<br>';
+	    			            $shipment_static->fetch($shipmentline_var['shipment_id']);
+	    			            print $shipment_static->getNomUrl(1);
+	    			            print ' - '.$shipmentline_var['qty_shipped'];
+	    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+	    			            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
+	    			            {
+	    			                $warehousestatic->fetch($shipmentline_var['warehouse']);
+	    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+	    			            }
+	    			            print ' '.$form->textwithpicto('', $htmltext, 1);
+	    			        }
+	    			    }
+	    			}
+	    		}
+				print '</td>';
+
+				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
-					if ($lines[$i]->fk_product > 0)
+					// edit mode
+					print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
+					if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 					{
-						if ($lines[$i]->entrepot_id > 0)
+						print '<!-- case edit 1 -->';
+						$line = new ExpeditionLigne($db);
+						foreach ($lines[$i]->detail_batch as $detail_batch)
 						{
-							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
-							// Warehouse source
-							print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+							print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'">' . '</td>';
 							// Batch number managment
-							print '<td> - ' . $langs->trans("NA") . '</td>';
+							if ($lines[$i]->entrepot_id == 0)
+							{
+								// only show lot numbers from src warehouse when shipping from multiple warehouses
+								$line->fetch($detail_batch->fk_expeditiondet);
+							}
+							print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
 							print '</tr>';
 						}
-						else if (count($lines[$i]->details_entrepot) > 1)
+						// add a 0 qty lot row to be able to add a lot
+						print '<tr>';
+						// Qty to ship or shipped
+						print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
+						// Batch number managment
+						print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
+						print '</tr>';
+					}
+					else if (! empty($conf->stock->enabled))
+					{
+						if ($lines[$i]->fk_product > 0)
 						{
-							print '<!-- case edit 3 -->';
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+							if ($lines[$i]->entrepot_id > 0)
 							{
+								print '<!-- case edit 2 -->';
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+								print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
 								// Warehouse source
-								print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+								print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
 								// Batch number managment
 								print '<td> - ' . $langs->trans("NA") . '</td>';
 								print '</tr>';
 							}
+							else if (count($lines[$i]->details_entrepot) > 1)
+							{
+								print '<!-- case edit 3 -->';
+								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+								{
+									print '<tr>';
+									// Qty to ship or shipped
+									print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+									// Warehouse source
+									print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+									// Batch number managment
+									print '<td> - ' . $langs->trans("NA") . '</td>';
+									print '</tr>';
+								}
+							}
+							else
+							{
+								print '<!-- case edit 4 -->';
+								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
+							}
 						}
 						else
 						{
-							print '<!-- case edit 4 -->';
-							print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
+							print '<!-- case edit 5 -->';
+							print '<tr>';
+							// Qty to ship or shipped
+							print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+							// Warehouse source
+							print '<td>' . '</td>';
+							// Batch number managment
+							print '<td>' . '</td>';
+							print '</tr>';
 						}
 					}
-					else
-					{
-						print '<!-- case edit 5 -->';
-						print '<tr>';
-						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
-						// Warehouse source
-						print '<td>' . '</td>';
-						// Batch number managment
-						print '<td>' . '</td>';
-						print '</tr>';
-					}
-				}
-				print '</table></td>';
-			}
-			else
-			{
-				// Qty to ship or shipped
-				print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
-
-				// Warehouse source
-				if (! empty($conf->stock->enabled))
-				{
-					print '<td align="left">';
-					if ($lines[$i]->entrepot_id > 0)
-					{
-						$entrepot = new Entrepot($db);
-						$entrepot->fetch($lines[$i]->entrepot_id);
-						print $entrepot->getNomUrl(1);
-					}
-					else if (count($lines[$i]->details_entrepot) > 1)
-					{
-						$detail = '';
-						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-						{
-							if ($detail_entrepot->entrepot_id > 0)
-							{
-								$entrepot = new Entrepot($db);
-								$entrepot->fetch($detail_entrepot->entrepot_id);
-								$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
-							}
-						}
-						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
-					}
-					print '</td>';
-				}
-
-				// Batch number managment
-				if (! empty($conf->productbatch->enabled))
-				{
-					if (isset($lines[$i]->detail_batch))
-					{
-						print '<!-- Detail of lot -->';
-						print '<td>';
-						if ($lines[$i]->product_tobatch)
-						{
-							$detail = '';
-							foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
-							{
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
-							}
-							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-						}
-						else
-						{
-							print $langs->trans("NA");
-						}
-						print '</td>';
-					} else {
-						print '<td></td>';
-					}
-				}
-			}
-
-			// Weight
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Volume
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Size
-			//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				print '<td align="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
-			}
-			else if ($object->statut == 0)
-			{
-				// edit-delete buttons
-				print '<td class="linecoledit" align="center">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
-				print '</td>';
-				print '<td class="linecoldelete" width="10">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
-				print '</td>';
-
-				// Display lines extrafields
-				if (! empty($rowExtrafieldsStart))
-				{
-					print $rowExtrafieldsStart;
-					print $rowExtrafieldsView;
-					print $rowEnd;
-				}
-			}
-			print "</tr>";
-
-			// Display lines extrafields
-			if (is_array($extralabelslines) && count($extralabelslines)>0) {
-				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
-				$line = new ExpeditionLigne($db);
-				$line->fetch_optionals($lines[$i]->id);
-				print '<tr class="oddeven">';
-				if ($action == 'editline' && $lines[$i]->id == $line_id)
-				{
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print '</table></td>';
 				}
 				else
 				{
-					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					// Qty to ship or shipped
+					print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
+
+					// Warehouse source
+					if (! empty($conf->stock->enabled))
+					{
+						print '<td align="left">';
+						if ($lines[$i]->entrepot_id > 0)
+						{
+							$entrepot = new Entrepot($db);
+							$entrepot->fetch($lines[$i]->entrepot_id);
+							print $entrepot->getNomUrl(1);
+						}
+						else if (count($lines[$i]->details_entrepot) > 1)
+						{
+							$detail = '';
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+							{
+								if ($detail_entrepot->entrepot_id > 0)
+								{
+									$entrepot = new Entrepot($db);
+									$entrepot->fetch($detail_entrepot->entrepot_id);
+									$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+								}
+							}
+							print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
+						}
+						print '</td>';
+					}
+
+					// Batch number managment
+					if (! empty($conf->productbatch->enabled))
+					{
+						if (isset($lines[$i]->detail_batch))
+						{
+							print '<!-- Detail of lot -->';
+							print '<td>';
+							if ($lines[$i]->product_tobatch)
+							{
+								$detail = '';
+								foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
+								{
+									$detail.= $langs->trans("Batch").': '.$dbatch->batch;
+									$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
+									$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
+									$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+									$detail.= '<br>';
+								}
+								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+							}
+							else
+							{
+								print $langs->trans("NA");
+							}
+							print '</td>';
+						} else {
+							print '<td></td>';
+						}
+					}
+				}
+
+				// Weight
+				print '<td align="center">';
+				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
+				else print '&nbsp;';
+				print '</td>';
+
+				// Volume
+				print '<td align="center">';
+				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
+				else print '&nbsp;';
+				print '</td>';
+
+				// Size
+				//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
+
+				if ($action == 'editline' && $lines[$i]->id == $line_id)
+				{
+					print '<td align="center" colspan="2" valign="middle">';
+					print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
+					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+				}
+				else if ($object->statut == 0)
+				{
+					// edit-delete buttons
+					print '<td class="linecoledit" align="center">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+					print '</td>';
+					print '<td class="linecoldelete" width="10">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+					print '</td>';
+
+					// Display lines extrafields
+					if (! empty($rowExtrafieldsStart))
+					{
+						print $rowExtrafieldsStart;
+						print $rowExtrafieldsView;
+						print $rowEnd;
+					}
+				}
+				print "</tr>";
+
+				// Display lines extrafields
+				if (is_array($extralabelslines) && count($extralabelslines)>0) {
+					$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
+					$line = new ExpeditionLigne($db);
+					$line->fetch_optionals($lines[$i]->id);
+					print '<tr class="oddeven">';
+					if ($action == 'editline' && $lines[$i]->id == $line_id)
+					{
+						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					}
+					else
+					{
+						print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					}
+					print '</tr>';
 				}
-				print '</tr>';
 			}
 		}
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index cb058e44598..bbf990f2ec6 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -42,6 +42,8 @@ if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 	requi
 // Load translation files required by the page
 $langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm'));
 
+$hookmanager->initHooks(array('ordershipmentcard'));
+
 $id=GETPOST('id','int');			// id of order
 $ref= GETPOST('ref','alpha');
 $action=GETPOST('action','alpha');
@@ -613,6 +615,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= " cd.qty,";
 		$sql.= ' cd.date_start,';
 		$sql.= ' cd.date_end,';
+		$sql.= ' cd.special_code,';
 		$sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
@@ -648,164 +651,169 @@ if ($id > 0 || ! empty($ref))
 			{
 				$objp = $db->fetch_object($resql);
 
+				$parameters = array('i' => $i, 'line' => $objp, 'num' => $num);
+				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-				// Show product and description
-				$type=isset($objp->type)?$objp->type:$objp->product_type;
-
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (! empty($objp->date_start)) $type=1;
-				if (! empty($objp->date_end)) $type=1;
-
-				print '<tr class="oddeven">';
-
-				// Product label
-				if ($objp->fk_product > 0)
+				if(empty($reshook))
 				{
-					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					// Show product and description
+					$type=isset($objp->type)?$objp->type:$objp->product_type;
+
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (! empty($objp->date_start)) $type=1;
+					if (! empty($objp->date_end)) $type=1;
+
+					print '<tr class="oddeven">';
+
+					// Product label
+					if ($objp->fk_product > 0)
 					{
-						$object->fetch_thirdparty();
-
-						$prod = new Product($db);
-                        $prod->id = $objp->fk_product;
-                        $prod->entity = $objp->entity;
-						$prod->getMultiLangs();
-
-						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
+						// Define output language
+						if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlang);
+							$object->fetch_thirdparty();
+
+							$prod = new Product($db);
+	                        $prod->id = $objp->fk_product;
+	                        $prod->entity = $objp->entity;
+							$prod->getMultiLangs();
+
+							$outputlangs = $langs;
+							$newlang='';
+							if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+							if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+							if (! empty($newlang))
+							{
+								$outputlangs = new Translate("",$conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
+
+							$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+						}
+						else
+							$label = (! empty($objp->label)?$objp->label:$objp->product_label);
+
+						print '<td>';
+						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+						// Show product and description
+						$product_static->type=$type;
+						$product_static->id=$objp->fk_product;
+						$product_static->ref=$objp->ref;
+	                    $product_static->entity = $objp->entity;
+						$text=$product_static->getNomUrl(1);
+						$text.= ' - '.$label;
+						$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
+	                    $description.= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+						print $form->textwithtooltip($text,$description,3,'','',$i);
+
+						// Show range
+						print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+
+						// Add description in form
+						if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+						{
+							print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 						}
 
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+						print '</td>';
 					}
 					else
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
-
-					print '<td>';
-					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-					// Show product and description
-					$product_static->type=$type;
-					$product_static->id=$objp->fk_product;
-					$product_static->ref=$objp->ref;
-                    $product_static->entity = $objp->entity;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.$label;
-					$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
-                    $description.= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-
-					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
-
-					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
 					{
-						print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+						print "<td>";
+						if ($type==1) $text = img_object($langs->trans('Service'),'service');
+						else $text = img_object($langs->trans('Product'),'product');
+
+						if (! empty($objp->label)) {
+							$text.= ' <strong>'.$objp->label.'</strong>';
+							print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+						} else {
+							print $text.' '.nl2br($objp->description);
+						}
+
+						// Show range
+						print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+						print "</td>\n";
 					}
 
-					print '</td>';
-				}
-				else
-				{
-					print "<td>";
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					// Qty ordered
+					print '<td align="center">' . $objp->qty . '</td>';
 
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
-					} else {
-						print $text.' '.nl2br($objp->description);
-					}
-
-					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
-					print "</td>\n";
-				}
-
-				// Qty ordered
-				print '<td align="center">' . $objp->qty . '</td>';
-
-				// Qty already shipped
-				$qtyProdCom=$objp->qty;
-				print '<td align="center">';
-				// Nb of sending products for this line of order
-				$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
-				print $qtyAlreadyShipped;
-				print '</td>';
-
-				// Qty remains to ship
-				print '<td align="center">';
-				if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
-					$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
-					$toBeShippedTotal += $toBeShipped[$objp->fk_product];
-					print $toBeShipped[$objp->fk_product];
-				}
-				else
-				{
-					print '0 ('.$langs->trans("Service").')';
-				}
-				print '</td>';
-
-				if ($objp->fk_product > 0)
-				{
-					$product = new Product($db);
-					$product->fetch($objp->fk_product);
-					$product->load_stock('warehouseopen');
-				}
-
-				if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
-				{
+					// Qty already shipped
+					$qtyProdCom=$objp->qty;
 					print '<td align="center">';
-					print $product->stock_reel;
-					if ($product->stock_reel < $toBeShipped[$objp->fk_product])
+					// Nb of sending products for this line of order
+					$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
+					print $qtyAlreadyShipped;
+					print '</td>';
+
+					// Qty remains to ship
+					print '<td align="center">';
+					if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
-						print ' '.img_warning($langs->trans("StockTooLow"));
+						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
+						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
+						print $toBeShipped[$objp->fk_product];
+					}
+					else
+					{
+						print '0 ('.$langs->trans("Service").')';
 					}
 					print '</td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				print "</tr>\n";
 
-				// Show subproducts lines
-				if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
-				{
-					// Set tree of subproducts in product->sousprods
-					$product->get_sousproduits_arbo();
-					//var_dump($product->sousprods);exit;
-
-					// Define a new tree with quantiies recalculated
-					$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-					//var_dump($prods_arbo);
-					if (count($prods_arbo) > 0)
+					if ($objp->fk_product > 0)
 					{
-						foreach($prods_arbo as $key => $value)
+						$product = new Product($db);
+						$product->fetch($objp->fk_product);
+						$product->load_stock('warehouseopen');
+					}
+
+					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
+					{
+						print '<td align="center">';
+						print $product->stock_reel;
+						if ($product->stock_reel < $toBeShipped[$objp->fk_product])
 						{
-							$img='';
-							if ($value['stock'] < $value['stock_alert'])
+							print ' '.img_warning($langs->trans("StockTooLow"));
+						}
+						print '</td>';
+					}
+					else
+					{
+						print '<td>&nbsp;</td>';
+					}
+					print "</tr>\n";
+
+					// Show subproducts lines
+					if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
+					{
+						// Set tree of subproducts in product->sousprods
+						$product->get_sousproduits_arbo();
+						//var_dump($product->sousprods);exit;
+
+						// Define a new tree with quantiies recalculated
+						$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+						//var_dump($prods_arbo);
+						if (count($prods_arbo) > 0)
+						{
+							foreach($prods_arbo as $key => $value)
 							{
-								$img=img_warning($langs->trans("StockTooLow"));
+								$img='';
+								if ($value['stock'] < $value['stock_alert'])
+								{
+									$img=img_warning($langs->trans("StockTooLow"));
+								}
+								print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
+								print '<td align="center"> '.$value['nb_total'].'</td>';
+								print '<td>&nbsp</td>';
+								print '<td>&nbsp</td>';
+								print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
 							}
-							print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
-							print '<td align="center"> '.$value['nb_total'].'</td>';
-							print '<td>&nbsp</td>';
-							print '<td>&nbsp</td>';
-							print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
 						}
 					}
 				}
-
 				$i++;
 			}
 			$db->free($resql);
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index d6cefb24d83..2e1c9cb47c1 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -346,7 +346,7 @@ else
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
+			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
 
 			/*
 			 * Confirmation de la suppression
@@ -607,87 +607,85 @@ else
 			$var=true;
 			while ($i < $num_prod)
 			{
+				$parameters = array('i' => $i, 'line' => $object->lines[$i], 'num' => $num_prod);
+				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+				if(empty($reshook)) {
 
-				print '<tr class="oddeven">';
-				if ($object->lines[$i]->fk_product > 0)
-				{
-					$product = new Product($db);
-					$product->fetch($object->lines[$i]->fk_product);
+					print '<tr class="oddeven">';
+					if ($object->lines[$i]->fk_product > 0) {
+						$product = new Product($db);
+						$product->fetch($object->lines[$i]->fk_product);
 
-					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
-						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlang);
+						// Define output language
+						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+							$outputlangs = $langs;
+							$newlang = '';
+							if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+							if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+							if (!empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
+
+							$label = (!empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
+						} else
+							$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : $object->lines[$i]->product_label);
+
+						print '<td>';
+
+						// Affiche ligne produit
+						$text = '<a href="' . DOL_URL_ROOT . '/product/card.php?id=' . $object->lines[$i]->fk_product . '">';
+						if ($object->lines[$i]->fk_product_type == 1) $text .= img_object($langs->trans('ShowService'), 'service');
+						else $text .= img_object($langs->trans('ShowProduct'), 'product');
+						$text .= ' ' . $object->lines[$i]->product_ref . '</a>';
+						$text .= ' - ' . $label;
+						$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($object->lines[$i]->description));
+						//print $description;
+						print $form->textwithtooltip($text, $description, 3, '', '', $i);
+						print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
+							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>' . dol_htmlentitiesbr($object->lines[$i]->description) : '';
+						}
+					} else {
+						print "<td>";
+						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
+						else $text = img_object($langs->trans('Product'), 'product');
+
+						if (!empty($object->lines[$i]->label)) {
+							$text .= ' <strong>' . $object->lines[$i]->label . '</strong>';
+							print $form->textwithtooltip($text, $object->lines[$i]->description, 3, '', '', $i);
+						} else {
+							print $text . ' ' . nl2br($object->lines[$i]->description);
 						}
 
-						$label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
-					}
-					else
-						$label = ( ! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label);
-
-					print '<td>';
-
-					// Affiche ligne produit
-					$text = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$object->lines[$i]->fk_product.'">';
-					if ($object->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
-					else $text.= img_object($langs->trans('ShowProduct'),'product');
-					$text.= ' '.$object->lines[$i]->product_ref.'</a>';
-					$text.= ' - '.$label;
-					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->description));
-					//print $description;
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-					print_date_range($object->lines[$i]->date_start,$object->lines[$i]->date_end);
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
-						print (! empty($object->lines[$i]->description) && $object->lines[$i]->description!=$object->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->description):'';
-					}
-				}
-				else
-				{
-					print "<td>";
-					if ($object->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($object->lines[$i]->label)) {
-						$text.= ' <strong>'.$object->lines[$i]->label.'</strong>';
-						print $form->textwithtooltip($text,$object->lines[$i]->description,3,'','',$i);
-					} else {
-						print $text.' '.nl2br($object->lines[$i]->description);
+						print_date_range($objp->date_start, $objp->date_end);
+						print "</td>\n";
 					}
 
-					print_date_range($objp->date_start,$objp->date_end);
-					print "</td>\n";
-				}
+					print '<td align="center">' . $object->lines[$i]->qty_asked . '</td>';
+					print '<td align="center">' . $object->lines[$i]->qty_shipped . '</td>';
 
-				print '<td align="center">'.$object->lines[$i]->qty_asked.'</td>';
-				print '<td align="center">'.$object->lines[$i]->qty_shipped.'</td>';
+					print "</tr>";
 
-				print "</tr>";
-
-				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0) {
-					$colspan=2;
-					$mode = ($object->statut == 0) ? 'edit' : 'view';
-					$line = new LivraisonLigne($db);
-					$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);
-						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+					//Display lines extrafields
+					if (is_array($extralabelslines) && count($extralabelslines) > 0) {
+						$colspan = 2;
+						$mode = ($object->statut == 0) ? 'edit' : 'view';
+						$line = new LivraisonLigne($db);
+						$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);
+							$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>';
 					}
-					print '<tr class="oddeven">';
-					print $line->showOptionals($extrafieldsline, $mode, array('style'=>$bc[$var], 'colspan'=>$colspan),$i);
-					print '</tr>';
 				}
 
 				$i++;

From a524bbc5c692523fe6fcfdb1ab609b21adbf5ef2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 13 Mar 2019 15:58:58 +0100
Subject: [PATCH 41/70] FIX : when we create deposit with multi tva, we mustn't
 add line if amount = 0 (example when we have a 100% reduc on one of origin
 invoice line)

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b379bf31602..dcf167da515 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1218,6 +1218,9 @@ if (empty($reshook))
 
 							foreach ($amountdeposit as $tva => $amount)
 							{
+
+								if(empty($amount)) continue;
+
 								$arraylist = array('amount' => 'FixAmount','variable' => 'VarAmount');
 								$descline = $langs->trans('Deposit');
 								$descline.= ' - '.$langs->trans($arraylist[$typeamount]);

From 885797b748ee286e30ecf1066e69bc544034de43 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 14 Mar 2019 17:00:51 +0100
Subject: [PATCH 42/70] FIX : useless join

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 5b3548cc8fb..5c523640033 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -299,7 +299,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	//if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = x.fk_user_author";
 	$sql.= " AND x.entity = ".$conf->entity;
 	if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) $sql.=' AND x.fk_user_author IN ('.join(',',$childids).')';

From 3fb6978bc8c288deaabfb2f6228351d1204ec7a2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 14 Mar 2019 17:36:49 +0100
Subject: [PATCH 43/70] FIX : no need to test anything to display documents
 tabs on expense report

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index c204809e9a1..9162676795c 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -382,7 +382,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet','project'); // Test for project object
 		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
+		$nocheck = array('barcode','stock','expensereport');	// No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtablename not defined, we use same name for table than module name

From 8375b47e743fab913332e027513f7e7d73e7aa48 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 15 Mar 2019 10:21:50 +0100
Subject: [PATCH 44/70] FIX : in fact expensereport must be in $check array

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9162676795c..50f6e516a9f 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -377,12 +377,12 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		if ($feature == 'project') $feature='projet';
 		if ($feature == 'task') $feature='projet_task';
 
-		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie','expensereport'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
 		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet','project'); // Test for project object
 		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock','expensereport');	// No test
+		$nocheck = array('barcode','stock');	// No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtablename not defined, we use same name for table than module name

From 2da60fb885cbdfbd0f0ec3fdf4d8277b4b41225b Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Fri, 15 Mar 2019 15:15:03 +0100
Subject: [PATCH 45/70] Fix var name

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

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 89ed60a0632..164a7462e83 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -498,7 +498,7 @@ $holiday = new Holiday($db);
 $isavailable=array();
 
 $statusofholidaytocheck = '3';
-$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholiday);	// $daytoparse is a date with hours = 0
+$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholidaytocheck);	// $daytoparse is a date with hours = 0
 $isavailable[$daytoparse]=$isavailablefordayanduser;			// in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 if (count($tasksarray) > 0)

From b33c366b0227f9f185a9664b4eea55fb3045c802 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2019 19:16:49 +0100
Subject: [PATCH 46/70] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index dcf167da515..43f727a7ae8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1218,8 +1218,7 @@ if (empty($reshook))
 
 							foreach ($amountdeposit as $tva => $amount)
 							{
-
-								if(empty($amount)) continue;
+								if (empty($amount)) continue;
 
 								$arraylist = array('amount' => 'FixAmount','variable' => 'VarAmount');
 								$descline = $langs->trans('Deposit');

From 68945c7d518dfe27e4cc9ca1a522b02eeca2742f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 16 Mar 2019 09:10:25 +0100
Subject: [PATCH 47/70] Fix #10177

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7fd461000ef..76d627249eb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -973,7 +973,7 @@ else
         $object->idprof6			= GETPOST('idprof6', 'alpha');
         $object->typent_id			= GETPOST('typent_id', 'int');
         $object->effectif_id		= GETPOST('effectif_id', 'int');
-        $object->civility_id		= GETPOST('civility_id', 'int');
+        $object->civility_id		= GETPOST('civility_id', 'alpha');
 
         $object->tva_assuj			= GETPOST('assujtva_value', 'int');
         $object->status				= GETPOST('status', 'int');

From 21e2d364219b5df2faf78c018246213827fcea0f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 16 Mar 2019 09:28:47 +0100
Subject: [PATCH 48/70] Fix #9311

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

diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index c20b26b1263..b2126aae80b 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -26,6 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement_fourn.class.p
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
+$langs->loadLangs(array('bills'));
+
 // Security check
 $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;

From 46b39dd6a97bd802cb97059f4e43060efaa51cf9 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 16 Mar 2019 18:13:43 +0100
Subject: [PATCH 49/70] Fix #9961 : deal with supplier credit note refund like
 with customers

---
 htdocs/fourn/facture/paiement.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8a87d4903a1..57ca70dfa98 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -71,7 +71,7 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 $optioncss = GETPOST('optioncss','alpha');
 
-$amounts = array();array();
+$amounts = array();
 $amountsresttopay=array();
 $addwarning=0;
 
@@ -251,6 +251,22 @@ if (empty($reshook))
 
 	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 
+        // Clean parameters amount if payment is for a credit note
+        if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE)
+        {
+            foreach ($amounts as $key => $value)	// How payment is dispatch
+            {
+                $newvalue = price2num($value,'MT');
+                $amounts[$key] = -$newvalue;
+            }
+
+            foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
+            {
+                $newvalue = price2num($value,'MT');
+                $multicurrency_amounts[$key] = -$newvalue;
+            }
+        }
+
 	    if (! $error)
 	    {
 	        $db->begin();
@@ -431,6 +447,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<input type="hidden" name="facid" value="'.$facid.'">';
             print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
             print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
+            print '<input type="hidden" name="type" id="invoice_type" value="'.$object->type.'">';
             print '<input type="hidden" name="societe" value="'.$obj->name.'">';
 
             dol_fiche_head(null);
@@ -600,14 +617,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							    print '</td>';
 	                        }
 
-	                        print '<td align="right">'.price($objp->total_ttc).'</td>';
+	                        print '<td align="right">'.price($sign * $objp->total_ttc).'</td>';
 
-	                        print '<td align="right">'.price($objp->am);
+	                        print '<td align="right">'.price($sign * $objp->am);
 							if ($creditnotes) print '+'.price($creditnotes);
 							if ($deposits) print '+'.price($deposits);	
 							print '</td>';
 
-	                        print '<td align="right">'.price($remaintopay).'</td>';
+	                        print '<td align="right">'.price($sign * $remaintopay).'</td>';
 
 	                        // Amount
 	                        print '<td align="center">';

From 57091f08b0da5735676ddc54445405fcabaec222 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 18 Mar 2019 10:53:43 +0100
Subject: [PATCH 50/70] FIX missing entity filter and wrong var name

---
 htdocs/compta/facture/class/facture.class.php | 2 +-
 htdocs/core/class/html.form.class.php         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a6e979cdd10..d303e6edf21 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1605,7 +1605,7 @@ class Facture extends CommonInvoice
 		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null").",";
 		$sql.= " situation_cycle_ref=".(empty($this->situation_cycle_ref)?"null":$this->db->escape($this->situation_cycle_ref)).",";
 		$sql.= " situation_counter=".(empty($this->situation_counter)?"null":$this->db->escape($this->situation_counter)).",";
-		$sql.= " situation_final=".(empty($this->situation_counter)?"0":$this->db->escape($this->situation_counter));
+		$sql.= " situation_final=".(empty($this->situation_final)?"0":$this->db->escape($this->situation_final));
 		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c451a83a4fb..8f0af0a5004 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3324,7 +3324,10 @@ class Form
 		$langs->load('bills');
 
 		$opt = '<option value ="" selected></option>';
-		$sql = 'SELECT rowid, facnumber, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';
+		$sql = 'SELECT rowid, facnumber, situation_cycle_ref, situation_counter, situation_final, fk_soc';
+		$sql.= ' FROM ' . MAIN_DB_PREFIX . 'facture';
+		$sql.= ' WHERE entity IN ('.getEntity('facture').')';
+		$sql.= ' AND situation_counter>=1';
 		$sql.= ' ORDER by situation_cycle_ref, situation_counter desc';
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0) {

From 4c85068a85e533e333c45c814c647346cf33aa29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Mar 2019 11:53:04 +0100
Subject: [PATCH 51/70] FIX Can't insert if there is extrafields mandatory on
 another entity.

---
 htdocs/core/class/commonobject.class.php | 17 +++++++++++++++--
 htdocs/core/class/extrafields.class.php  | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d8d27a0378a..77e0a557c5d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4979,8 +4979,9 @@ abstract class CommonObject
 			$table_element = $this->table_element;
 			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
 
+			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
+
 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
-			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
@@ -4991,6 +4992,11 @@ abstract class CommonObject
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
 					$sql.=",".$attributeKey;
 			}
+			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
+			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			{
+			    $sql.=",".$tmpkey;
+			}
 			$sql .= ") VALUES (".$this->id;
 
 			foreach($new_array_options as $key => $value)
@@ -5009,10 +5015,17 @@ abstract class CommonObject
 					}
 				}
 			}
+			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
+			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			{
+			    if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
+			    else $sql.=", ''";
+			}
+
 			$sql.=")";
 
-			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
 			$resql = $this->db->query($sql);
+
 			if (! $resql)
 			{
 				$this->error=$this->db->lasterror();
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 48eabbefe9e..679352dde06 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -747,7 +747,7 @@ class ExtraFields
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
 	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
+	function fetch_name_optionals_label($elementtype, $forceload=false)
 	{
 		global $conf;
 
@@ -783,8 +783,8 @@ class ExtraFields
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed,entity,enabled";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
+		if ($elementtype) $sql.= " WHERE elementtype = '".$elementtype."'";	// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -794,6 +794,16 @@ class ExtraFields
 			{
 				while ($tab = $this->db->fetch_object($resql))
 				{
+				    if ($tab->entity != 0 && $tab->entity != $conf->entity)
+				    {
+				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field
+				        if ($tab->fieldrequired)
+				        {
+				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name]=$tab->type;
+				        }
+				        continue;
+				    }
+
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{

From 032aa869e4124a4bee4752303690ba4090f0f82d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Mar 2019 11:54:14 +0100
Subject: [PATCH 52/70] FIX Can't insert if there is extrafields mandatory on
 another entity. FIX Can't set default value of extrafield of type varchar

---
 htdocs/core/class/commonobject.class.php | 16 +++++++++++-----
 htdocs/core/class/extrafields.class.php  |  2 +-
 htdocs/core/db/mysqli.class.php          |  2 +-
 htdocs/core/db/pgsql.class.php           |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 77e0a557c5d..90bd03513fe 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4993,9 +4993,12 @@ abstract class CommonObject
 					$sql.=",".$attributeKey;
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-			    $sql.=",".$tmpkey;
+    			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			{
+    			    $sql.=",".$tmpkey;
+    			}
 			}
 			$sql .= ") VALUES (".$this->id;
 
@@ -5016,10 +5019,13 @@ abstract class CommonObject
 				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-			    if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
-			    else $sql.=", ''";
+			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			{
+    			    if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
+    			    else $sql.=", ''";
+    			}
 			}
 
 			$sql.=")";
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 679352dde06..6e92509756f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -797,7 +797,7 @@ class ExtraFields
 				    if ($tab->entity != 0 && $tab->entity != $conf->entity)
 				    {
 				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field
-				        if ($tab->fieldrequired)
+				        if ($tab->fieldrequired && is_null($tab->fielddefault))
 				        {
 				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name]=$tab->type;
 				        }
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 23c19542ae6..738be0b2d86 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -835,7 +835,7 @@ class DoliDBMysqli extends DoliDB
         if ($field_desc['default'] != '')
         {
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 3d365142a0a..ffbabc24d79 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1138,7 +1138,7 @@ class DoliDBPgsql extends DoliDB
 		if ($field_desc['default'] != '')
 		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+        	elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
 		}
 
 		dol_syslog($sql,LOG_DEBUG);

From a1fe1bb58c60ea1ff545c7e9362d9dbd8b87d11d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Mar 2019 12:33:39 +0100
Subject: [PATCH 53/70] FIX when 2 extra fields are mandatory in 2 different
 entities

---
 htdocs/core/class/commonobject.class.php | 12 +++++++++---
 htdocs/core/class/extrafields.class.php  |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 90bd03513fe..f0fe7bf437c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4997,7 +4997,10 @@ abstract class CommonObject
 			{
     			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    $sql.=",".$tmpkey;
+    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    {
+    			        $sql.=",".$tmpkey;
+    			    }
     			}
 			}
 			$sql .= ") VALUES (".$this->id;
@@ -5023,8 +5026,11 @@ abstract class CommonObject
 			{
 			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
-    			    else $sql.=", ''";
+    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    {
+                        if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
+                        else $sql.=", ''";
+    			    }
     			}
 			}
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 6e92509756f..6babf6709d8 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -796,7 +796,7 @@ class ExtraFields
 				{
 				    if ($tab->entity != 0 && $tab->entity != $conf->entity)
 				    {
-				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field
+				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value
 				        if ($tab->fieldrequired && is_null($tab->fielddefault))
 				        {
 				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name]=$tab->type;

From d10b94e72be2a1b58a901bb98dd26b7fc2eb4af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 21 Mar 2019 14:08:49 +0100
Subject: [PATCH 54/70] Update extrafields.class.php

---
 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 6babf6709d8..f8ae333935e 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1525,7 +1525,7 @@ class ExtraFields
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
 		}
 		elseif ($type == 'price')
 		{

From f37c1b928795cc78cd91d88ab166a818fcae35bb Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Fri, 22 Mar 2019 09:28:50 +0100
Subject: [PATCH 55/70] FIX: The minimum amount filter does not work in the VAT
 report per customer

---
 htdocs/compta/tva/clients.php | 535 +++++++++++++++++-----------------
 1 file changed, 261 insertions(+), 274 deletions(-)

diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index ae95d71ca9c..f09ee172a40 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -372,161 +372,156 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 		$subtot_coll_total_ht = 0;
 		$subtot_coll_vat = 0;
 
-		if (is_array($x_both[$thirdparty_id]['coll']['detail']))
-		{
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min)) {
 
-			// VAT Rate
-			print "<tr>";
-			print '<td class="tax_rate">';
-			if (is_numeric($thirdparty_id))
-			{
-				$company_static->fetch($thirdparty_id);
-				print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-			}
-			else
-			{
-				$tmpid = preg_replace('/userid_/','',$thirdparty_id);
-				$user_static->fetch($tmpid);
-				print $langs->trans("User").': '.$user_static->getNomUrl(1);
-			}
-			print '</td><td colspan="'.($span+1).'"></td>';
-			print '</tr>'."\n";
+			if (is_array($x_both[$thirdparty_id]['coll']['detail'])) {
 
-			foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type=1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type=1;
+				// VAT Rate
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty") . ': ' . $company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User") . ': ' . $user_static->getNomUrl(1);
 				}
+				print '</td><td colspan="' . ($span + 1) . '"></td>';
+				print '</tr>' . "\n";
 
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
-
-				// Invoice date
-				print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
-
-				// Payment date
-				if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
-				else print '<td></td>';
-
-				// Rate
-				print '<td align="right">' . $fields['drate'] . '</td>';
-
-				// Description
-				print '<td align="left">';
-				if ($fields['pid'])
-				{
-					$product_static->id=$fields['pid'];
-					$product_static->ref=$fields['pref'];
-					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
-					print $product_static->getNomUrl(1);
-					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+				foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
 					}
-				}
-				else
-				{
-					if ($type) {
-						$text = img_object($langs->trans('Service'),'service');
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+
+					print '<tr class="oddeven">';
+
+					// Ref
+					print '<td class="nowrap" align="left">' . $fields['link'] . '</td>';
+
+					// Invoice date
+					print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+					// Payment date
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+						print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
 					} else {
-						$text = img_object($langs->trans('Product'),'product');
+						print '<td></td>';
 					}
-					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
-						if ($reg[1]=='DEPOSIT') {
-							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
-						} elseif ($reg[1]=='CREDIT_NOTE') {
-							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+
+					// Rate
+					print '<td align="right">' . $fields['drate'] . '</td>';
+
+					// Description
+					print '<td align="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
 						} else {
-							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+							$text = img_object($langs->trans('Product'), 'product');
 						}
-					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-					// Show range
-					print_date_range($fields['ddate_start'],$fields['ddate_end']);
-				}
-				print '</td>';
-
-				// Total HT
-				if ($modetax != 1)
-				{
-					print '<td class="nowrap" align="right">';
-					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc']))
-					{
-						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
-						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
 					}
 					print '</td>';
-				}
 
-				// Payment
-				$ratiopaymentinvoice=1;
-				if ($modetax != 1)
-				{
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap" align="right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap" align="right">';
+						//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$payment_static->id = $fields['payment_id'];
+							print $payment_static->getNomUrl(2);
+						}
+						if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+							}
+						}
+						print '</td>';
+					}
+
+					// Total collected
 					print '<td class="nowrap" align="right">';
-					//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
-					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-					{
-						$payment_static->id=$fields['payment_id'];
-						print $payment_static->getNomUrl(2);
-					}
-					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-					{
-						print $langs->trans("NA");
-					} else {
-						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
-						}
-						print price(price2num($fields['payment_amount'],'MT'));
-						if (isset($fields['payment_amount'])) {
-							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
-						}
-					}
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
 					print '</td>';
+
+					// VAT
+					print '<td class="nowrap" align="right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					$subtot_coll_total_ht += $temp_ht;
+					$subtot_coll_vat += $temp_vat;
+					$x_coll_sum += $temp_vat;
 				}
 
-				// Total collected
-				print '<td class="nowrap" align="right">';
-				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
-				print price(price2num($temp_ht,'MT'),1);
-				print '</td>';
-
-				// VAT
-				print '<td class="nowrap" align="right">';
-				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
-				print price(price2num($temp_vat,'MT'),1);
-				//print price($fields['vat']);
-				print '</td>';
-				print '</tr>';
-
-				$subtot_coll_total_ht += $temp_ht;
-				$subtot_coll_vat      += $temp_vat;
-				$x_coll_sum           += $temp_vat;
 			}
+			// Total customers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td align="right">' . $langs->trans("Total") . ':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap" align="right">&nbsp;</td>';
+				print '<td align="right">&nbsp;</td>';
+			}
+			print '<td align="right">' . price(price2num($subtot_coll_total_ht, 'MT')) . '</td>';
+			print '<td class="nowrap" align="right">' . price(price2num($subtot_coll_vat, 'MT')) . '</td>';
+			print '</tr>';
 		}
-		// Total customers for this vat rate
-		print '<tr class="liste_total">';
-		print '<td colspan="4"></td>';
-		print '<td align="right">'.$langs->trans("Total").':</td>';
-		if ($modetax != 1) {
-			print '<td class="nowrap" align="right">&nbsp;</td>';
-			print '<td align="right">&nbsp;</td>';
-		}
-		print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
-		print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
-		print '</tr>';
 	}
 
 	if (count($x_coll) == 0)   // Show a total ine if nothing shown
@@ -567,161 +562,153 @@ if (! is_array($x_coll) || ! is_array($x_paye))
 		$subtot_paye_total_ht = 0;
 		$subtot_paye_vat = 0;
 
-		if (is_array($x_both[$thirdparty_id]['paye']['detail']))
-		{
-			print "<tr>";
-			print '<td class="tax_rate">';
-			if (is_numeric($thirdparty_id))
-			{
-				$company_static->fetch($thirdparty_id);
-				print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-			}
-			else
-			{
-				$tmpid = preg_replace('/userid_/','',$thirdparty_id);
-				$user_static->fetch($tmpid);
-				print $langs->trans("User").': '.$user_static->getNomUrl(1);
-			}
-			print '<td colspan="'.($span+1).'"></td>';
-			print '</tr>'."\n";
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['paye']['totalht'] > $min)) {
 
-			foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index=>$fields) {
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type=1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type=1;
+			if (is_array($x_both[$thirdparty_id]['paye']['detail'])) {
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty") . ': ' . $company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User") . ': ' . $user_static->getNomUrl(1);
 				}
+				print '<td colspan="' . ($span + 1) . '"></td>';
+				print '</tr>' . "\n";
 
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
-
-				// Invoice date
-				print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
-
-				// Payment date
-				if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
-				else print '<td></td>';
-
-				// Company name
-				print '<td align="left">' . $fields['company_link'] . '</td>';
-
-				// Description
-				print '<td align="left">';
-				if ($fields['pid'])
-				{
-					$product_static->id=$fields['pid'];
-					$product_static->ref=$fields['pref'];
-					$product_static->type=$fields['dtype'];		// We force with the type of line to have type how line is registered
-					print $product_static->getNomUrl(1);
-					if (dol_string_nohtmltag($fields['descr'])) {
-						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+				foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
 					}
-				}
-				else
-				{
-					if ($type) {
-						$text = img_object($langs->trans('Service'),'service');
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
+
+
+					print '<tr class="oddeven">';
+
+					// Ref
+					print '<td class="nowrap" align="left">' . $fields['link'] . '</td>';
+
+					// Invoice date
+					print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+
+					// Payment date
+					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+						print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
 					} else {
-						$text = img_object($langs->trans('Product'),'product');
+						print '<td></td>';
 					}
-					if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg)) {
-						if ($reg[1]=='DEPOSIT') {
-							$fields['descr']=$langs->transnoentitiesnoconv('Deposit');
-						} elseif ($reg[1]=='CREDIT_NOTE') {
-							$fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+
+					// Company name
+					print '<td align="left">' . $fields['company_link'] . '</td>';
+
+					// Description
+					print '<td align="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
 						} else {
-							$fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+							$text = img_object($langs->trans('Product'), 'product');
 						}
-					}
-					print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),24);
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-					// Show range
-					print_date_range($fields['ddate_start'],$fields['ddate_end']);
-				}
-				print '</td>';
-
-				// Total HT
-				if ($modetax != 1)
-				{
-					print '<td class="nowrap" align="right">';
-					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc']))
-					{
-						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-						$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
-						//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
 					}
 					print '</td>';
-				}
 
-				// Payment
-				$ratiopaymentinvoice=1;
-				if ($modetax != 1)
-				{
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap" align="right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap" align="right">';
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$paymentfourn_static->id = $fields['payment_id'];
+							print $paymentfourn_static->getNomUrl(2);
+						}
+
+						if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+							}
+						}
+						print '</td>';
+					}
+
+					// VAT paid
 					print '<td class="nowrap" align="right">';
-					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-					{
-						$paymentfourn_static->id=$fields['payment_id'];
-						print $paymentfourn_static->getNomUrl(2);
-					}
-
-					if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
-						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-					{
-						print $langs->trans("NA");
-					}
-					else
-					{
-						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
-							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
-						}
-						print price(price2num($fields['payment_amount'],'MT'));
-						if (isset($fields['payment_amount'])) {
-							print ' ('.round($ratiopaymentinvoice*100,2).'%)';
-						}
-					}
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
 					print '</td>';
+
+					// VAT
+					print '<td class="nowrap" align="right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					$subtot_paye_total_ht += $temp_ht;
+					$subtot_paye_vat += $temp_vat;
+					$x_paye_sum += $temp_vat;
 				}
-
-				// VAT paid
-				print '<td class="nowrap" align="right">';
-				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
-				print price(price2num($temp_ht,'MT'),1);
-				print '</td>';
-
-				// VAT
-				print '<td class="nowrap" align="right">';
-				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
-				print price(price2num($temp_vat,'MT'),1);
-				//print price($fields['vat']);
-				print '</td>';
-				print '</tr>';
-
-				$subtot_paye_total_ht += $temp_ht;
-				$subtot_paye_vat	  += $temp_vat;
-				$x_paye_sum		   += $temp_vat;
 			}
+			// Total suppliers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td align="right">' . $langs->trans("Total") . ':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap" align="right">&nbsp;</td>';
+				print '<td align="right">&nbsp;</td>';
+			}
+			print '<td align="right">' . price(price2num($subtot_paye_total_ht, 'MT')) . '</td>';
+			print '<td class="nowrap" align="right">' . price(price2num($subtot_paye_vat, 'MT')) . '</td>';
+			print '</tr>';
 		}
-		// Total suppliers for this vat rate
-		print '<tr class="liste_total">';
-		print '<td colspan="4"></td>';
-		print '<td align="right">'.$langs->trans("Total").':</td>';
-		if ($modetax != 1) {
-			print '<td class="nowrap" align="right">&nbsp;</td>';
-			print '<td align="right">&nbsp;</td>';
-		}
-		print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
-		print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
-		print '</tr>';
 	}
 
 	if (count($x_paye) == 0) {  // Show a total line if nothing shown

From 3ede626932bcce9e7500cbf832e5aa3a6d0e0fcf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 Mar 2019 22:30:52 +0100
Subject: [PATCH 56/70] FIX If we build one invoice for several orders, we must
 put the ref of order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
---
 htdocs/core/actions_massactions.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 33eeda9f4b2..f7208111d7a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -519,7 +519,7 @@ if ($massaction == 'confirm_createbills')
 		else {
 			// Load extrafields of order
 			$cmd->fetch_optionals();
-			
+
 			$objecttmp->socid = $cmd->socid;
 			$objecttmp->type = Facture::TYPE_STANDARD;
 			$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
@@ -577,6 +577,12 @@ if ($massaction == 'confirm_createbills')
 				for ($i=0;$i<$num;$i++)
 				{
 					$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+					// If we build one invoice for several order, we must put the invoice of order on the line
+					if (! empty($createbills_onebythird))
+					{
+					    $desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day', $langs));
+					}
+
 					if ($lines[$i]->subprice < 0)
 					{
 						// Negative line, we create a discount line

From e5f54bd14c003a3c33ff6711c3a420b273d0dd22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 Mar 2019 12:35:44 +0100
Subject: [PATCH 57/70] FIX Remane of project

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a704c7d641e..e63cbe80fee 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -338,7 +338,7 @@ class Project extends CommonObject
                 		if (file_exists($olddir))
                 		{
 							include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-							$res=dol_move($olddir, $newdir);
+							$res=@rename($olddir, $newdir);
 							if (! $res)
                 			{
 							    $langs->load("errors");
@@ -723,10 +723,10 @@ class Project extends CommonObject
             return -1;
         }
     }
-    
+
     /**
      * 		Delete tasks with no children first, then task with children recursively
-     *  
+     *
      *  	@param     	User		$user		User
      *		@return		int				<0 if KO, 1 if OK
      */
@@ -754,7 +754,7 @@ class Project extends CommonObject
         {
             if (count($this->lines)) $this->deleteTasks($this->lines);
         }
-        
+
         return 1;
     }
 

From 83d7750274ffbb01e0421dc2b416f36a61ab3b7e Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Wed, 27 Mar 2019 09:33:51 +0100
Subject: [PATCH 58/70] FIX missing hook completeTabsHead in margins module

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

diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index e1c2d59b7b8..e6089c00d01 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -96,6 +96,9 @@ function marges_prepare_head()
 		$head[$h][2] = 'checkMargins';
 	}
 
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins','remove');
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins');
+
 	return $head;
 }
 

From 11343e986c94832f96ef305493d0718a5c15adbf Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Thu, 28 Mar 2019 10:47:32 +0100
Subject: [PATCH 59/70] add all missing hooks on replenish

---
 htdocs/product/stock/replenish.php | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index dfb875b6483..c9908ca9502 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -299,6 +299,12 @@ if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrep
 $sql.= ' ,'.$sqldesiredtock.' as desiredstock, '.$sqlalertstock.' as alertstock,';
 
 $sql.= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique';
+
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
 $sql.= ' FROM ' . MAIN_DB_PREFIX . 'product as p';
 $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s';
 $sql.= ' ON (p.rowid = s.fk_product AND s.fk_entrepot IN (SELECT ent.rowid FROM '.MAIN_DB_PREFIX.'entrepot AS ent WHERE ent.entity IN('.getEntity('stock').')))';
@@ -308,6 +314,12 @@ if($fk_supplier > 0) {
 if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
 }
+
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListJoin',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
 $sql.= ' WHERE p.entity IN (' . getEntity('product') . ')';
 if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
@@ -388,6 +400,11 @@ if ($usevirtualstock)
 	}
 }
 
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
 
@@ -452,9 +469,15 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 print $langs->trans('Supplier').' '.$form->select_company($fk_supplier, 'fk_supplier', 'fournisseur=1', 1);
 print '</div>';
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+if (empty($reshook)) print $hookmanager->resPrint;
+
 print '<div class="inline-block valignmiddle">';
 print '<input class="button" type="submit" name="valid" value="'.$langs->trans('ToFilter').'">';
 print '</div>';
+
 print '</form>';
 
 if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha')) {
@@ -533,6 +556,12 @@ print '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&
 print '<td class="liste_titre" align="right">' . $langs->trans('Draft') . '&nbsp;<input type="checkbox" id="draftorder" name="draftorder" ' . (!empty($draftchecked)?$draftchecked:'') . '></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">';
+
+// Fields from hook
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 $searchpicto=$form->showFilterAndCheckAddButtons(0);
 print $searchpicto;
 print '</td>';
@@ -550,6 +579,12 @@ print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $pa
 print_liste_field_titre('Ordered', $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre('StockToBuy', $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre('SupplierRef', $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
+
+// Hook fields
+$parameters=array('param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print "</tr>\n";
 
 while ($i < ($limit ? min($num, $limit) : $num))
@@ -673,6 +708,11 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		// Supplier
 		print '<td align="right">'.	$form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier).'</td>';
 
+		// Fields from hook
+		$parameters=array( 'objp'=>$objp);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print '</tr>';
 	}
 	$i++;

From 957fae1081bc658865bc933a8b5d1a400b3ffbdd Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Thu, 28 Mar 2019 11:07:27 +0100
Subject: [PATCH 60/70] missing params

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index c9908ca9502..1da387aeec4 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -558,7 +558,7 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">';
 
 // Fields from hook
-$parameters=array();
+$parameters=array('param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 5588fe5b81e1a5f6b8cb744481418316558d527c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 30 Mar 2019 09:42:13 +0100
Subject: [PATCH 61/70] FIX: Don't show journal:getNomUrl without data

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 38add1141f7..35357788f1b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -637,11 +637,12 @@ else
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
-			$accountingjournal = new AccountingJournal($db);
-			$accountingjournal->fetch($object->fk_accountancy_journal);
-
-			print $accountingjournal->getNomUrl(0,1,1,'',1);
+            if (! empty($object->fk_accountancy_journal)) {
+                $accountingjournal = new AccountingJournal($db);
+                $accountingjournal->fetch($object->fk_accountancy_journal);
 
+                print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+            }
 			print '</td></tr>';
 		}
 

From 143cbba09b336a0e7c072aadc78c98f8e9a155aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 31 Mar 2019 18:49:38 +0200
Subject: [PATCH 62/70] Update card.php

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 35357788f1b..32f946d7d98 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -637,7 +637,7 @@ else
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
-            if (! empty($object->fk_accountancy_journal)) {
+            if ($object->fk_accountancy_journal > 0) {
                 $accountingjournal = new AccountingJournal($db);
                 $accountingjournal->fetch($object->fk_accountancy_journal);
 

From 0b6c7d2d63892a6568a95aa941d817712e64422b Mon Sep 17 00:00:00 2001
From: atm-arnaud <asp@atm-consulting.fr>
Date: Thu, 4 Apr 2019 11:17:44 +0200
Subject: [PATCH 63/70] FIX shipping default warehouse if only one warehouse

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

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index bbf990f2ec6..c92962357b2 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -894,7 +894,7 @@ if ($id > 0 || ! empty($ref))
 					print $langs->trans("WarehouseSource");
 					//print '</td>';
 					//print '<td>';
-					print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
+					print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:'ifone', 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
 					if (count($formproduct->cache_warehouses) <= 0)
 					{
 						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';

From 4489db2a70ac00ca06c887960d40246821d73862 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 Apr 2019 17:06:26 +0200
Subject: [PATCH 64/70] Fix field surface/weight not loaded

---
 htdocs/product/list.php | 74 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7c7619fe0d5..b729ecb6877 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -159,9 +159,13 @@ $arrayfields=array(
 	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
 	'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'p.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled) && ! empty($conf->service->enabled))),
-	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
+	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
 	'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
-	'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
+    'p.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled))),
+    'p.length'=>array('label'=>$langs->trans("Length"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled))),
+    'p.surface'=>array('label'=>$langs->trans("Surface"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled))),
+    'p.volume'=>array('label'=>$langs->trans("Volume"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled))),
+    'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
 	'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
 	'p.numbuyprice'=>array('label'=>$langs->trans("BuyingPriceNumShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
 	'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
@@ -261,7 +265,7 @@ else
 }
 
 $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
-$sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+$sql.= ' p.fk_product_type, p.duration, p.weight, p.length, p.surface, p.volume, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,';
 $sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
 $sql.= ' MIN(pfp.unitprice) as minsellprice';
@@ -316,7 +320,7 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
-$sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
+$sql.= " p.fk_product_type, p.duration, p.weight, p.length, p.surface, p.volume, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
 $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.pmp';
 if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) $sql .= ', pac.rowid';
 // Add fields from extrafields
@@ -552,9 +556,32 @@ if ($resql)
 		if (! empty($arrayfields['p.duration']['checked']))
 		{
 			print '<td class="liste_titre">';
-			print '&nbsp;';
 			print '</td>';
 		}
+		// Weight
+		if (! empty($arrayfields['p.weight']['checked']))
+		{
+		    print '<td class="liste_titre">';
+		    print '</td>';
+		}
+		// Length
+		if (! empty($arrayfields['p.length']['checked']))
+		{
+		    print '<td class="liste_titre">';
+		    print '</td>';
+		}
+		// Surface
+		if (! empty($arrayfields['p.surface']['checked']))
+		{
+		    print '<td class="liste_titre">';
+		    print '</td>';
+		}
+		// Volume
+		if (! empty($arrayfields['p.volume']['checked']))
+		{
+		    print '<td class="liste_titre">';
+		    print '</td>';
+		}
 		// Sell price
 		if (! empty($arrayfields['p.sellprice']['checked']))
 		{
@@ -650,6 +677,10 @@ if ($resql)
 		if (! empty($arrayfields['p.fk_product_type']['checked']))  print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"],"p.fk_product_type","",$param,"",$sortfield,$sortorder);
 		if (! empty($arrayfields['p.barcode']['checked']))  print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder);
 		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
+		if (! empty($arrayfields['p.weight']['checked']))  print_liste_field_titre($arrayfields['p.weight']['label'], $_SERVER["PHP_SELF"], "p.weight", "", $param, 'align="center"', $sortfield, $sortorder);
+		if (! empty($arrayfields['p.length']['checked']))  print_liste_field_titre($arrayfields['p.length']['label'], $_SERVER["PHP_SELF"], "p.length", "", $param, 'align="center"', $sortfield, $sortorder);
+		if (! empty($arrayfields['p.surface']['checked']))  print_liste_field_titre($arrayfields['p.surface']['label'], $_SERVER["PHP_SELF"], "p.surface", "", $param, 'align="center"', $sortfield, $sortorder);
+		if (! empty($arrayfields['p.volume']['checked']))  print_liste_field_titre($arrayfields['p.volume']['label'], $_SERVER["PHP_SELF"], "p.volume", "", $param, 'align="center"', $sortfield, $sortorder);
 		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
 		if (! empty($arrayfields['p.minbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
 		if (! empty($arrayfields['p.numbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
@@ -781,6 +812,39 @@ if ($resql)
 				if (! $i) $totalarray['nbfield']++;
 			}
 
+			// Weight
+			if (! empty($arrayfields['p.weight']['checked']))
+			{
+			    print '<td align="center">';
+		        print $obj->weight;
+			    print '</td>';
+			    if (! $i) $totalarray['nbfield']++;
+			}
+			// Length
+			if (! empty($arrayfields['p.length']['checked']))
+			{
+			    print '<td align="center">';
+			    print $obj->length;
+			    print '</td>';
+			    if (! $i) $totalarray['nbfield']++;
+			}
+			// Surface
+			if (! empty($arrayfields['p.surface']['checked']))
+			{
+			    print '<td align="center">';
+			    print $obj->surface;
+			    print '</td>';
+			    if (! $i) $totalarray['nbfield']++;
+			}
+			// Volume
+			if (! empty($arrayfields['p.volume']['checked']))
+			{
+			    print '<td align="center">';
+			    print $obj->volume;
+			    print '</td>';
+			    if (! $i) $totalarray['nbfield']++;
+			}
+
 			// Sell price
 			if (! empty($arrayfields['p.sellprice']['checked']))
 			{

From eaf9a2402a5fd3f60fb8e9277fb88f2d64a54494 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 Apr 2019 17:37:03 +0200
Subject: [PATCH 65/70] Fix length of label

---
 htdocs/product/list.php | 2 +-
 htdocs/projet/list.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b729ecb6877..f2d869c9a45 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -777,7 +777,7 @@ if ($resql)
 			// Label
 			if (! empty($arrayfields['p.label']['checked']))
 			{
-				print '<td class="tdoverflowmax200">'.dol_trunc($obj->label,40).'</td>';
+				print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 40).'</td>';
 				if (! $i) $totalarray['nbfield']++;
 			}
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 37caf6f4e69..78d21d36424 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -709,8 +709,8 @@ while ($i < min($num,$limit))
 		// Title
 		if (! empty($arrayfields['p.title']['checked']))
 		{
-			print '<td class="tdoverflowmax100">';
-			print dol_trunc($obj->title,80);
+			print '<td class="tdoverflowmax200">';
+			print dol_trunc($obj->title, 80);
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}

From ea87b2ddb682378d19cb4d2892690080482a19f5 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Fri, 5 Apr 2019 11:26:11 +0200
Subject: [PATCH 66/70] Fix no init hook on timesheet

---
 htdocs/projet/activity/perday.php  | 2 ++
 htdocs/projet/activity/perweek.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 164a7462e83..79a52bcd87f 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -36,6 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $langs->loadLangs(array('projects','users','companies'));
 
+$hookmanager->initHooks(array('perdaycard'));
+
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode",'alpha');
 $id=GETPOST('id','int');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 97574fa555f..ff5b1ad0d6c 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -36,6 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $langs->loadLangs(array('projects','users','companies'));
 
+$hookmanager->initHooks(array('perweekcard'));
+
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode",'alpha');
 $id=GETPOST('id','int');

From 153e563c9f9ef38aa82b46c529a763aefac28f38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Apr 2019 13:49:05 +0200
Subject: [PATCH 67/70] Update perday.php

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

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 79a52bcd87f..d894512a951 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $langs->loadLangs(array('projects','users','companies'));
 
-$hookmanager->initHooks(array('perdaycard'));
+$hookmanager->initHooks(array('timesheetperdaycard'));
 
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode",'alpha');

From c1f08260056a79db8deab4d2c6c3d4c1304845b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Apr 2019 13:49:16 +0200
Subject: [PATCH 68/70] Update perweek.php

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

diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index ff5b1ad0d6c..c3405d1ef5f 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $langs->loadLangs(array('projects','users','companies'));
 
-$hookmanager->initHooks(array('perweekcard'));
+$hookmanager->initHooks(array('timesheetperweekcard'));
 
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode",'alpha');

From 524b1869599db819de8b702499dd349e5c968abf Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 11 Apr 2019 15:19:40 +0200
Subject: [PATCH 69/70] FIX : Product accountancey sell intra code must be
 visible if main feature level 1

---
 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 66f7e288efa..e7f6e0f8af3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3580,7 +3580,7 @@ class Product extends CommonObject
         {
             //
         }
-        if (! empty($conf->accounting->enabled) && $this->status)
+        if (! empty($conf->accounting->enabled) && $this->status && !empty($conf->global->MAIN_FEATURES_LEVEL))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
         	$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);

From 9a24007c0a7c7d1de0eb37f38d05e84cdef14719 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 11 Apr 2019 15:32:50 +0200
Subject: [PATCH 70/70] FIX : better test

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e7f6e0f8af3..fce619094dc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3580,12 +3580,14 @@ class Product extends CommonObject
         {
             //
         }
-        if (! empty($conf->accounting->enabled) && $this->status && !empty($conf->global->MAIN_FEATURES_LEVEL))
+        if (! empty($conf->accounting->enabled) && $this->status)
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
         	$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
+		if(!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+	        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
+	        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
+		}
         }
         if (! empty($conf->accounting->enabled) && $this->status_buy)
         {