From 88a29b7c9cffe98e92a6b756d557759e3122f88d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 20:26:56 +0100
Subject: [PATCH] Add an advance permission to check/uncheck reception

---
 htdocs/core/modules/modFournisseur.class.php |  8 +++++
 htdocs/fourn/commande/dispatch.php           | 38 +++++++++++++++-----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 9e26b0e8b81..84e6385694d 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -177,6 +177,14 @@ class modFournisseur extends DolibarrModules
             $this->rights[$r][4] = 'commande';
             $this->rights[$r][5] = 'receptionner';
 
+            $r++;
+            $this->rights[$r][0] = 1189;
+            $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
+            $this->rights[$r][2] = 'd';
+            $this->rights[$r][3] = 0;
+            $this->rights[$r][4] = 'commande_advance';
+            $this->rights[$r][5] = 'check';
+
             $r++;
             $this->rights[$r][0] = 1188;
             $this->rights[$r][1] = 'Supprimer une commande fournisseur';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 2610111023a..f2dd3518868 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -67,7 +67,10 @@ $mesg='';
  * Actions
  */
 
-if ($action == 'checkdispatchline')
+if ($action == 'checkdispatchline' &&
+	! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
+)
 {
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result=$supplierorderdispatch->fetch($lineid);
@@ -81,7 +84,10 @@ if ($action == 'checkdispatchline')
 	}
 }
 
-if ($action == 'uncheckdispatchline')
+if ($action == 'uncheckdispatchline' &&
+	! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
+)
 {
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result=$supplierorderdispatch->fetch($lineid);
@@ -630,15 +636,31 @@ if ($id > 0 || ! empty($ref))
 
 						// Add button to check/uncheck disaptching
 						print '<td align="center">';
-						$disabled='';
-						if ($commande->statut == 5) $disabled=1;
-						if (empty($objp->status)) 
+						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       					|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))
+							)
 						{
-							print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=checkdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Check").'</a>';
+							if (empty($objp->status)) 
+							{
+								print '<a class="button buttonRefused" href="#">'.$langs->trans("Check").'</a>';
+							}
+							else
+							{
+								print '<a class="button buttonRefused" href="#">'.$langs->trans("Uncheck").'</a>';
+							}
 						}
-						else 
+						else
 						{
-							print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=uncheckdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Uncheck").'</a>';
+							$disabled='';
+							if ($commande->statut == 5) $disabled=1;
+							if (empty($objp->status)) 
+							{
+								print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=checkdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Check").'</a>';
+							}
+							else 
+							{
+								print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=uncheckdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Uncheck").'</a>';
+							}
 						}
 						print '</td>';	
 					}