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 1/2] 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 2/2] 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);