From a72b262f5b5731921106a9fe1d7d903d41a717f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Apr 2020 14:50:55 +0200
Subject: [PATCH 1/2] FIx #13592

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

diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 963a3edf26f..2c791f2c8c5 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -385,8 +385,8 @@ if ($result)
                     print $langs->trans("VATPayment");
                     print '</a>';
                 }
-                elseif ($links[$key]['type']=='payment_salary') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$links[$key]['url_id'].'">';
+                elseif ($links[$key]['type'] == 'payment_salary') {
+                    print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowPaymentSalary'), 'payment').' ';
                     print $langs->trans("SalaryPayment");
                     print '</a>';

From 236898f4e710c7415dcf1fcbeef66f3cbf868e2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Apr 2020 14:55:37 +0200
Subject: [PATCH 2/2] FIX #13503

---
 htdocs/expedition/class/api_shipments.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 5aca14fb28d..aeba8e78730 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -450,7 +450,7 @@ class Shipments extends DolibarrApi
      */
     public function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->shipment->supprimer) {
+        if(! DolibarrApiAccess::$user->rights->expedition->supprimer) {
             throw new RestException(401);
         }
         $result = $this->shipment->fetch($id);