Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2022-10-07 23:40:21 +02:00
commit a54edd118a
3 changed files with 287 additions and 126 deletions

View File

@ -14,28 +14,6 @@ OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to prev
AddedByAuthority=Stored into remote authority
NotAddedByAuthorityYet=Not yet stored into remote authority
ShowDetails=Show stored details
logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
logPAYMENT_ADD_TO_BANK=Payment added to bank
logPAYMENT_CUSTOMER_CREATE=Customer payment created
logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
logDONATION_PAYMENT_CREATE=Donation payment created
logDONATION_PAYMENT_DELETE=Donation payment logical deletion
logBILL_PAYED=Customer invoice paid
logBILL_UNPAYED=Customer invoice set unpaid
logBILL_VALIDATE=Customer invoice validated
logBILL_SENTBYMAIL=Customer invoice send by mail
logBILL_DELETE=Customer invoice logically deleted
logMODULE_RESET=Module BlockedLog was disabled
logMODULE_SET=Module BlockedLog was enabled
logDON_VALIDATE=Donation validated
logDON_MODIFY=Donation modified
logDON_DELETE=Donation logical deletion
logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
logCASHCONTROL_VALIDATE=Cash desk closing recording
BlockedLogBillDownload=Customer invoice download
BlockedLogBillPreview=Customer invoice preview
BlockedlogInfoDialog=Log Details
@ -54,4 +32,30 @@ TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please rest
RestrictYearToExport=Restrict month / year to export
BlockedLogEnabled=System to track events into unalterable logs has been enabled
BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
## logTypes
logBILL_DELETE=Customer invoice logically deleted
logBILL_PAYED=Customer invoice paid
logBILL_SENTBYMAIL=Customer invoice send by mail
logBILL_UNPAYED=Customer invoice set unpaid
logBILL_VALIDATE=Customer invoice validated
logCASHCONTROL_VALIDATE=Cash desk closing recording
logDOC_DOWNLOAD=Download of a validated document in order to print or send
logDOC_PREVIEW=Preview of a validated document in order to print or download
logDONATION_PAYMENT_CREATE=Donation payment created
logDONATION_PAYMENT_DELETE=Donation payment logical deletion
logDON_DELETE=Donation logical deletion
logDON_MODIFY=Donation modified
logDON_VALIDATE=Donation validated
logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
logMODULE_RESET=Module BlockedLog was disabled
logMODULE_SET=Module BlockedLog was enabled
logPAYMENT_ADD_TO_BANK=Payment added to bank
logPAYMENT_CUSTOMER_CREATE=Customer payment created
logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified

View File

@ -1,3 +1,160 @@
# Dolibarr language file - Source file is en_US - expensereports.lang
# copied from trips.lang
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
AddTrip=Create expense report
AllExpenseReport=All type of expense report
AllExpenseReports=All expense reports
AnyOtherInThisListCanValidate=Person to be informed for validating the request.
AttachTheNewLineToTheDocument=Attach the line to an uploaded document
AucuneLigne=There is no expense report declared yet
BrouillonnerTrip=Move back expense report to status "Draft"
byEX_DAY=by day (limitation to %s)
byEX_EXP=by line (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
CANCEL_USER=Deleted by
CarCategory=Vehicle category
ClassifyRefunded=Classify 'Refunded'
CompanyVisited=Company/organization visited
ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
ConfirmCancelTrip=Are you sure you want to cancel this expense report?
ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
ConfirmDeleteTrip=Are you sure you want to delete this expense report?
ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
ConfirmRefuseTrip=Are you sure you want to deny this expense report?
ConfirmSaveTrip=Are you sure you want to validate this expense report?
ConfirmValideTrip=Are you sure you want to approve this expense report?
DATE_CANCEL=Cancelation date
DATE_PAIEMENT=Payment date
DATE_REFUS=Deny date
DATE_SAVE=Validation date
DefaultCategoryCar=Default transportation mode
DefaultRangeNumber=Default range number
DeleteTrip=Delete expense report
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
ExpenseRangeOffset=Offset amount: %s
expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
expenseReportCoef=Coefficient
expenseReportCoefUndefined=(value not defined)
expenseReportOffset=Offset
expenseReportPrintExample=offset + (d x coef) = %s
expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
expenseReportRangeFromTo=from %d to %d
expenseReportRangeMoreThan=more than %d
expenseReportTotalForFive=Example with <u>d</u> = 5
ExpenseReportApplyTo=Apply to
ExpenseReportApproved=An expense report was approved
ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
ExpenseReportCanceled=An expense report was canceled
ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
ExpenseReportDateEnd=Date end
ExpenseReportDateStart=Date start
ExpenseReportDomain=Domain to apply
ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
ExpenseReportLimitAmount=Max amount
ExpenseReportLimitOn=Limit on
ExpenseReportLine=Expense report line
ExpenseReportPaid=An expense report was paid
ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
ExpenseReportPayment=Expense report payment
ExpenseReportRef=Ref. expense report
ExpenseReportRefused=An expense report was refused
ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
ExpenseReportRestrictive=Exceeding forbidden
ExpenseReportRuleErrorOnSave=Error: %s
ExpenseReportRuleSave=Expense report rule saved
ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportsIk=Configuration of mileage charges
ExpenseReportsRules=Expense report rules
ExpenseReportsToApprove=Expense reports to approve
ExpenseReportsToPay=Expense reports to pay
ExpensesArea=Expense reports area
FeesKilometersOrAmout=Amount or kilometers
LastExpenseReports=Latest %s expense reports
ListOfFees=List of fees
ListOfTrips=List of expense reports
ListToApprove=Waiting for approval
ListTripsAndExpenses=List of expense reports
MOTIF_CANCEL=Reason
MOTIF_REFUS=Reason
ModePaiement=Payment mode
NewTrip=New expense report
nolimitbyEX_DAY=by day (no limitation)
nolimitbyEX_EXP=by line (no limitation)
nolimitbyEX_MON=by month (no limitation)
nolimitbyEX_YEA=by year (no limitation)
NoTripsToExportCSV=No expense report to export for this period.
NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
OnExpense=Expense line
PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
PaidTrip=Pay an expense report
REFUSEUR=Denied by
RangeIk=Mileage range
RangeNum=Range %d
SaveTrip=Validate expense report
ShowExpenseReport=Show expense report
ShowTrip=Show expense report
TripCard=Expense report card
TripId=Id expense report
TripNDF=Informations expense report
TripSociete=Information company
Trips=Expense reports
TripsAndExpenses=Expenses reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now
VALIDATOR=User responsible for approval
VALIDOR=Approved by
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
ValideTrip=Approve expense report
## Dictionary
EX_BRE=Breakfast
EX_CAM=CV maintenance and repair
EX_CAM_VP=PV maintenance and repair
EX_CAR=Car rental
EX_CUR=Customers receiving
EX_DOC=Documentation
EX_EMM=Employees meal
EX_FUE=Fuel CV
EX_FUE_VP=Fuel PV
EX_GUM=Guests meal
EX_HOT=Hotel
EX_IND=Indemnity transportation subscription
EX_KME=Mileage costs
EX_OTR=Other receiving
EX_PAR=Parking CV
EX_PAR_VP=Parking PV
EX_POS=Postage
EX_SUM=Maintenance supply
EX_SUO=Office supplies
EX_TAX=Various Taxes
EX_TOL=Toll CV
EX_TOL_VP=Toll PV
TF_BUS=Bus
TF_CAR=Car
TF_ESSENCE=Fuel
TF_HOTEL=Hotel
TF_LUNCH=Lunch
TF_METRO=Metro
TF_OTHER=Other
TF_PEAGE=Toll
TF_TAXI=Taxi
TF_TRAIN=Train
TF_TRIP=Transportation
## add new (not from trips.lang)
ExpenseReportPayments=Expense report payments
#
# error

View File

@ -1,120 +1,120 @@
# Dolibarr language file - Source file is en_US - trips
ShowExpenseReport=Show expense report
Trips=Expense reports
TripsAndExpenses=Expenses reports
TripsAndExpensesStatistics=Expense reports statistics
TripCard=Expense report card
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
AddTrip=Create expense report
ListOfTrips=List of expense reports
ListOfFees=List of fees
TypeFees=Types of fees
ShowTrip=Show expense report
NewTrip=New expense report
LastExpenseReports=Latest %s expense reports
AllExpenseReport=All type of expense report
AllExpenseReports=All expense reports
CompanyVisited=Company/organization visited
FeesKilometersOrAmout=Amount or kilometers
DeleteTrip=Delete expense report
ConfirmDeleteTrip=Are you sure you want to delete this expense report?
ListTripsAndExpenses=List of expense reports
ListToApprove=Waiting for approval
ExpensesArea=Expense reports area
AnyOtherInThisListCanValidate=Person to be informed for validating the request.
AttachTheNewLineToTheDocument=Attach the line to an uploaded document
AucuneLigne=There is no expense report declared yet
BrouillonnerTrip=Move back expense report to status "Draft"
byEX_DAY=by day (limitation to %s)
byEX_EXP=by line (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
CANCEL_USER=Deleted by
CarCategory=Vehicle category
ClassifyRefunded=Classify 'Refunded'
CompanyVisited=Company/organization visited
ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
ConfirmCancelTrip=Are you sure you want to cancel this expense report?
ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
ConfirmDeleteTrip=Are you sure you want to delete this expense report?
ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
ConfirmRefuseTrip=Are you sure you want to deny this expense report?
ConfirmSaveTrip=Are you sure you want to validate this expense report?
ConfirmValideTrip=Are you sure you want to approve this expense report?
DATE_CANCEL=Cancelation date
DATE_PAIEMENT=Payment date
DATE_REFUS=Deny date
DATE_SAVE=Validation date
DefaultCategoryCar=Default transportation mode
DefaultRangeNumber=Default range number
DeleteTrip=Delete expense report
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
ExpenseRangeOffset=Offset amount: %s
expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
expenseReportCoef=Coefficient
expenseReportCoefUndefined=(value not defined)
expenseReportOffset=Offset
expenseReportPrintExample=offset + (d x coef) = %s
expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
expenseReportRangeFromTo=from %d to %d
expenseReportRangeMoreThan=more than %d
expenseReportTotalForFive=Example with <u>d</u> = 5
ExpenseReportApplyTo=Apply to
ExpenseReportApproved=An expense report was approved
ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
ExpenseReportCanceled=An expense report was canceled
ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
ExpenseReportDateEnd=Date end
ExpenseReportDateStart=Date start
ExpenseReportDomain=Domain to apply
ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
ExpenseReportLimitAmount=Max amount
ExpenseReportLimitOn=Limit on
ExpenseReportLine=Expense report line
ExpenseReportPaid=An expense report was paid
ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
ExpenseReportPayment=Expense report payment
ExpenseReportRef=Ref. expense report
ExpenseReportRefused=An expense report was refused
ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
ExpenseReportRestrictive=Exceeding forbidden
ExpenseReportRuleErrorOnSave=Error: %s
ExpenseReportRuleSave=Expense report rule saved
ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
ExpenseReportApproved=An expense report was approved
ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
ExpenseReportRefused=An expense report was refused
ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
ExpenseReportCanceled=An expense report was canceled
ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
ExpenseReportPaid=An expense report was paid
ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
TripId=Id expense report
AnyOtherInThisListCanValidate=Person to be informed for validating the request.
TripSociete=Information company
TripNDF=Informations expense report
PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
ExpenseReportLine=Expense report line
DefaultCategoryCar=Default transportation mode
DefaultRangeNumber=Default range number
UploadANewFileNow=Upload a new document now
Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
AucuneLigne=There is no expense report declared yet
ModePaiement=Payment mode
VALIDATOR=User responsible for approval
VALIDOR=Approved by
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
REFUSEUR=Denied by
CANCEL_USER=Deleted by
MOTIF_REFUS=Reason
MOTIF_CANCEL=Reason
DATE_REFUS=Deny date
DATE_SAVE=Validation date
DATE_CANCEL=Cancelation date
DATE_PAIEMENT=Payment date
ExpenseReportRef=Ref. expense report
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
ConfirmRefuseTrip=Are you sure you want to deny this expense report?
ValideTrip=Approve expense report
ConfirmValideTrip=Are you sure you want to approve this expense report?
PaidTrip=Pay an expense report
ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
ConfirmCancelTrip=Are you sure you want to cancel this expense report?
BrouillonnerTrip=Move back expense report to status "Draft"
ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report?
NoTripsToExportCSV=No expense report to export for this period.
ExpenseReportPayment=Expense report payment
ExpenseReportsToApprove=Expense reports to approve
ExpenseReportsToPay=Expense reports to pay
ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
ExpenseReportsIk=Configuration of mileage charges
ExpenseReportsRules=Expense report rules
ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
expenseReportOffset=Offset
expenseReportCoef=Coefficient
expenseReportTotalForFive=Example with <u>d</u> = 5
expenseReportRangeFromTo=from %d to %d
expenseReportRangeMoreThan=more than %d
expenseReportCoefUndefined=(value not defined)
expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
expenseReportPrintExample=offset + (d x coef) = %s
ExpenseReportApplyTo=Apply to
ExpenseReportDomain=Domain to apply
ExpenseReportLimitOn=Limit on
ExpenseReportDateStart=Date start
ExpenseReportDateEnd=Date end
ExpenseReportLimitAmount=Max amount
ExpenseReportRestrictive=Exceeding forbidden
AllExpenseReport=All type of expense report
OnExpense=Expense line
ExpenseReportRuleSave=Expense report rule saved
ExpenseReportRuleErrorOnSave=Error: %s
RangeNum=Range %d
ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
byEX_DAY=by day (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
byEX_EXP=by line (limitation to %s)
ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
ExpenseReportsToApprove=Expense reports to approve
ExpenseReportsToPay=Expense reports to pay
ExpensesArea=Expense reports area
FeesKilometersOrAmout=Amount or kilometers
LastExpenseReports=Latest %s expense reports
ListOfFees=List of fees
ListOfTrips=List of expense reports
ListToApprove=Waiting for approval
ListTripsAndExpenses=List of expense reports
MOTIF_CANCEL=Reason
MOTIF_REFUS=Reason
ModePaiement=Payment mode
NewTrip=New expense report
nolimitbyEX_DAY=by day (no limitation)
nolimitbyEX_EXP=by line (no limitation)
nolimitbyEX_MON=by month (no limitation)
nolimitbyEX_YEA=by year (no limitation)
nolimitbyEX_EXP=by line (no limitation)
CarCategory=Vehicle category
ExpenseRangeOffset=Offset amount: %s
NoTripsToExportCSV=No expense report to export for this period.
NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
OnExpense=Expense line
PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
PaidTrip=Pay an expense report
REFUSEUR=Denied by
RangeIk=Mileage range
AttachTheNewLineToTheDocument=Attach the line to an uploaded document
RangeNum=Range %d
SaveTrip=Validate expense report
ShowExpenseReport=Show expense report
ShowTrip=Show expense report
TripCard=Expense report card
TripId=Id expense report
TripNDF=Informations expense report
TripSociete=Information company
Trips=Expense reports
TripsAndExpenses=Expenses reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now
VALIDATOR=User responsible for approval
VALIDOR=Approved by
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
ValideTrip=Approve expense report
## Dictionary
EX_BRE=Breakfast