lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete fix #4354

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-10 11:31:22 +01:00
parent 2764fb240f
commit fddd02eecc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/holiday/class/holiday.class.php
View File

@ -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 string $name name of parameter
* @param int $fk_type Filter on type * @return string value of parameter
* @return string retourne la valeur du paramètre
*/ */
function getConfCP($name, $fk_type=0) function getConfCP($name, $fk_type=0)
{ {
$sql = "SELECT value"; $sql = "SELECT value";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config"; $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
$sql.= " WHERE name = '".$name."'"; $sql.= " WHERE name = '".$name."'";
if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG); dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);

2
htdocs/holiday/define_holiday.php
View File

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