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

Merge remote-tracking branch 'origin/3.5' into 3.6

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-06 01:46:57 +02:00
commit 277bfc8012
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -894,7 +894,7 @@ class Holiday extends CommonObject
$month = date('m',$now);
$lastUpdate = $this->getConfCP('lastUpdate');
$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
//print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;
//print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;exit;
// Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
if ($month != $monthLastUpdate)
@ -1626,7 +1626,7 @@ class Holiday extends CommonObject
$sql.= ")";
$this->db->begin();
print $sql;exit;
dol_syslog(get_class($this)."::addLogCP sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) {
@ -1682,12 +1682,12 @@ class Holiday extends CommonObject
// Filtrage de séléction
if(!empty($filter)) {
$sql.= $filter;
$sql.= " ".$filter;
}
// Ordre d'affichage
if(!empty($order)) {
$sql.= $order;
$sql.= " ".$order;
}
dol_syslog(get_class($this)."::fetchLog sql=".$sql, LOG_DEBUG);

2
htdocs/holiday/define_holiday.php
View File

@ -71,7 +71,7 @@ if ($action == 'update' && isset($_POST['update_cp']))
$comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
// We add the modification to the log
$holiday->addLogCP($user->id,$userID, $langs->trans('ManualUpdate').$comment,$userValue);
$holiday->addLogCP($user->id,$userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment,$userValue);
// Update of the days of the employee
$holiday->updateSoldeCP($userID,$userValue);

6
htdocs/holiday/view_log.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2007-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
*
* This program is free software; you can redistribute it and/or modify
@ -37,7 +37,7 @@ if(!$user->rights->holiday->view_log) accessforbidden();
/*
* View
*/
*/
$langs->load('users');
@ -45,7 +45,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
$cp = new Holiday($db);
//Recent changes are more important than old changes
// Recent changes are more important than old changes
$log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC','');
print_fiche_titre($langs->trans('LogCP'));