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

Fix missing translation

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-10 22:57:25 +02:00
parent 4683ef41be
commit a74d008ff2
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class Holiday extends CommonObject
protected $isnolinkedbythird = 1; // No field fk_soc protected $isnolinkedbythird = 1; // No field fk_soc
protected $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'holiday'; public $picto = 'holiday';
/** /**
* @deprecated * @deprecated
* @see id * @see id
@ -128,7 +128,7 @@ class Holiday extends CommonObject
if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; } if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; }
if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0) { $this->error="ErrorBadParameter"; return -1; } if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0) { $this->error="ErrorBadParameter"; return -1; }
if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameter"; return -1; } if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameter"; return -1; }
// Insert request // Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
$sql.= "fk_user,"; $sql.= "fk_user,";
@ -290,7 +290,7 @@ class Holiday extends CommonObject
$sql = "SELECT"; $sql = "SELECT";
$sql.= " cp.rowid,"; $sql.= " cp.rowid,";
$sql.= " cp.fk_user,"; $sql.= " cp.fk_user,";
$sql.= " cp.date_create,"; $sql.= " cp.date_create,";
$sql.= " cp.description,"; $sql.= " cp.description,";
@ -312,13 +312,13 @@ class Holiday extends CommonObject
$sql.= " uu.login as user_login,"; $sql.= " uu.login as user_login,";
$sql.= " uu.statut as user_statut,"; $sql.= " uu.statut as user_statut,";
$sql.= " uu.photo as user_photo,"; $sql.= " uu.photo as user_photo,";
$sql.= " ua.lastname as validator_lastname,"; $sql.= " ua.lastname as validator_lastname,";
$sql.= " ua.firstname as validator_firstname,"; $sql.= " ua.firstname as validator_firstname,";
$sql.= " ua.login as validator_login,"; $sql.= " ua.login as validator_login,";
$sql.= " ua.statut as validator_statut,"; $sql.= " ua.statut as validator_statut,";
$sql.= " ua.photo as validator_photo"; $sql.= " ua.photo as validator_photo";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua"; $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
$sql.= " WHERE cp.entity IN (".getEntity('holiday').")"; $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@ -379,13 +379,13 @@ class Holiday extends CommonObject
$tab_result[$i]['user_login'] = $obj->user_login; $tab_result[$i]['user_login'] = $obj->user_login;
$tab_result[$i]['user_statut'] = $obj->user_statut; $tab_result[$i]['user_statut'] = $obj->user_statut;
$tab_result[$i]['user_photo'] = $obj->user_photo; $tab_result[$i]['user_photo'] = $obj->user_photo;
$tab_result[$i]['validator_firstname'] = $obj->validator_firstname; $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
$tab_result[$i]['validator_lastname'] = $obj->validator_lastname; $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
$tab_result[$i]['validator_login'] = $obj->validator_login; $tab_result[$i]['validator_login'] = $obj->validator_login;
$tab_result[$i]['validator_statut'] = $obj->validator_statut; $tab_result[$i]['validator_statut'] = $obj->validator_statut;
$tab_result[$i]['validator_photo'] = $obj->validator_photo; $tab_result[$i]['validator_photo'] = $obj->validator_photo;
$i++; $i++;
} }
@ -437,13 +437,13 @@ class Holiday extends CommonObject
$sql.= " uu.login as user_login,"; $sql.= " uu.login as user_login,";
$sql.= " uu.statut as user_statut,"; $sql.= " uu.statut as user_statut,";
$sql.= " uu.photo as user_photo,"; $sql.= " uu.photo as user_photo,";
$sql.= " ua.lastname as validator_lastname,"; $sql.= " ua.lastname as validator_lastname,";
$sql.= " ua.firstname as validator_firstname,"; $sql.= " ua.firstname as validator_firstname,";
$sql.= " ua.login as validator_login,"; $sql.= " ua.login as validator_login,";
$sql.= " ua.statut as validator_statut,"; $sql.= " ua.statut as validator_statut,";
$sql.= " ua.photo as validator_photo"; $sql.= " ua.photo as validator_photo";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua"; $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
$sql.= " WHERE cp.entity IN (".getEntity('holiday').")"; $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@ -504,13 +504,13 @@ class Holiday extends CommonObject
$tab_result[$i]['user_login'] = $obj->user_login; $tab_result[$i]['user_login'] = $obj->user_login;
$tab_result[$i]['user_statut'] = $obj->user_statut; $tab_result[$i]['user_statut'] = $obj->user_statut;
$tab_result[$i]['user_photo'] = $obj->user_photo; $tab_result[$i]['user_photo'] = $obj->user_photo;
$tab_result[$i]['validator_firstname'] = $obj->validator_firstname; $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
$tab_result[$i]['validator_lastname'] = $obj->validator_lastname; $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
$tab_result[$i]['validator_login'] = $obj->validator_login; $tab_result[$i]['validator_login'] = $obj->validator_login;
$tab_result[$i]['validator_statut'] = $obj->validator_statut; $tab_result[$i]['validator_statut'] = $obj->validator_statut;
$tab_result[$i]['validator_photo'] = $obj->validator_photo; $tab_result[$i]['validator_photo'] = $obj->validator_photo;
$i++; $i++;
} }
// Retourne 1 et ajoute le tableau à la variable // Retourne 1 et ajoute le tableau à la variable
@ -817,7 +817,7 @@ class Holiday extends CommonObject
if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5'); if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5'); if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
} }
return $statut; return $statut;
} }
@ -905,11 +905,11 @@ class Holiday extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
$sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')"; $sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
return $createifnotfound; return $createifnotfound;
} }
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -2; return -2;
@ -920,7 +920,7 @@ class Holiday extends CommonObject
return ''; return '';
} }
} }
else else
{ {
return $obj->value; return $obj->value;
} }
@ -948,12 +948,14 @@ class Holiday extends CommonObject
if (empty($userID) && empty($nbHoliday) && empty($fk_type)) if (empty($userID) && empty($nbHoliday) && empty($fk_type))
{ {
$langs->load("holiday");
// Si mise à jour pour tout le monde en début de mois // Si mise à jour pour tout le monde en début de mois
$now=dol_now(); $now=dol_now();
$month = date('m',$now); $month = date('m',$now);
$newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S'); $newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
// Get month of last update // Get month of last update
$lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate); $lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate);
$monthLastUpdate = $lastUpdate[4].$lastUpdate[5]; $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];

30
htdocs/holiday/view_log.php
View File

@ -57,7 +57,8 @@ llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.
// 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', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'"); // Load $cp->logs $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'"); // Load $cp->logs
print load_fiche_titre($langs->trans('LogCP'), '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">&lt;</a><li class="pagination"><a href="">'.$langs->trans("Year").' '.$year.'</a></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">&gt;</a></li></lu></div>', 'title_hrm.png'); $pagination='<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'"><i class="fa fa-chevron-left" title="Previous"></i></a><li class="pagination"><span class="active">'.$langs->trans("Year").' '.$year.'</span></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'"><i class="fa fa-chevron-right" title="Next"></i></a></li></lu></div>';
print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n"; print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
$lastUpdate = $cp->getConfCP('lastUpdate'); $lastUpdate = $cp->getConfCP('lastUpdate');
@ -77,6 +78,18 @@ print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
print '<tbody>'; print '<tbody>';
print '<tr class="liste_titre">';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '</tr>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('ID')); print_liste_field_titre($langs->trans('ID'));
print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"'); print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"');
@ -88,24 +101,9 @@ print_liste_field_titre($langs->trans('PrevSoldeCP'), $_SERVER["PHP_SELF"], '',
print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"');
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '</tr>';
$var=true;
foreach($cp->logs as $logs_CP) foreach($cp->logs as $logs_CP)
{ {
$user_action = new User($db); $user_action = new User($db);
$user_action->fetch($logs_CP['fk_user_action']); $user_action->fetch($logs_CP['fk_user_action']);