Przeglądaj źródła

Complete fix #4354

Laurent Destailleur 9 lat temu
rodzic
commit
fddd02eecc

+ 4 - 5
htdocs/holiday/class/holiday.class.php

@@ -817,18 +817,17 @@ class Holiday extends CommonObject
     }
 
     /**
-     *  Retourne la valeur d'un paramètre de configuration
+     *  Return value of a conf parameterfor leave module
+     *  TODO Move this into llx_const table
      *
-     *  @param	string	$name       name du paramètre de configuration
-     *  @param	int		$fk_type	Filter on type
-     *  @return string      		retourne la valeur du paramètre
+     *  @param	string	$name       name of parameter
+     *  @return string      		value of parameter
      */
     function getConfCP($name, $fk_type=0)
     {
         $sql = "SELECT value";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
         $sql.= " WHERE name = '".$name."'";
-        if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
 
         dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG);
         $result = $this->db->query($sql);

+ 1 - 1
htdocs/holiday/define_holiday.php

@@ -159,7 +159,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
 print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
-$lastUpdate = $holiday->getConfCP('lastUpdate', 0);
+$lastUpdate = $holiday->getConfCP('lastUpdate');
 if ($lastUpdate) 
 {
     $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];