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

Fix trad and sql error

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-05 05:37:01 +02:00
parent 3b6c533b85
commit 968b021985
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -231,7 +231,7 @@ class Deplacement extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."deplacement"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
$sql.= " WHERE entity IN (".getEntity('deplacement').")"; $sql.= " WHERE entity IN (".getEntity('deplacement').")";
if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'"; 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); dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);

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

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