From 8192e9dc67abfcd572c386bac761d93889bb7d87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2020 03:02:49 +0100
Subject: [PATCH 01/31] FIX Missing token in form

---
 htdocs/adherents/stats/index.php          | 2 ++
 htdocs/comm/propal/stats/index.php        | 2 ++
 htdocs/commande/stats/index.php           | 2 ++
 htdocs/compta/deplacement/stats/index.php | 2 ++
 htdocs/compta/facture/stats/index.php     | 2 ++
 htdocs/expensereport/stats/index.php      | 2 ++
 htdocs/fichinter/stats/index.php          | 2 ++
 htdocs/projet/stats/index.php             | 1 +
 htdocs/projet/tasks/stats/index.php       | 1 +
 htdocs/salaries/stats/index.php           | 2 ++
 htdocs/ticket/stats/index.php             | 1 -
 11 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index f02c012a48e..10eca32ac13 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -145,6 +145,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 /*print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
 print '<table class="border centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 print '<tr><td>'.$langs->trans("Member").'</td><td>';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 4a2b8dea419..030db477631 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -242,7 +242,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //{
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index e9eca9dafa9..c465cdcb8c9 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -255,7 +255,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index c9c48fd9b93..cf745b784fc 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -227,7 +227,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 print '<table class="border centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index bd749e02dee..a72b03b47a3 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -235,7 +235,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 60ab9001972..359f49f2dea 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -211,7 +211,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 78f3289d638..d2efb5bb3ed 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -225,7 +225,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //{
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 38fa476fcab..00747e55d0e 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -272,6 +272,7 @@ dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index dafd5ae0071..c758664d2c6 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -139,6 +139,7 @@ dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index e96b6776664..25c5be2c79d 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -193,6 +193,8 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // User
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 1f5f06ccc1f..cf8ed28db96 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -229,7 +229,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company

From 37fce0d3eeece5032fad40731f7eedc9de48119b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2020 14:45:37 +0100
Subject: [PATCH 02/31] Fix position on merou Fix preselected value on contact

---
 htdocs/core/class/html.formcompany.class.php             | 1 +
 htdocs/core/modules/expedition/doc/pdf_merou.modules.php | 6 +++---
 htdocs/core/tpl/contacts.tpl.php                         | 7 ++++++-
 htdocs/expedition/contact.php                            | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 10ee91ad50f..58291fb75f0 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -730,6 +730,7 @@ class FormCompany extends Form
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
+
 			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
 			foreach ($lesTypes as $key=>$value)
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index f2b96b2bea0..7899df494fc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -591,7 +591,7 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->SetXY($Xoff, $Yoff);
 		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $Xoff, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '', 'R');
 		//$this->Code39($Xoff+43, $Yoff+1, $object->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
 
 		$origin = $object->origin;
@@ -627,9 +627,9 @@ class pdf_merou extends ModelePdfExpedition
 		{
 			$Yoff += 3;
 			$posy = $Yoff;
-			$pdf->SetXY(100, $posy);
+			$pdf->SetXY($Xoff, $posy);
 			$pdf->SetTextColor(0, 0, 0);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $Xoff, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Date delivery
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index d14503a9039..b5df248b590 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -19,6 +19,8 @@
  * This template needs:
  * $object
  * $withproject (if we are on task contact)
+ *
+ * $preselectedtypeofcontact may be defined or not
  */
 
 // Protection to avoid direct call of template
@@ -28,6 +30,9 @@ if (empty($object) || !is_object($object))
 	exit;
 }
 
+if (empty($preselectedtypeofcontact)) {
+	$preselectedtypeofcontact = 0;
+}
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -142,7 +147,7 @@ if ($permission) {
 			<?php
 			$tmpobject=$object;
 			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-			$formcompany->selectTypeContact($tmpobject, '', 'type', 'external', 'position', 0, 'minwidth100imp'); ?>
+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'type', 'external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 146f4b54962..8c624f4a0fa 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -260,6 +260,7 @@ if ($id > 0 || !empty($ref))
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	$preselectedtypeofcontact = dol_getIdFromCode($db, 'SHIPPING', 'c_type_contact', 'code', 'rowid');
 	foreach ($dirtpls as $reldir)
 	{
 	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');

From 8927d40cc40f2d379a080ab7e4f3e75abd21b8fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Mar 2020 11:28:00 +0100
Subject: [PATCH 03/31] Prepare 11.0.3

---
 ChangeLog | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 127f2925af8..3f0ae0419b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,34 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 11.0.3 compared to 11.0.2 *****
+FIX: unit price for selected supplier products not set. NaN was used.
+FIX: use bad var to check if total is positive for each VAT rate when validating an invoice
+FIX: status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
+FIX: translations for "orders" not loaded in the homepage box
+FIX: #13194
+FIX: #13274 cannot add or update 0 value for an int or double extrafield
+FIX: #13285 SQL error during migration with pgsql
+FIX: #13294
+FIX: #13313
+FIX: Clone Fourn Command, add line's extrafields
+FIX: cols parameter not propagated to tpl
+FIX: CSRF error when creating an intervention
+FIX: date order was -1D and desc with label repetition
+FIX: empty of series in graph of product distribution
+FIX: fk_type subscription list via api REST
+FIX: link when using anchor on "/"
+FIX: menu export document was not visible when using "simple accounting"
+FIX: missing class declaration
+FIX: missing global $conf
+FIX: Missing token in some forms (avoid unset POST errors)
+FIX: params of setEventMessage($langs->trans('ErrorProductClone')...
+FIX: Remove unexisting link
+FIX: substitute lines dates values on doc generator (ODT, ...)
+FIX: Ticket - Load Cache Messages Ticket, wrong message's status
+FIX: Ticket Public  - Private messages are displayed
+
 ***** ChangeLog for 11.0.2 compared to 11.0.1 *****
 FIX: #10309
 FIX: #13110
@@ -9,7 +37,8 @@ FIX: #13118
 FIX: #13124
 FIX: #13131
 FIX: #13135
-FIX: #13146 #13198
+FIX: #13146 
+FIX: #13198
 FIX: #13175
 FIX: #13182
 FIX: #13183

From ee29125579d65e67ff984ada24b105ace56b55f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Mar 2020 11:29:00 +0100
Subject: [PATCH 04/31] typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3f0ae0419b9..59b02bad4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,7 @@ FIX: CSRF error when creating an intervention
 FIX: date order was -1D and desc with label repetition
 FIX: empty of series in graph of product distribution
 FIX: fk_type subscription list via api REST
-FIX: link when using anchor on "/"
+FIX: link when using anchor on "/" in website module
 FIX: menu export document was not visible when using "simple accounting"
 FIX: missing class declaration
 FIX: missing global $conf

From af5444806d96257de9e02982493762f50bd5edb7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Mar 2020 06:41:14 +0100
Subject: [PATCH 05/31] Work on reconcilation of accouting account

---
 htdocs/accountancy/admin/account.php          | 14 ++++++-------
 .../class/accountingaccount.class.php         | 20 +++++++++----------
 .../install/mysql/migration/11.0.0-12.0.0.sql |  2 +-
 .../mysql/tables/llx_accounting_account.sql   |  2 +-
 htdocs/langs/en_US/accountancy.lang           |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 7da6de23725..52148f40140 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -70,11 +70,11 @@ $arrayfields = array(
 	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
     'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
-    'aa.reconciliable'=>array('label'=>$langs->trans("Reconciliable"), 'checked'=>1),
+    'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );
 
-if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['aa.reconciliable']);
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['aa.reconcilable']);
 
 $accounting = new AccountingAccount($db);
 
@@ -197,7 +197,7 @@ if ($action == 'delete') {
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.reconciliable, aa.active, ";
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.reconcilable, aa.active, ";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".$conf->entity;
@@ -357,7 +357,7 @@ if ($resql)
 		print '</td>';
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconciliable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
@@ -371,7 +371,7 @@ if ($resql)
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
 	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconciliable']['checked']))	print_liste_field_titre($arrayfields['aa.reconciliable']['label'], $_SERVER["PHP_SELF"], 'aa.reconciliable', '', $param, '', $sortfield, $sortorder); }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconciliable']['label'], $_SERVER["PHP_SELF"], 'aa.reconciliable', '', $param, '', $sortfield, $sortorder); }
 	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
@@ -450,9 +450,9 @@ if ($resql)
 
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 			// Activated or not reconciliation on accounting account
-			if (!empty($arrayfields['aa.reconciliable']['checked'])) {
+			if (!empty($arrayfields['aa.reconcilable']['checked'])) {
 				print '<td class="center">';
-				if (empty($obj->reconciliable)) {
+				if (empty($obj->reconcilable)) {
 					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable&mode=1">';
 					print img_picto($langs->trans("Disabled"), 'switch_off');
 					print '</a>';
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 0178f87a32d..58e6bd600f6 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -136,9 +136,9 @@ class AccountingAccount extends CommonObject
     public $active;
 
 	/**
-	 * @var int reconciliable
+	 * @var int reconcilable
 	 */
-	public $reconciliable;
+	public $reconcilable;
 
 	/**
 	 * Constructor
@@ -167,7 +167,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 
 		if ($rowid || $account_number) {
-			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active, a.reconciliable";
+			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active, a.reconcilable";
 			$sql .= ", ca.label as category_label";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
@@ -208,7 +208,7 @@ class AccountingAccount extends CommonObject
 					$this->fk_user_modif = $obj->fk_user_modif;
 					$this->active = $obj->active;
 					$this->status = $obj->active;
-					$this->reconciliable = $obj->reconciliable;
+					$this->reconcilable = $obj->reconcilable;
 
 					return $this->id;
 				} else {
@@ -267,7 +267,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", fk_accounting_category";
 		$sql .= ", fk_user_author";
 		$sql .= ", active";
-		$sql .= ", reconciliable";
+		$sql .= ", reconcilable";
 		$sql .= ") VALUES (";
 		$sql .= " '" . $this->db->idate($now) . "'";
 		$sql .= ", " . $conf->entity;
@@ -280,7 +280,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= ", " . $user->id;
 		$sql .= ", " . (int) $this->active;
-		$sql .= ", " . (int) $this->reconciliable;
+		$sql .= ", " . (int) $this->reconcilable;
 		$sql .= ")";
 
 		$this->db->begin();
@@ -348,7 +348,7 @@ class AccountingAccount extends CommonObject
 		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= " , fk_user_modif = " . $user->id;
 		$sql .= " , active = " . (int) $this->active;
-		$sql .= " , reconciliable = " . (int) $this->reconciliable;
+		$sql .= " , reconcilable = " . (int) $this->reconcilable;
 		$sql .= " WHERE rowid = " . $this->id;
 
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
@@ -588,7 +588,7 @@ class AccountingAccount extends CommonObject
         }
         elseif ($mode == 1)
         {
-			$fieldtouse = 'reconciliable';
+			$fieldtouse = 'reconcilable';
         }
 
 		if ($result > 0) {
@@ -619,7 +619,7 @@ class AccountingAccount extends CommonObject
 	 * Account activated
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field reconciliable, 2=field active_customer_list, 3=field_active_supplier_list
+     * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
     public function account_activate($id, $mode = 0)
@@ -633,7 +633,7 @@ class AccountingAccount extends CommonObject
         }
         elseif ($mode == 1)
         {
-            $fieldtouse = 'reconciliable';
+            $fieldtouse = 'reconcilable';
         }
 
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 0a61a6d9c58..e8d11378768 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -193,4 +193,4 @@ ALTER TABLE llx_accounting_account DROP COLUMN pcg_subtype;
 ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_intra varchar(32) AFTER accountancy_code_buy;
 ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_export varchar(32) AFTER accountancy_code_buy_intra;
 
-ALTER TABLE llx_accounting_account ADD COLUMN reconciliable tinyint DEFAULT 0 NOT NULL after active;
+ALTER TABLE llx_accounting_account ADD COLUMN reconcilable tinyint DEFAULT 0 NOT NULL after active;
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index a3bf8b90b79..7af83585c7f 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -35,7 +35,7 @@ create table llx_accounting_account
   fk_user_author            integer      DEFAULT NULL,
   fk_user_modif             integer      DEFAULT NULL,
   active                    tinyint      DEFAULT 1  NOT NULL,
-  reconciliable				tinyint      DEFAULT 0  NOT NULL,
+  reconcilable				tinyint      DEFAULT 0  NOT NULL,
   import_key                varchar(14),
   extraparams               varchar(255)                      -- for other parameters with json format
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 36b5fbcf55c..ba34d38f36e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -239,7 +239,7 @@ HideOpeningBalance=Hide opening balance
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
-Reconciliable=Reconcilable
+Reconcilable=Reconcilable
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin

From 191374cc8f740ea4a11800dadca67c4edb7ddb2e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Mar 2020 08:07:05 +0100
Subject: [PATCH 06/31] Work on reconcilation of accouting account

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

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 52148f40140..1afe2ecca18 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -371,7 +371,7 @@ if ($resql)
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
 	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconciliable']['label'], $_SERVER["PHP_SELF"], 'aa.reconciliable', '', $param, '', $sortfield, $sortorder); }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder); }
 	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";

From debecabe69f10e3e0074437d75d8d53396cbabb5 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 16 Mar 2020 08:38:01 +0100
Subject: [PATCH 07/31] FIX missing "contact_" substitution in supplier
 proposal

---
 ...c_generic_supplier_proposal_odt.modules.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 3b4a39288ea..5b49aee1711 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -330,11 +330,20 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				}
 
 				// Recipient name
+				$contactobject = null;
 				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else $socobject = $object->thirdparty;
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					{
+						$socobject = $object->contact;
+					}
+					else
+					{
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				}
 				else
 				{
@@ -405,7 +414,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($substitutionarray, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other);
+				$array_thirdparty_contact = array();
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				
+				$tmparray = array_merge($substitutionarray, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook

From fd4e8072111357e0167888b6c6d24e758d576722 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 16 Mar 2020 07:40:10 +0000
Subject: [PATCH 08/31] Fixing style errors.

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

diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 5b49aee1711..c97d2f94d63 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -416,7 +416,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				$array_thirdparty_contact = array();
 				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
-				
+
 				$tmparray = array_merge($substitutionarray, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 

From 301b97f6d230d3519ee27a82ab20064f0bbfe941 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Mar 2020 10:05:22 +0100
Subject: [PATCH 09/31] FIX Update fiscalyear.class.php to filter on entity

---
 htdocs/core/class/fiscalyear.class.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 0eed1a56580..10015e3c363 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2014-2018  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+/* Copyright (C) 2014-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2020       OScss-Shop          <support@oscss-shop.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
@@ -381,13 +383,19 @@ class Fiscalyear extends CommonObject
 	 *	@param	int		$dateend	Date end to scan
 	 *	@return	string				Number of entries
 	 */
-	public function getAccountancyEntriesByFiscalYear($datestart, $dateend)
+	public function getAccountancyEntriesByFiscalYear($datestart = '', $dateend = '')
 	{
 		global $conf;
 
+		if(empty($datestart) )
+			$datestart = $this->date_start;
+		if(empty($dateend) )
+			$dateend = $this->date_end;
+
 		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
+		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+		$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
+		$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -407,13 +415,19 @@ class Fiscalyear extends CommonObject
 	 *  @param	int		$dateend	Date end to scan
 	 *  @return	string				Number of movements
 	 */
-	public function getAccountancyMovementsByFiscalYear($datestart, $dateend)
+	public function getAccountancyMovementsByFiscalYear($datestart = '', $dateend = '')
 	{
 		global $conf;
 
+		if(empty($datestart) )
+			$datestart = $this->date_start;
+		if(empty($dateend) )
+			$dateend = $this->date_end;
+
 		$sql = "SELECT count(rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
+		$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
+		$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
 		$resql=$this->db->query($sql);
 		if ($resql)

From 117ff5f4eb692553654c8857709b48a528a2ed82 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 16 Mar 2020 11:49:03 +0100
Subject: [PATCH 10/31] add hook to add sql filter in where clause on select
 users

---
 htdocs/core/class/html.form.class.php      |  6 +++++-
 htdocs/core/class/html.formother.class.php | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0db01a84656..3d7bceadcf3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1618,7 +1618,7 @@ class Form
     public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)
 	{
         // phpcs:enable
-		global $conf, $user, $langs;
+		global $conf, $user, $langs, $hookmanager;
 
 		// If no preselected user defined, we take current user
 		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected = $user->id;
@@ -1679,6 +1679,10 @@ class Form
 		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql .= " AND u.statut <> 0";
 		if (!empty($morefilter)) $sql .= " ".$morefilter;
 
+		//Add hook to filter on user (for exemple on usergroup define in custom modules)
+		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectUsers', array(), $this, $action);
+		if (!empty($reshook)) $sql .= $hookmanager->resPrint;
+
 		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 829a3f9c72f..b245f5f013b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -424,7 +424,7 @@ class FormOther
     public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
     {
         // phpcs:enable
-        global $conf, $langs;
+        global $conf, $langs, $hookmanager;
 
         $langs->load('users');
 
@@ -440,6 +440,9 @@ class FormOther
             	$out.=$comboenhancement;
             }
         }
+
+	    $reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
+
         // Select each sales and print them in a select input
         $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) $out.='<option value="0">&nbsp;</option>';
@@ -464,6 +467,10 @@ class FormOther
 
         if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
         if (! empty($user->socid)) $sql_usr.=" AND u.fk_soc = ".$user->socid;
+
+	    //Add hook to filter on user (for exemple on usergroup define in custom modules)
+	    if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
+
         // Add existing sales representatives of thirdparty of external user
         if (empty($user->rights->user->user->lire) && $user->socid)
         {
@@ -485,7 +492,11 @@ class FormOther
             }
 
             $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
+
+	        //Add hook to filter on user (for exemple on usergroup define in custom modules)
+	        if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
         }
+
 	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
         //print $sql_usr;exit;
 

From a6a1ba0db28e71377a019cc4cdc0fa6a783bc9c9 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 12:47:00 +0100
Subject: [PATCH 11/31] Update README.md

---
 doc/images/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/images/README.md b/doc/images/README.md
index 798cf599b4c..7422d246d40 100644
--- a/doc/images/README.md
+++ b/doc/images/README.md
@@ -10,7 +10,11 @@
 https://github.com/Dolibarr/foundation
 
 
-* Few icons are from http://led24.de/iconset/. This is original README file for this source:
+* Few icons are / were from website led24.de 
+
+* Attention: This website is no longer available! 
+
+This is original README file for this source:
 -------------------------------------------------------
 You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
 http://led24.de/iconset/ or http://led24.de/ would be appreciated.

From 8e712c6d0e3da7dc5757c91c04b5795b728a7698 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:13:11 +0100
Subject: [PATCH 12/31] Update https for country websites

Update https for country websites
---
 htdocs/admin/system/about.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 64f8fba72ad..3cfc18accc9 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -86,31 +86,31 @@ print '</li>';
 if (preg_match('/^fr_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^el_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.gr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.gr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^es_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.es/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.es/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^it_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.it/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.it/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^de_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
 	print '</li>';
 }
 print '<li>';

From 1491414d5b0a3719e785803df42b4d12d0c17a63 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:34:12 +0100
Subject: [PATCH 13/31] Update

1. add   $help_url  |DE:Modul_Benutzer
2. change comment  'Creation d'un champ optionnel' -> 'Creation of an optional field'
3. change comment  'Edition d'un champ optionnel ' ->  'Editing an optional field'
---
 htdocs/user/admin/user_extrafields.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 1f87b5fbe90..2653dfc9090 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -60,7 +60,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 $textobject=$langs->transnoentitiesnoconv("Users");
 
-$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
+$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
 llxHeader('', $langs->trans("UsersSetup"), $help_url);
 
 
@@ -88,8 +88,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field                                              */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -102,7 +102,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Editing an optional field                                                  */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))

From c8446662bff88b70427256187ff54b57cb4e1d02 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 14:25:20 +0100
Subject: [PATCH 14/31] create README.txt

---
 htdocs/includes/jquery/README.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 htdocs/includes/jquery/README.txt

diff --git a/htdocs/includes/jquery/README.txt b/htdocs/includes/jquery/README.txt
new file mode 100644
index 00000000000..536f413ef04
--- /dev/null
+++ b/htdocs/includes/jquery/README.txt
@@ -0,0 +1,5 @@
+README:
+jQuery is a JavaScript library
+
+https://jquery.com/
+https://jquery.com/download/

From a8024b652c8895a2be7ea55b7ad89afedcb96647 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 14:31:09 +0100
Subject: [PATCH 15/31] Create README.txt

---
 htdocs/includes/geoip2/README.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 htdocs/includes/geoip2/README.txt

diff --git a/htdocs/includes/geoip2/README.txt b/htdocs/includes/geoip2/README.txt
new file mode 100644
index 00000000000..5b311efb5a1
--- /dev/null
+++ b/htdocs/includes/geoip2/README.txt
@@ -0,0 +1,5 @@
+README
+
+https://dev.maxmind.com/geoip/geoip2/geolite2/
+
+License: https://creativecommons.org/licenses/by-sa/4.0/

From 5b1e8c4ebdbb3d2f890ed862f6a90490456596f8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 14:44:26 +0100
Subject: [PATCH 16/31] Update tcpdi.php

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

diff --git a/htdocs/includes/tcpdi/tcpdi.php b/htdocs/includes/tcpdi/tcpdi.php
index 675e2226b4a..f4c0bd00391 100644
--- a/htdocs/includes/tcpdi/tcpdi.php
+++ b/htdocs/includes/tcpdi/tcpdi.php
@@ -9,7 +9,7 @@
 //  you may not use this file except in compliance with the License.
 //  You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//      https://www.apache.org/licenses/LICENSE-2.0
 //
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,

From 58aa06b58494b4a40bec40fd2c4f5317507cfc85 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 15:39:08 +0100
Subject: [PATCH 17/31] Update adodb-time.inc.php

See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index
Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php
---
 htdocs/includes/adodbtime/adodb-time.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
index c74778bb991..030196db275 100644
--- a/htdocs/includes/adodbtime/adodb-time.inc.php
+++ b/htdocs/includes/adodbtime/adodb-time.inc.php
@@ -1,7 +1,8 @@
 <?php
 /**
-ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://phplens.com/phpeverywhere/
+ADOdb Date Library, part of the ADOdb abstraction library 
+See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index 
+Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php 
 
 PHP native date functions use integer timestamps for computations.
 Because of this, dates are restricted to the years 1901-2038 on Unix

From 97639c46481605d87e972c6e647cf68dcd29f07f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 16 Mar 2020 15:41:54 +0100
Subject: [PATCH 18/31] Create README.txt

---
 htdocs/includes/adodbtime/README.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 htdocs/includes/adodbtime/README.txt

diff --git a/htdocs/includes/adodbtime/README.txt b/htdocs/includes/adodbtime/README.txt
new file mode 100644
index 00000000000..3e2969a2868
--- /dev/null
+++ b/htdocs/includes/adodbtime/README.txt
@@ -0,0 +1,7 @@
+README
+======
+
+ADOdb Date Library, part of the ADOdb abstraction library 
+
+See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index 
+Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php 

From 105c2e99787bb3b7baf9173cefc278e91c686efc Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 16 Mar 2020 17:31:16 +0100
Subject: [PATCH 19/31] fix ldcompta10

---
 .../class/accountancyexport.class.php         | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index bb1f1b8679c..7cfdde49402 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1088,9 +1088,24 @@ class AccountancyExport
 				{
 					$soc = $this->db->fetch_object($resql);
 
-					$address = str_replace(array("\t", "\n", "\r"), " ", $soc->address);
+	                $address=array('','','');
+                    if (strpos($soc->address,"\n")!==false) {
+	                    $address = explode("\n",$soc->address);
+	                    if (is_array($address) && count($address)>0) {
+	                    	foreach($address as $key=>$data) {
+			                    $address[$key]=str_replace(array("\t", "\n", "\r"), "", $data);
+			                    $address[$key]=dol_trunc($address[$key],40,'right','UTF-8',1);
+		                    }
+	                    }
+                    } else {
+	                    $address[0] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),0,40);
+	                    $address[1] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),41,40);
+	                    $address[2] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),82,40);
+
+                    }
 
 					$type_enregistrement = 'C';
+                    //TYPE
 					print $type_enregistrement.$separator;
 					//NOCL
 					print $soc->code_client.$separator;
@@ -1099,15 +1114,15 @@ class AccountancyExport
 					//LIBI
 					print $separator;
 					//TITR
-					print getFormeJuridiqueLabel($soc->fk_forme_juridique).$separator;
+                    print $separator;
 					//RSSO
 					print $soc->nom.$separator;
 					//CAD1
-					print  substr($address, 0, 40).$separator;
+                    print  $address[0].$separator;
 					//CAD2
-					print  substr($address, 41, 40).$separator;
+                    print  $address[1].$separator;
 					//CAD3
-					print  substr($address, 82, 40).$separator;
+                    print  $address[2].$separator;
 					//COPO
 					print  $soc->zip.$separator;
 					//BUDI
@@ -1129,7 +1144,7 @@ class AccountancyExport
 					//COMM
 					print $separator;
 					//SIRE
-					print $soc->siret.$separator;
+                    print str_replace(" ", "", $soc->siret).$separator;
 					//RIBP
 					print $separator;
 					//DOBQ
@@ -1267,8 +1282,6 @@ class AccountancyExport
 			} else {
 				print $separator;
 			}
-			// SECT
-			print $separator;
 			// CTRE
 			print $separator;
 			// NORL
@@ -1286,13 +1299,13 @@ class AccountancyExport
 			// CDES
 			print $separator;
 			// QTUE
-			print '0'.$separator;
+			print $separator;
 			// MTDV
-			print $separator;
-			// CODV
 			print '0'.$separator;
-			// TXDV
+			// CODV
 			print $separator;
+			// TXDV
+			print '0'.$separator;
 			// MOPM
 			print $separator;
 			// BONP

From 74655b759cab6e8649891c8f6857dc762ad0694b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 16 Mar 2020 16:34:28 +0000
Subject: [PATCH 20/31] Fixing style errors.

---
 .../accountancy/class/accountancyexport.class.php   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 7cfdde49402..6c628ae52c3 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1089,19 +1089,18 @@ class AccountancyExport
 					$soc = $this->db->fetch_object($resql);
 
 	                $address=array('','','');
-                    if (strpos($soc->address,"\n")!==false) {
-	                    $address = explode("\n",$soc->address);
+                    if (strpos($soc->address, "\n")!==false) {
+	                    $address = explode("\n", $soc->address);
 	                    if (is_array($address) && count($address)>0) {
 	                    	foreach($address as $key=>$data) {
 			                    $address[$key]=str_replace(array("\t", "\n", "\r"), "", $data);
-			                    $address[$key]=dol_trunc($address[$key],40,'right','UTF-8',1);
+			                    $address[$key]=dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
 		                    }
 	                    }
                     } else {
-	                    $address[0] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),0,40);
-	                    $address[1] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),41,40);
-	                    $address[2] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),82,40);
-
+	                    $address[0] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
+	                    $address[1] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
+	                    $address[2] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
                     }
 
 					$type_enregistrement = 'C';

From cb43928a5d5659e0c25d247a915712f41ab07309 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 17 Mar 2020 12:29:14 +0100
Subject: [PATCH 21/31] Fix radio label target

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 611d7d791ec..c6220f647aa 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3017,7 +3017,7 @@ if ($action == 'create')
 			// First situation invoice
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input id="radio_situation" type="radio" name="type" value="5"'.(GETPOST('type') == 5 ? ' checked' : '').'> ';
-			$tmp  = $tmp.'<label for="radio_situation invoice" >'.$langs->trans("InvoiceFirstSituationAsk").'</label>';
+			$tmp  = $tmp.'<label for="radio_situation" >'.$langs->trans("InvoiceFirstSituationAsk").'</label>';
 			$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
 			print $desc;
 			print '</div></div>';

From 075757eb3df5ec2412ef85166b1330bec4d79a27 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 17 Mar 2020 16:49:05 +0100
Subject: [PATCH 22/31] Fix situation value transmission

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c6220f647aa..94298d14f29 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3304,14 +3304,28 @@ if ($action == 'create')
 	        }
 
 	        $retained_warranty = GETPOST('retained_warranty', 'int');
-	        $retained_warranty = !empty($retained_warranty) ? $retained_warranty : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+	        if(empty($retained_warranty)){
+                if(!empty($objectsrc->retained_warranty)){ // use previous situation value
+                    $retained_warranty = $objectsrc->retained_warranty;
+                }else{
+                    $retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+                }
+            }
+
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
 	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
 
 	        // Retained warranty payment term
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
 	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-	        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+	        if(empty($retained_warranty_fk_cond_reglement)){
+                $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+                if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
+                    $retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
+                }else{
+                    $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+                }
+            }
 	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 	        print '</td></tr>';
 

From 1fe4e4415e07d428fa0e1e8bb2da1057c7c71722 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 18 Mar 2020 09:27:08 +0100
Subject: [PATCH 23/31] FIX: Bank movements color is not showing

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

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 297f0dd91d4..d7951233f7b 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1157,14 +1157,14 @@ if ($resql)
                 } else {
                     $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
                 }
-                $backgroundcolor = 'style="background-color: '.$color.';"';
+                $backgroundcolor = 'style="background: '.$color.';"';
             } else {
                 if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
                     $color = '#7fdb86';
                 } else {
                     $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
                 }
-                $backgroundcolor = 'style="background-color: '.$color.';"';
+                $backgroundcolor = 'style="background: '.$color.';"';
             }
         }
         print '<tr class="oddeven" '.$backgroundcolor.'>';

From 2e1554def4be9c37232c9b4fe37242b8a966d97c Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Wed, 18 Mar 2020 10:18:52 +0100
Subject: [PATCH 24/31] FIX : wrong include - replace
 extrafields_create.tpl.php to extrafields_add.tpl.php

---
 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 1ed1327684c..318e6dec614 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1559,7 +1559,7 @@ else
 
 		// Other attributes
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_create.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 		// Assign a sale representative
 		print '<tr>';

From d3aeec0a7c773fe4c8356da60c863f73177ae9ba Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 18 Mar 2020 10:30:15 +0100
Subject: [PATCH 25/31] Fix situation value transmission

---
 htdocs/compta/facture/card.php                | 13 ++++++++++++-
 htdocs/compta/facture/class/facture.class.php |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 94298d14f29..dc2eb2c5308 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1699,7 +1699,18 @@ if (empty($reshook))
 				$object->fk_facture_source = $_POST['situations'];
 				$object->type = Facture::TYPE_SITUATION;
 
-				if (!empty($origin) && !empty($originid))
+
+                $object->retained_warranty = GETPOST('retained_warranty', 'int');
+                $object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+
+                $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+                if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
+                    $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+                }
+                $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+var_dump('la', $object->retained_warranty);
+
+                if (!empty($origin) && !empty($originid))
 				{
 					$object->origin = $origin;
 					$object->origin_id = $originid;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8c198b58a3e..c2c82424b77 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1052,6 +1052,11 @@ class Facture extends CommonInvoice
 		$facture->situation_cycle_ref = $this->situation_cycle_ref;
 		$facture->situation_final = $this->situation_final;
 
+        $facture->retained_warranty = $this->retained_warranty;
+        $facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
+        $facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
+
+
 		// Loop on each line of new invoice
 		foreach ($facture->lines as $i => $tmpline)
 		{

From 0a5f971eb514dda0f6cb1f42451a5f822f3c3d57 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 18 Mar 2020 09:32:34 +0000
Subject: [PATCH 26/31] Fixing style errors.

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index dc2eb2c5308..26ea6a28f24 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1708,7 +1708,7 @@ if (empty($reshook))
                     $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
                 }
                 $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-var_dump('la', $object->retained_warranty);
+				var_dump('la', $object->retained_warranty);
 
                 if (!empty($origin) && !empty($originid))
 				{

From 7b8cafb710fce5979185df60aa5811cef03a3e3a Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 18 Mar 2020 10:34:44 +0100
Subject: [PATCH 27/31] remove var_dump

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index dc2eb2c5308..e75a8d35d7c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1708,7 +1708,6 @@ if (empty($reshook))
                     $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
                 }
                 $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-var_dump('la', $object->retained_warranty);
 
                 if (!empty($origin) && !empty($originid))
 				{

From 56e4fa1bb3c3e6131be211ff21a922afb3ce9614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2020 14:01:11 +0100
Subject: [PATCH 28/31] Trans

---
 dev/translation/txpull.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 3f24bd0912d..fcccae98221 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -54,5 +54,5 @@ fi
 
 echo Think to launch also: 
 echo "> dev/tools/fixaltlanguages.sh fix all"
-echo "For v11: Replace also regex \(.*(sponge|cornas|eratosthene|cyan).*\) with ''"
+echo "For v11: Replace also regex \(.*(sponge|cornas|eratosthene|cyan).*\) with '' on *.lang files"
 

From cc93a40c4582fe9105b17b91ecedebdee4e538cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2020 14:06:15 +0100
Subject: [PATCH 29/31] Fix label of local tax

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 984e28f4e31..991cd571f3e 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -216,7 +216,7 @@ class modFacture extends DolibarrModules
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
-			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',
+			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LT1', 'f.localtax2'=>'LT2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',
 			'none.rest'=>'Rest',
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
 			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
@@ -303,7 +303,7 @@ class modFacture extends DolibarrModules
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef",  'f.ref_client'=>'RefCustomer',
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
-			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',
+			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LT1', 'f.localtax2'=>'LT2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',
 			'none.rest'=>'Rest',
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
 			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef',

From a3328c5ef3b238414cd198f1beaa58117c5a760e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2020 18:37:44 +0100
Subject: [PATCH 30/31] Fix div

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

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index b5df248b590..a9297d8c2e6 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -66,11 +66,12 @@ $userstatic = new User($db);
 ?>
 
 <!-- BEGIN PHP TEMPLATE CONTACTS -->
-<div class="underbanner clearboth"></div>
-<div class="div-table-responsive">
-<div class="tagtable tableforcontact centpercent noborder nobordertop allwidth">
-
 <?php
+
+print '<div class="underbanner clearboth"></div>'."\n";
+print '<div class="div-table-responsive">'."\n";
+print '<div class="tagtable tableforcontact centpercent noborder nobordertop allwidth">'."\n";
+
 if ($permission) {
     ?>
 	<form class="tagtr liste_titre">

From b9f404b5fab2fb649beaa56285fc81d1551145f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2020 19:07:15 +0100
Subject: [PATCH 31/31] Fix form inside table

---
 htdocs/admin/export.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index 107954fa4cd..b92ab7d7091 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -71,6 +71,9 @@ $h++;
 
 dol_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "exports");
 
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="set_EXPORTS_SHARE_MODELS">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -78,23 +81,18 @@ print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100"></td>'."\n";
 
-
 // Example with a yes / no select
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("EXPORTS_SHARE_MODELS").'</td>';
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100">';
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set_EXPORTS_SHARE_MODELS">';
 echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
-print '</form>';
-
 print '</td></tr>';
 
 print '</table>';
 
+print '</form>';
+
 dol_fiche_end();
 
 // End of page