From 2352463c212b506f814e90ef201e99747811fcf1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 May 2019 13:23:12 +0200
Subject: [PATCH 1/3] Fix link to change validator is on validate status only

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index e569096e5ff..288cecef75d 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1229,7 +1229,7 @@ else
                     print '</td>';
                     print '<td>'.$valideur->getNomUrl(-1);
                     $include_users = $object->fetch_users_approver_holiday();
-                    if (in_array($user->id, $include_users) && $object->statut != 1)
+                    if (in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED)
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
                     }

From 35b021f20327d3ab33bf21ac7170a3b4b3db42b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 May 2019 09:53:54 +0200
Subject: [PATCH 2/3] Fix phpcs

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

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index ccb12f7bc4c..c8636a66145 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -152,7 +152,7 @@ class AccountingAccount extends CommonObject
 	 * @param 	int 	       $rowid 				    Id
 	 * @param 	string 	       $account_number 	        Account number
 	 * @param 	int|boolean    $limittocurrentchart     1 or true=Load record only if it is into current active char of account
-	 * @param   string         $limittochartaccount     'ABC'=Load record only if it is into chart account with code 'ABC'.
+	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC'.
 	 * @return 	int                                     <0 if KO, 0 if not found, Id of record if OK and found
 	 */
 	function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')

From 6e9cd819c13b2d03941f171d550978c0ab186655 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 May 2019 09:55:09 +0200
Subject: [PATCH 3/3] Fix phpcs

---
 htdocs/core/modules/import/import_csv.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 4dd4ef342e7..feeddb399c2 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -137,7 +137,7 @@ class ImportCsv extends ModeleImports
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @param	array		$headerlinefields	Array of fields name
-	 * 	@return	string
+	 * 	@return	string$limittoachartaccount
 	 */
 	function write_title_example($outputlangs,$headerlinefields)
 	{
@@ -444,7 +444,7 @@ class ImportCsv extends ModeleImports
                                             $classinstance=new $class($this->db);
                                             // Try the fetch from code or ref
                                             $param_array = array('', $newval);
-                                            if ($class == 'AccountingAccount') 
+                                            if ($class == 'AccountingAccount')
                                             {
                                                 //var_dump($arrayrecord[0]['val']);
                                                 /*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';