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

Merge pull request #4354 from T-B-A-I/patch-1

Browse Source 
Debug of module leave requests
This commit is contained in:
Laurent Destailleur 2016-01-08 14:13:08 +01:00
commit cce473b2cb
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/holiday/card.php
View File

@ -356,7 +356,7 @@ if ($action == 'confirm_send')
if ($cp->getConfCP('AlertValidatorSolde'))
{
$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
if ($nbopenedday > $cp->getCPforUser($cp->fk_user, $cp->fk_type))
{
$message.= "\n";
$message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
@ -413,14 +413,14 @@ if ($action == 'confirm_valid')
// Calculcate number of days consummed
$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
$soldeActuel = $cp->getCpforUser($cp->fk_user);
$soldeActuel = $cp->getCpforUser($cp->fk_user, $cp->fk_type);
$newSolde = $soldeActuel - ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
// On ajoute la modification dans le LOG
$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde);
$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $cp->fk_type);
// Mise à jour du solde
$cp->updateSoldeCP($cp->fk_user, $newSolde);
$cp->updateSoldeCP($cp->fk_user, $newSolde, $cp->fk_type);
// To
$destinataire = new User($db);
@ -578,14 +578,14 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
// Calculcate number of days consummed
$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
$soldeActuel = $cp->getCpforUser($cp->fk_user);
$soldeActuel = $cp->getCpforUser($cp->fk_user, $cp->fk_type);
$newSolde = $soldeActuel + ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
// On ajoute la modification dans le LOG
$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde);
$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $cp->fk_type);
// Mise à jour du solde
$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde);
$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde, $cp->fk_type);
if ($result1 < 0 || $result2 < 0)
{
@ -618,7 +618,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
// From
$expediteur = new User($db);
$expediteur->fetch($cp->fk_validator);
$expediteur->fetch($cp->fk_user_cancel);
$emailFrom = $expediteur->email;
// Subject

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

@ -819,12 +819,11 @@ class Holiday extends CommonObject
* @param int $fk_type Filter on type
* @return string retourne la valeur du paramètre
*/
function getConfCP($name, $fk_type=0)
function getConfCP($name)
{
$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);

7
htdocs/langs/en_US/holiday.lang
View File

@ -26,6 +26,7 @@ MenuConfCP=Edit balance of leaves
UpdateAllCP=Update the leaves
SoldeCPUser=Leaves balance is <b>%s</b> days.
ErrorEndDateCP=You must select an end date greater than the start date.
ErrorFieldRequired=This field is required :
ErrorSQLCreateCP=An SQL error occurred during the creation:
ErrorIDFicheCP=An error has occurred, the leave request does not exist.
ReturnCP=Return to previous page
@ -40,6 +41,7 @@ DeleteCP=Delete
ActionValidCP=Validate
ActionRefuseCP=Refuse
ActionCancelCP=Cancel
UpdateButtonCP=Update
StatutCP=Status
SendToValidationCP=Send to validation
TitleDeleteCP=Delete the leave request
@ -80,11 +82,10 @@ alreadyCPexist=A leave request has already been done on this period.
UserName=Name
FirstDayOfHoliday=First day of vacation
LastDayOfHoliday=Last day of vacation
BoxTitleLastLeaveRequests=Last %s modified leave requests
BoxTitleLastLeaveRequests=Last %s modified leave requests
HolidaysMonthlyUpdate=Monthly update
ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
@ -140,4 +141,4 @@ HolidaysRefusedBody=Your leave request for %s to %s has been denied for the foll
HolidaysCanceled=Canceled leaved request
HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
NewByMonth=Added per month
GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.