From 3babdb9798702da37f45ff1ce8c51bca26e0c238 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 28 Jun 2018 13:45:30 +0200
Subject: [PATCH 1/4] Fix filters not saved when ordering

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

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f71601e7bc0..295bf530f91 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -242,6 +242,8 @@ if ($resql)
 	if ($fourn_id)	$param.="&fourn_id=".$fourn_id;
 	if ($snom)		$param.="&snom=".$snom;
 	if ($sref)		$param.="&sref=".$sref;
+	if ($toolowstock)		$param.="&toolowstock=".$toolowstock;
+	if ($search_categ)		$param.="&search_categ=".$search_categ;
 
 	$formProduct = new FormProduct($db);
 	$formProduct->loadWarehouses();

From 5756955d5544df5d12b9b4ba1502e4f9b5516f0e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 28 Jun 2018 14:26:51 +0200
Subject: [PATCH 2/4] Fix link to create event had no socid if from thirdparty
 card

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

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 2d66661c839..a39b4840017 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -196,7 +196,7 @@ class FormActions
 
 			if (! empty($conf->agenda->enabled))
 			{
-				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
+				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').($socid>0?'&socid='.$socid:'').'&backtopage='.urlencode($urlbacktopage).'">';
 				$buttontoaddnewevent.= $langs->trans("AddEvent");
 				$buttontoaddnewevent.= '</a>';
 			}

From 875cee84c7dca5d11dcdc995fe0389294a9d74ee Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 3 Jul 2018 13:47:53 +0200
Subject: [PATCH 3/4] Fix: missing "paid" field

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

diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index d1436287db3..afaefc4575c 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -71,7 +71,7 @@ $loan_static = new Loan($db);
 
 llxHeader();
 
-$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend,";
+$sql = "SELECT l.rowid, l.label, l.capital, l.paid, l.datestart, l.dateend,";
 $sql.= " SUM(pl.amount_capital) as alreadypayed";
 $sql.= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl";
 $sql.= " ON l.rowid = pl.fk_loan";
@@ -83,7 +83,7 @@ if ($filtre) {
     $filtre=str_replace(":","=",$filtre);
     $sql .= " AND ".$filtre;
 }
-$sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend";
+$sql.= " GROUP BY l.rowid, l.label, l.capital, l.paid, l.datestart, l.dateend";
 $sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = '';

From 2113965b57e1e2dd27cd728c4969a28ed2926894 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jul 2018 14:26:21 +0200
Subject: [PATCH 4/4] Update html.formactions.class.php

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

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index a39b4840017..bd22470d952 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -196,7 +196,7 @@ class FormActions
 
 			if (! empty($conf->agenda->enabled))
 			{
-				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').($socid>0?'&socid='.$socid:'').'&backtopage='.urlencode($urlbacktopage).'">';
+				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
 				$buttontoaddnewevent.= $langs->trans("AddEvent");
 				$buttontoaddnewevent.= '</a>';
 			}