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

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements

Browse Source 
Conflicts:
	htdocs/holiday/fiche.php
This commit is contained in:
Marcos García 2013-05-06 17:22:31 +02:00
commit 896a60296c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ class Holiday extends CommonObject
// User // User
$sql.= "'".$this->fk_user."',"; $sql.= "'".$this->fk_user."',";
$sql.= " '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($now)."',";
$sql.= " '".addslashes($this->description)."',"; $sql.= " '".$this->db->escape($this->description)."',";
$sql.= " '".$this->db->idate($this->date_debut)."',"; $sql.= " '".$this->db->idate($this->date_debut)."',";
$sql.= " '".$this->db->idate($this->date_fin)."',"; $sql.= " '".$this->db->idate($this->date_fin)."',";
$sql.= " ".$this->halfday.","; $sql.= " ".$this->halfday.",";
@ -473,7 +473,7 @@ class Holiday extends CommonObject
// Update request // Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
$sql.= " description= '".addslashes($this->description)."',"; $sql.= " description= '".$this->db->escape($this->description)."',";
if(!empty($this->date_debut)) { if(!empty($this->date_debut)) {
$sql.= " date_debut = '".$this->db->idate($this->date_debut)."',"; $sql.= " date_debut = '".$this->db->idate($this->date_debut)."',";
@ -527,7 +527,7 @@ class Holiday extends CommonObject
$sql.= " fk_user_cancel = NULL,"; $sql.= " fk_user_cancel = NULL,";
} }
if(!empty($this->detail_refuse)) { if(!empty($this->detail_refuse)) {
$sql.= " detail_refuse = '".addslashes($this->detail_refuse)."'"; $sql.= " detail_refuse = '".$this->db->escape($this->detail_refuse)."'";
} else { } else {
$sql.= " detail_refuse = NULL"; $sql.= " detail_refuse = NULL";
} }
@ -1394,7 +1394,7 @@ class Holiday extends CommonObject
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= " '".addslashes($this->optName)."',"; $sql.= " '".$this->db->escape($this->optName)."',";
$sql.= " '".$this->optValue."'"; $sql.= " '".$this->optValue."'";
$sql.= ")"; $sql.= ")";
@ -1441,7 +1441,7 @@ class Holiday extends CommonObject
function updateEventCP($rowid, $name, $value) { function updateEventCP($rowid, $name, $value) {
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_events SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_events SET";
$sql.= " name = '".addslashes($name)."', value = '".$value."'"; $sql.= " name = '".$this->db->escape($name)."', value = '".$value."'";
$sql.= " WHERE rowid = '".$rowid."'"; $sql.= " WHERE rowid = '".$rowid."'";
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -1564,7 +1564,7 @@ class Holiday extends CommonObject
*/ */
function addLogCP($fk_user_action,$fk_user_update,$type,$new_solde) { function addLogCP($fk_user_action,$fk_user_update,$type,$new_solde) {
global $conf, $langs, $db; global $conf, $langs;
$error=0; $error=0;
@ -1586,7 +1586,7 @@ class Holiday extends CommonObject
$sql.= " NOW(), "; $sql.= " NOW(), ";
$sql.= " '".$fk_user_action."',"; $sql.= " '".$fk_user_action."',";
$sql.= " '".$fk_user_update."',"; $sql.= " '".$fk_user_update."',";
$sql.= " '".addslashes($type)."',"; $sql.= " '".$this->db->escape($type)."',";
$sql.= " '".$prev_solde."',"; $sql.= " '".$prev_solde."',";
$sql.= " '".$new_solde."'"; $sql.= " '".$new_solde."'";
$sql.= ")"; $sql.= ")";

2
htdocs/holiday/fiche.php
View File

@ -380,7 +380,7 @@ if($action == 'confirm_valid')
$newSolde = $soldeActuel - ($nbJour*$cp->getConfCP('nbHolidayDeducted')); $newSolde = $soldeActuel - ($nbJour*$cp->getConfCP('nbHolidayDeducted'));
// On ajoute la modification dans le LOG // On ajoute la modification dans le LOG
$cp->addLogCP($userID,$cp->fk_user, $langs->transnoentitiesnoconv("Holidays"),$newSolde); $cp->addLogCP($user->id,$cp->fk_user, $langs->transnoentitiesnoconv("Holidays"),$newSolde);
// Mise à jour du solde // Mise à jour du solde
$cp->updateSoldeCP($cp->fk_user,$newSolde); $cp->updateSoldeCP($cp->fk_user,$newSolde);