From 0497c399d7a6d6cdf2cde60cc2fe0859ada2de0a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 13 Nov 2019 14:59:07 +0100
Subject: [PATCH 1/3] Missing language key

---
 htdocs/langs/en_US/holiday.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index c3cdda3cfd6..bfff50de4c8 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -127,4 +127,5 @@ HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
\ No newline at end of file
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays

From 85e2546019b3a63de87ba885433b31c9bdc3e70c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 13 Nov 2019 15:25:23 +0100
Subject: [PATCH 2/3] Missing language key

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index de1e5f52fcd..d70bfe959e9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -857,6 +857,7 @@ Permission20003=Delete leave requests
 Permission20004=Read all leave requests (even of user not subordinates)
 Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job

From 3ec7568559fc3852cbe83c954e4f8b0fb676ee92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 13 Nov 2019 20:44:21 +0100
Subject: [PATCH 3/3] FIX #12385

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index be60c4fa574..49a12f6c490 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -477,7 +477,7 @@ if ($object->id > 0)
         print '</td><td>';
         if ($action == 'editshipping')
         {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->shipping_method_id,'shipping_method_id');
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->shipping_method_id,'shipping_method_id', 1);
         }
         else
         {