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

git push origin developMerge branch 'novalore-develop' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-18 03:38:00 +02:00
commit 904eeddf8d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/langs/en_US/trips.lang
View File

@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
TripsAndExpensesStatistics=Expense reports statistics
TripCard=Expense report card
AddTrip=Create expense report
ListOfTrips=List of expense report
ListOfTrips=List of expense reports
ListOfFees=List of fees
NewTrip=New expense report
CompanyVisited=Company/foundation visited
@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
TripSociete=Information company
TripSalarie=Informations user
TripNDF=Informations expense report
DeleteLine=Delete a ligne of the expense report
DeleteLine=Delete a line of the expense report
ConfirmDeleteLine=Are you sure you want to delete this line ?
PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
ExpenseReportLine=Expense report line
@ -40,7 +40,7 @@ TF_BUS=Bus
TF_CAR=Car
TF_PEAGE=Toll
TF_ESSENCE=Fuel
TF_HOTEL=Hostel
TF_HOTEL=Hotel
TF_TAXI=Taxi
ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
@ -56,12 +56,12 @@ ModePaiement=Payment mode
Note=Note
Project=Project
VALIDATOR=User to inform for approbation
VALIDATOR=User responsible for approval
VALIDOR=Approved by
AUTHOR=Recorded by
AUTHORPAIEMENT=Paied by
AUTHORPAIEMENT=Paid by
REFUSEUR=Denied by
CANCEL_USER=Canceled by
CANCEL_USER=Deleted by
MOTIF_REFUS=Reason
MOTIF_CANCEL=Reason
@ -74,7 +74,7 @@ DATE_PAIEMENT=Payment date
TO_PAID=Pay
BROUILLONNER=Reopen
SendToValid=Sent to approve
SendToValid=Sent on approval
ModifyInfoGen=Edit
ValidateAndSubmit=Validate and submit for approval
@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
CancelTrip=Cancel an expense report
ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
BrouillonnerTrip=Move back expense report to status "Draft"n
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

12
htdocs/langs/en_US/workflow.lang
View File

@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - admin
WorkflowSetup=Workflow module setup
WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interested in.
ThereIsNoWorkflowToModify=There is no workflow to modify for the activated module.
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated