From fced9ec690d2eccfbcd6486cded46ad184e58cdb Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 27 Oct 2019 12:04:01 +0100
Subject: [PATCH 1/4] Fix missing contact fetch on card

---
 htdocs/contact/card.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 52957d25343..e36327be432 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -78,6 +78,14 @@ $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'ro
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard','globalcard'));
 
+if ($id > 0) $object->fetch($id);
+
+if (! ($object->id > 0) && $action == 'view')
+{
+	$langs->load("errors");
+	print($langs->trans('ErrorRecordNotFound'));
+	exit;
+}
 
 /*
  *	Actions

From 30d416f8c08cbe1c5400036875a9fe9f3fee6089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 28 Oct 2019 20:16:27 +0100
Subject: [PATCH 2/4] Update agenda.lang

---
 htdocs/langs/en_US/agenda.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index a7b6ea4f4da..022588139c7 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -85,6 +85,7 @@ PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
 HOLIDAY_CREATEInDolibarr=Request for leave %s created
 HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
 HOLIDAY_VALIDATEDInDolibarr=Request for leave %s validated
 HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
 EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created

From 85cef09e8313c5deed260cad6a1386ea3412b5a6 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 30 Oct 2019 14:46:46 +0100
Subject: [PATCH 3/4] FIX: triggers: directories read with opendir() never
 closed

---
 htdocs/core/class/interfaces.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 655969d73f6..2960d4cf327 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -151,6 +151,8 @@ class Interfaces
                         $i++;
                     }
                 }
+
+		closedir($handle);
             }
         }
 

From e2680f763791c2582a2e62e84c9fec7b19eca8b6 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 12 Nov 2019 09:42:27 +0100
Subject: [PATCH 4/4] FIX : limit 20 prevent to see all products/services

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

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 4511ee0e8a7..ad41dd1dff8 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -208,7 +208,7 @@ if ($conf->facture->enabled)
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
-		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
 		print '</td>';
 	}
 	print "</tr>\n";