From ace1681f31a3a29dd0278b6e1e0cf2c340f881b1 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sat, 29 Aug 2015 16:52:10 +0200
Subject: [PATCH 1/2] Fix missing delivery validation button

delivery advanced permissions were missing
---
 htdocs/livraison/card.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 7ea9920d65b..791144ed3aa 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -744,9 +744,13 @@ else
 			{
 				print '<div class="tabsAction">';
 
-				if ($object->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
+				if ($object->statut == 0 && $num_prod > 0) 
 				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->livraison->creer))
+						|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+					}
 				}
 
 				if ($user->rights->expedition->livraison->supprimer)

From f1be57448924941ebfd720e72522bdbba3e03a6d Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sat, 29 Aug 2015 17:14:41 +0200
Subject: [PATCH 2/2] correction on permissions

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

diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 791144ed3aa..54e45080efb 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -746,7 +746,7 @@ else
 
 				if ($object->statut == 0 && $num_prod > 0) 
 				{
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->livraison->creer))
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
 						|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';