Fix trad and sql error
This commit is contained in:
Laurent Destailleur
parent
3b6c533b85
commit
968b021985
@ -231,7 +231,7 @@ class Deplacement extends CommonObject
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
|
||||
$sql.= " WHERE entity IN (".getEntity('deplacement').")";
|
||||
if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
|
||||
else $sql.= " AND id = ".$id;
|
||||
else $sql.= " AND rowid = ".$id;
|
||||
|
||||
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
|
||||
$result = $this->db->query($sql);
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# Dolibarr language file - Source file is en_US - holiday
|
||||
HRM=HRM
|
||||
Holidays=Holidays
|
||||
CPTitreMenu=Holidays
|
||||
Holidays=Leaves
|
||||
CPTitreMenu=Leaves
|
||||
MenuReportMonth=Monthly statement
|
||||
MenuAddCP=Apply for holidays
|
||||
NotActiveModCP=You must enable the module holidays to view this page.
|
||||
NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
|
||||
NoCPforUser=You don't have a demand for holidays.
|
||||
AddCP=Apply for holidays
|
||||
MenuAddCP=Make a leave request
|
||||
NotActiveModCP=You must enable the module Leaves to view this page.
|
||||
NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
|
||||
NoCPforUser=You don't have any available day.
|
||||
AddCP=Make a leave request
|
||||
Employe=Employee
|
||||
DateDebCP=Start date
|
||||
DateFinCP=End date
|
||||
@ -18,24 +18,24 @@ ApprovedCP=Approved
|
||||
CancelCP=Canceled
|
||||
RefuseCP=Refused
|
||||
ValidatorCP=Approbator
|
||||
ListeCP=List of holidays
|
||||
ListeCP=List of leaves
|
||||
ReviewedByCP=Will be reviewed by
|
||||
DescCP=Description
|
||||
SendRequestCP=Creating demand for holidays
|
||||
DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
|
||||
MenuConfCP=Edit balance of holidays
|
||||
UpdateAllCP=Update the holidays
|
||||
SoldeCPUser=Holidays balance is <b>%s</b> days.
|
||||
SendRequestCP=Create leave request
|
||||
DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
|
||||
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.
|
||||
ErrorSQLCreateCP=An SQL error occurred during the creation:
|
||||
ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
|
||||
ErrorIDFicheCP=An error has occurred, the leave request does not exist.
|
||||
ReturnCP=Return to previous page
|
||||
ErrorUserViewCP=You are not authorized to read this request for holidays.
|
||||
InfosCP=Information of the demand of holidays
|
||||
ErrorUserViewCP=You are not authorized to read this leave request.
|
||||
InfosCP=Information of the leave request
|
||||
InfosWorkflowCP=Information Workflow
|
||||
RequestByCP=Requested by
|
||||
TitreRequestCP=Sheet of holidays
|
||||
NbUseDaysCP=Number of days of holidays consumed
|
||||
TitreRequestCP=Leave request
|
||||
NbUseDaysCP=Number of days of vacation consumed
|
||||
EditCP=Edit
|
||||
DeleteCP=Delete
|
||||
ActionValidCP=Validate
|
||||
@ -43,26 +43,26 @@ ActionRefuseCP=Refuse
|
||||
ActionCancelCP=Cancel
|
||||
StatutCP=Status
|
||||
SendToValidationCP=Send to validation
|
||||
TitleDeleteCP=Delete the request of holidays
|
||||
ConfirmDeleteCP=Confirm the deletion of this request for holidays?
|
||||
ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
|
||||
CantCreateCP=You don't have the right to apply for holidays.
|
||||
InvalidValidatorCP=You must choose an approbator to your holiday request.
|
||||
TitleDeleteCP=Delete the leave request
|
||||
ConfirmDeleteCP=Confirm the deletion of this leave request?
|
||||
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
|
||||
CantCreateCP=You don't have the right to make leave requests.
|
||||
InvalidValidatorCP=You must choose an approbator to your leave request.
|
||||
UpdateButtonCP=Update
|
||||
CantUpdate=You cannot update this request of holidays.
|
||||
CantUpdate=You cannot update this leave request.
|
||||
NoDateDebut=You must select a start date.
|
||||
NoDateFin=You must select an end date.
|
||||
ErrorDureeCP=Your request for holidays does not contain working day.
|
||||
TitleValidCP=Approve the request holidays
|
||||
ConfirmValidCP=Are you sure you want to approve the holiday request?
|
||||
ConfirmValidCP=Are you sure you want to approve the leave request?
|
||||
DateValidCP=Date approved
|
||||
TitleToValidCP=Send request holidays
|
||||
ConfirmToValidCP=Are you sure you want to send the request of holidays?
|
||||
TitleToValidCP=Send leave request
|
||||
ConfirmToValidCP=Are you sure you want to send the leave request?
|
||||
TitleRefuseCP=Refuse the request holidays
|
||||
ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
|
||||
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
|
||||
NoMotifRefuseCP=You must choose a reason for refusing the request.
|
||||
TitleCancelCP=Cancel the request holidays
|
||||
ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
|
||||
ConfirmCancelCP=Are you sure you want to cancel the leave request?
|
||||
DetailRefusCP=Reason for refusal
|
||||
DateRefusCP=Date of refusal
|
||||
DateCancelCP=Date of cancellation
|
||||
@ -72,8 +72,8 @@ MotifCP=Reason
|
||||
UserCP=User
|
||||
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
|
||||
AddEventToUserOkCP=The addition of the exceptional leave has been completed.
|
||||
MenuLogCP=View logs of holidays
|
||||
LogCP=Log of updates of holidays
|
||||
MenuLogCP=View logs of leave requests
|
||||
LogCP=Log of updates of available vacation days
|
||||
ActionByCP=Performed by
|
||||
UserUpdateCP=For the user
|
||||
PrevSoldeCP=Previous Balance
|
||||
@ -81,33 +81,33 @@ NewSoldeCP=New Balance
|
||||
alreadyCPexist=A request for holidays has already been done on this period.
|
||||
UserName=Name
|
||||
Employee=Employee
|
||||
FirstDayOfHoliday=First day of holiday
|
||||
LastDayOfHoliday=Last day of holiday
|
||||
FirstDayOfHoliday=First day of vacation
|
||||
LastDayOfHoliday=Last day of vacation
|
||||
HolidaysMonthlyUpdate=Monthly update
|
||||
ManualUpdate=Manual update
|
||||
HolidaysCancelation=Holidays cancelation
|
||||
HolidaysCancelation=Leave request cancelation
|
||||
|
||||
## Configuration du Module ##
|
||||
ConfCP=Configuration of holidays module
|
||||
DescOptionCP=Description of the option
|
||||
ValueOptionCP=Value
|
||||
GroupToValidateCP=Group with the ability to approve holidays
|
||||
GroupToValidateCP=Group with the ability to approve vacation
|
||||
ConfirmConfigCP=Validate the configuration
|
||||
LastUpdateCP=Last updated automatically of holidays
|
||||
LastUpdateCP=Last automatic update of vacation
|
||||
UpdateConfCPOK=Updated successfully.
|
||||
ErrorUpdateConfCP=An error occurred during the update, please try again.
|
||||
AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
|
||||
DelayForSubmitCP=Deadline to apply for holidays
|
||||
AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
|
||||
AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
|
||||
AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
|
||||
nbUserCP=Number of users supported in the module holidays
|
||||
nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
|
||||
nbHolidayEveryMonthCP=Number of holidays added every month
|
||||
Module27130Name= Management of holidays
|
||||
Module27130Desc= Management of holidays
|
||||
TitleOptionMainCP=Main settings of holidays
|
||||
TitleOptionEventCP=Settings of holidays related to events
|
||||
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
|
||||
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
|
||||
nbUserCP=Number of users supported in the module Leaves
|
||||
nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
|
||||
nbHolidayEveryMonthCP=Number of vacation days added every month
|
||||
Module27130Name= Management of leave requests
|
||||
Module27130Desc= Management of leave requests
|
||||
TitleOptionMainCP=Main settings of Leave request
|
||||
TitleOptionEventCP=Settings of leave requets for events
|
||||
ValidEventCP=Validate
|
||||
UpdateEventCP=Update events
|
||||
CreateEventCP=Create
|
||||
@ -127,23 +127,23 @@ UpdateEventOptionCP=Update
|
||||
ErrorMailNotSend=An error occurred while sending email:
|
||||
NoCPforMonth=No leave this month.
|
||||
nbJours=Number days
|
||||
TitleAdminCP=Configuration of Holidays
|
||||
TitleAdminCP=Configuration of Leaves
|
||||
#Messages
|
||||
Hello=Hello
|
||||
HolidaysToValidate=Validate holidays
|
||||
HolidaysToValidateBody=Below is a request for holidays to validate
|
||||
HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
|
||||
HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
|
||||
HolidaysValidated=Validated holidays
|
||||
HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
|
||||
HolidaysRefused=Denied holidays
|
||||
HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
|
||||
HolidaysCanceled=Canceled holidays
|
||||
HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
|
||||
Permission20000=Read you own holidays
|
||||
Permission20001=Create/modify your holidays
|
||||
Permission20002=Create/modify holidays for everybody
|
||||
Permission20003=Delete holidays requests
|
||||
Permission20004=Setup users holidays
|
||||
Permission20005=Review log of modified holidays
|
||||
Permission20006=Read holidays monthly report
|
||||
HolidaysToValidate=Validate leave requests
|
||||
HolidaysToValidateBody=Below is a leave request to validate
|
||||
HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
|
||||
HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
|
||||
HolidaysValidated=Validated leave requests
|
||||
HolidaysValidatedBody=Your leave request for %s to %s has been validated.
|
||||
HolidaysRefused=Request denied
|
||||
HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
|
||||
HolidaysCanceled=Canceled leaved request
|
||||
HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
|
||||
Permission20000=Read you own leave requests
|
||||
Permission20001=Create/modify your leave requests
|
||||
Permission20002=Create/modify leave requests for everybody
|
||||
Permission20003=Delete leave requests
|
||||
Permission20004=Setup users available vacation days
|
||||
Permission20005=Review log of modified leave requests
|
||||
Permission20006=Read leaves monthly report
|
||||
|
||||
Loading…
Reference in New Issue
Block a user