New: Can enter holiday for someone else if user has permission for.

ChangeLog

@@ -60,6 +60,7 @@ For users:
 - New: When a subscription is recorded with invoice and payment:
        - the document (PDF) of invoice is also generated.
        - the invoice is set to status paid.
+- New: Can enter holiday for someone else if user has permission for.
 - Fix: Project Task numbering customs rule works.
 - Fix: Add actions events not implemented.
 - Fix: Price min of composition is not supplier price min by quantity.

htdocs/core/modules/modHoliday.class.php

@@ -134,42 +134,42 @@ class modHoliday extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Lire/créer/modifier ses demandes de congés payés';	// Permission label
+		$this->rights[$r][1] = 'Create/modify your own holidays';	// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Lire/créer/modifier toutes les demandes de congés payés';	// Permission label
+		$this->rights[$r][1] = 'Create/modify hollidays for everybody';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'lire_tous';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Supprimer des demandes de congés payés';	// Permission label
+		$this->rights[$r][1] = 'Delete holidays';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Définir les congés payés des utilisateurs';	// Permission label
+		$this->rights[$r][1] = 'Setup holidays of users';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Voir les logs de modification des congés payés';	// Permission label
+		$this->rights[$r][1] = 'See logs for holidays requests';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'view_log';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Accéder au rapport mensuel des congés payés';	// Permission label
+		$this->rights[$r][1] = 'Read holidays monthly report';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'month_report';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)

htdocs/holiday/fiche.php

@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, orwrite
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -38,11 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 $myparam = GETPOST("myparam");
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
+$userid = GETPOST('userid')?GETPOST('userid'):$user->id;
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
-$user_id = $user->id;
 $now=dol_now();
 
 
@@ -56,12 +56,15 @@ if ($action == 'create')
 	$cp = new Holiday($db);
 
     // Si pas le droit de créer une demande
-    if(!$user->rights->holiday->write)
+    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
     {
-        header('Location: fiche.php?action=request&error=CantCreate');
+    	$error++;
-        exit;
+    	setEventMessage($langs->trans('CantCreateCP'));
+    	$action='request';
     }
 
+    if (! $error)
+    {
 	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
 	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
 	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
@@ -121,14 +124,14 @@ if ($action == 'create')
 	        exit;
 	    }
 
-    $cp->fk_user = $user_id;
+	    $cp->fk_user = $userid;
 	    $cp->description = $description;
 	    $cp->date_debut = $date_debut;
 	    $cp->date_fin = $date_fin;
 	    $cp->fk_validator = $valideur;
 		$cp->halfday = $halfday;
 
-    $verif = $cp->create($user_id);
+	    $verif = $cp->create($userid);
 
 	    // Si pas d'erreur SQL on redirige vers la fiche de la demande
 	    if ($verif > 0)
@@ -142,7 +145,7 @@ if ($action == 'create')
 	        header('Location: fiche.php?action=request&error=SQL_Create&msg='.$cp->error);
 	        exit;
 	    }
-
+    }
 }
 
 if ($action == 'update')
@@ -159,7 +162,7 @@ if ($action == 'update')
 	else if ($endhalfday == 'morning') $halfday=1;
 
     // Si pas le droit de modifier une demande
-    if(!$user->rights->holiday->write)
+    if (! $user->rights->holiday->write)
     {
         header('Location: fiche.php?action=request&error=CantUpdate');
         exit;
@@ -168,11 +171,13 @@ if ($action == 'update')
     $cp = new Holiday($db);
     $cp->fetch($_POST['holiday_id']);
 
+	$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
 	// Si en attente de validation
     if ($cp->statut == 1)
     {
         // Si c'est le créateur ou qu'il a le droit de tout lire / modifier
-        if ($user->id == $cp->fk_user || $user->rights->holiday->lire_tous)
+        if ($canedit)
         {
             $valideur = $_POST['valideur'];
             $description = trim($_POST['description']);
@@ -247,11 +252,13 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes')
         $cp = new Holiday($db);
         $cp->fetch($id);
 
+        $canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
         // Si c'est bien un brouillon
         if ($cp->statut == 1 || $cp->statut == 3)
         {
             // Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
-            if ($user->id == $cp->fk_user || $user->rights->holiday->lire_tous)
+            if ($canedit)
             {
                 $result=$cp->delete($id);
             }
@@ -653,13 +660,12 @@ $cp = new Holiday($db);
 
 $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
 
-
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
-if (empty($id) || $action == 'add' || $action == 'request')
+if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create')
 {
     // Si l'utilisateur n'a pas le droit de faire une demande
-    if(!$user->rights->holiday->write)
+    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
     {
         $errors[]=$langs->trans('CantCreateCP');
     }
@@ -739,16 +745,26 @@ if (empty($id) || $action == 'add' || $action == 'request')
         // Formulaire de demande
         print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
         print '<input type="hidden" name="action" value="create" />'."\n";
-        print '<input type="hidden" name="userID" value="'.$user_id.'" />'."\n";
+        print '<input type="hidden" name="userID" value="'.$userid.'" />'."\n";
         print '<div class="tabBar">';
         print '<span>'.$langs->trans('DelayToRequestCP',$cp->getConfCP('delayForRequest')).'</span><br /><br />';
 
-        $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
-
-        print '<span>'.$langs->trans('SoldeCPUser', round($nb_holiday,0)).'</span><br /><br />';
         print '<table class="border" width="100%">';
         print '<tbody>';
         print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
+        print '<td>';
+        if (empty($user->rights->holiday->write_all))
+        {
+        	print $form->select_users($userid,'useridbis',0,'',1);
+        	print '<input type="hidden" name="userid" value="'.$userid.'">';
+        }
+        else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
+        $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
+        print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,0)).'</span>';
+        print '</td>';
+        print '</tr>';
+        print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
         print '<td>';
         // Si la demande ne vient pas de l'agenda
@@ -829,6 +845,8 @@ else
         {
             $cp->fetch($id);
 
+			$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
             $valideur = new User($db);
             $valideur->fetch($cp->fk_validator);
 
@@ -875,9 +893,8 @@ else
             }
 
             // On vérifie si l'utilisateur à le droit de lire cette demande
-            if($user->id == $cp->fk_user || $user->rights->holiday->lire_tous)
+            if ($canedit)
             {
-
                 if ($action == 'delete')
                 {
                     if($user->rights->holiday->delete)
@@ -915,7 +932,7 @@ else
 
                 dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
 
-                if ($action == 'edit' && $user->id == $cp->fk_user && $cp->statut == 1)
+                if ($action == 'edit' && $cp->statut == 1)
                 {
                     $edit = true;
                     print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$_GET['id'].'">'."\n";
@@ -935,6 +952,11 @@ else
                 print '</td>';
                 print '</tr>';
 
+                print '<td>'.$langs->trans("User").'</td>';
+        		print '<td>';
+        		print $userRequest->getNomUrl(1);
+        		print '</td></tr>';
+
 			    $starthalfday=($cp->halfday == -1 || $cp->halfday == 2)?'afternoon':'morning';
 			    $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon';
 
@@ -1019,19 +1041,24 @@ else
 
                 print '<br><br>';
 
-
+				// Info workflow
                 print '<table class="border" width="50%">'."\n";
                 print '<tbody>';
                 print '<tr class="liste_titre">';
                 print '<td colspan="2">'.$langs->trans("InfosWorkflowCP").'</td>';
                 print '</tr>';
 
+                if (! empty($cp->fk_user_create))
+                {
+                	$userCreate=new User($db);
+                	$userCreate->fetch($cp->fk_user_create);
 	                print '<tr>';
 	                print '<td>'.$langs->trans('RequestByCP').'</td>';
-                print '<td>'.$userRequest->getNomUrl(1).'</td>';
+	                print '<td>'.$userCreate->getNomUrl(1).'</td>';
 	                print '</tr>';
+                }
 
-                if(!$edit) {
+                if (!$edit) {
                     print '<tr>';
                     print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>'.$valideur->getNomUrl(1).'</td>';
@@ -1076,10 +1103,10 @@ else
                 print '</tbody>';
                 print '</table>';
 
-                if ($edit && $user->id == $cp->fk_user && $cp->statut == 1)
+                if ($action == 'edit' && $cp->statut == 1)
                 {
                     print '<br><div align="center">';
-                    if($user->rights->holiday->write && $_GET['action'] == 'edit' && $cp->statut == 1)
+                    if ($canedit && $cp->statut == 1)
                     {
                         print '<input type="submit" value="'.$langs->trans("UpdateButtonCP").'" class="button">';
                     }
@@ -1095,11 +1122,11 @@ else
 		            print '<div class="tabsAction">';
 
                     // Boutons d'actions
-                    if($user->rights->holiday->write && $_GET['action'] != 'edit' && $cp->statut == 1)
+                    if ($canedit && $cp->statut == 1)
                     {
                         print '<a href="fiche.php?id='.$_GET['id'].'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
                     }
-                    if($user->id == $cp->fk_user && $cp->statut == 1)
+                    if ($canedit && $cp->statut == 1)
                     {
                         print '<a href="fiche.php?id='.$_GET['id'].'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
                     }

htdocs/holiday/index.php

@@ -173,7 +173,7 @@ if ($id > 0)
 	$user_id = $fuser->id;
 }
 // Récupération des congés payés de l'utilisateur ou de tous les users
-if (!$user->rights->holiday->lire_tous || $id > 0)
+if (!$user->rights->holiday->write_all || $id > 0)
 {
 	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
 }
@@ -278,7 +278,7 @@ $formother->select_year($year_create,'year_create',1, $min_year, 0);
 print '</td>';
 
 // UTILISATEUR
-if($user->rights->holiday->lire_tous) {
+if($user->rights->holiday->write_all) {
     print '<td class="liste_titre" align="left">';
     $form->select_users($search_employe,"search_employe",1,"",0,'');
     print '</td>';
@@ -287,7 +287,7 @@ if($user->rights->holiday->lire_tous) {
 }
 
 // VALIDEUR
-if($user->rights->holiday->lire_tous)
+if($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre" align="left">';
 

htdocs/install/mysql/migration/3.5.0-3.6.0.sql

@@ -20,6 +20,10 @@
 
 ALTER TABLE llx_societe DROP COLUMN datea;
 
+ALTER TABLE llx_holiday ADD COLUMN fk_user_create integer;
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user_create (fk_user_create);
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_create (date_create);
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_validator (fk_validator);
 
 create table llx_c_email_templates
 (

htdocs/install/mysql/tables/llx_holiday.key.sql

@@ -17,5 +17,8 @@
 -- ===================================================================
 
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user (fk_user);
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user_create (fk_user_create);
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_create (date_create);
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_debut (date_debut);
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_fin (date_fin);
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_validator (fk_validator);

htdocs/install/mysql/tables/llx_holiday.sql

@@ -20,6 +20,7 @@ CREATE TABLE llx_holiday
 (
 rowid          integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
 fk_user        integer NOT NULL,
+fk_user_create integer,
 date_create    DATETIME NOT NULL,
 description    VARCHAR( 255 ) NOT NULL,
 date_debut     DATE NOT NULL,

htdocs/langs/en_US/holiday.lang

@@ -141,9 +141,10 @@ HolidaysRefused=Denied holidays
 HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled holidays
 HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20001=Read/create/modify their holidays
+Permission20000=Read you own holidays
-Permission20002=Read/modify all requests of holidays
+Permission20001=Create/modify your holidays
-Permission20003=Delete their holidays requests
+Permission20002=Create/modify holidays for everybody
-Permission20004=Define users holidays
+Permission20003=Delete holidays requests
+Permission20004=Setup users holidays
 Permission20005=Review log of modified holidays
-Permission20006=Access holidays monthly report
+Permission20006=Read holidays monthly report