diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 83be8d8e423..f3acb7ac39c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -40,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
ListOfAccounts=List of accounts
MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for veo not defined in setup
MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -90,7 +90,7 @@ MenuProductsAccounts=Product accounts
ProductsBinding=Products accounts
Ventilation=Binding to accounts
CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
ExpenseReportsVentilation=Expense report binding
CreateMvts=Create new transaction
UpdateMvts=Modification of a transaction
@@ -186,7 +186,7 @@ ListeMvts=List of movements
ErrorDebitCredit=Debit and Credit cannot have a value at the same time
AddCompteFromBK=Add accounting accounts to the group
ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
ListAccounts=List of the accounting accounts
UnknownAccountForThirdparty=Unknown third party account. We will use %s
UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
@@ -205,8 +205,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vndor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "%s".
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b02d90207cf..0b192e96429 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -269,7 +269,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s)
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: %s)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
@@ -292,7 +292,7 @@ ModuleSetup=Module setup
ModulesSetup=Modules/Application setup
ModuleFamilyBase=System
ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (SRM)
ModuleFamilyProducts=Products Management (PM)
ModuleFamilyHr=Human Resource Management (HR)
ModuleFamilyProjects=Projects/Collaborative work
@@ -563,14 +563,14 @@ Module700Name=Donations
Module700Desc=Donation management
Module770Name=Expense reports
Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vndor commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1520Name=Document Generation
Module1520Desc=Mass mail document generation
Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
Module2000Name=WYSIWYG editor
Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
Module2200Name=Dynamic Prices
@@ -1191,11 +1191,11 @@ UserMailRequired=EMail required to create a new user
HRMSetup=HRM module setup
##### Company setup #####
CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
NotificationsDescGlobal=* or by setting global target emails in module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1235,15 +1235,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1633,8 +1633,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
SuppliersInvoiceNumberingModel=Supplier invoices numbering models
IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
@@ -1671,7 +1671,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
SalariesSetup=Setup of module salaries
SortOrder=Sort order
Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vndor payment type, 2:Both customers and vendors payment type
IncludePath=Include path (defined into variable %s)
ExpenseReportsSetup=Setup of module Expense Reports
TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1730,9 +1730,9 @@ MailToSendOrder=Customer orders
MailToSendInvoice=Customer invoices
MailToSendShipment=Shipments
MailToSendIntervention=Interventions
-MailToSendSupplierRequestForQuotation=Supplier quotations
-MailToSendSupplierOrder=Supplier orders
-MailToSendSupplierInvoice=Supplier invoices
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
MailToSendContract=Contracts
MailToThirdparty=Third parties
MailToMember=Members
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 8471cd22fe6..b4891579763 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -299,7 +299,7 @@ DiscountOfferedBy=Granted by
DiscountStillRemaining=Discounts or credits available
DiscountAlreadyCounted=Discounts or credits already consumed
CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
BillAddress=Bill address
HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 24f5bc100f6..9f2e16857de 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
ActionAC_EMAILING=Send mass email
ActionAC_COM=Send customer order by mail
ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
ActionAC_OTH=Other
ActionAC_OTH_AUTO=Automatically inserted events
ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3473667fe55..b3c458833d9 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
MenuNewThirdParty=New third party
MenuNewCustomer=New customer
MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
CreateThirdPartyOnly=Create third party
CreateThirdPartyAndContact=Create a third party + a child contact
ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
ThirdPartyCustomers=Customers
ThirdPartyCustomersStats=Customers
ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
ThirdPartyType=Third party type
Individual=Private individual
ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -80,7 +80,7 @@ VATIsUsed=Sales tax is used
VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
VATIsNotUsed=Sales tax is not used
CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor vendor, no available refering objects
ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
PaymentBankAccount=Payment bank account
OverAllProposals=Proposals
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
TypeLocaltax1ES=RE Type
TypeLocaltax2ES=IRPF Type
WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
Gencod=Bar code
##### Professional ID #####
ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
CustomerCard=Customer Card
Customer=Customer
CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
CustomerRelativeDiscountShort=Relative discount
CustomerAbsoluteDiscountShort=Absolute discount
CompanyHasRelativeDiscount=This customer has a default discount of %s%%
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for %s %s from this suppl
CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (granted by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (granted by yourself)
DiscountNone=None
Supplier=Supplier
AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
PersonalInformations=Personal data
AccountancyCode=Accounting account
CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
ValidityControledByModule=Validity controled by module
ThisIsModuleRules=This is rules for this module
ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
VATIntraCheck=Check
VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
PriceLevel=Price level
DeliveryAddress=Delivery address
AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
JuridicalStatus200=Independent
DeleteFile=Delete file
ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
FiscalMonthStart=Starting month of the fiscal year
YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
ListProspectsShort=List of prospects
ListCustomersShort=List of customers
ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
OutstandingBill=Max. for outstanding bill
OutstandingBillReached=Max. for outstanding bill reached
OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
ManagingDirectors=Manager(s) name (CEO, director, president...)
MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
SaleRepresentativeFirstname=First name of sales representative
SaleRepresentativeLastname=Last name of sales representative
ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 7f98b8797e8..1e457cedcd2 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -80,12 +80,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
NewPayment=New payment
Payments=Payments
PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
PaymentSocialContribution=Social/fiscal tax payment
PaymentVat=VAT payment
ListPayment=List of payments
ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
DateStartPeriod=Date start period
DateEndPeriod=Date end period
newLT1Payment=New tax 2 payment
@@ -110,7 +110,7 @@ ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
AccountNumber=Account number
@@ -171,6 +171,7 @@ LT1ReportByCustomersES=Report by third party RE
LT2ReportByCustomersES=Report by third party IRPF
VATReport=Sale tax report
VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
VATReportByThirdParties=Sale tax report by third parties
VATReportByCustomers=Sale tax report by customer
VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
@@ -224,7 +225,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
CloneTax=Clone a social/fiscal tax
ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 588044f18df..2352e704bde 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -39,8 +39,8 @@ ShowECMSection=Show directory
DeleteSection=Remove directory
ConfirmDeleteSection=Can you confirm you want to delete the directory %s?
ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
ECMFileManager=File manager
ECMSelectASection=Select a directory in the tree...
DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index efee041cbf4..4141df0c967 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
ErrorBarCodeAlreadyUsed=Bar code already used
ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for endor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
ErrorBadParameters=Bad parameters
ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
ErrorBadMask=Error on mask
ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
ErrorSavingChanges=An error has ocurred when saving the changes
ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 27a2edd1fda..fe96d7c0f97 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -146,7 +146,7 @@ NothingToDo=Nothing to do
# upgrade
MigrationFixData=Fix for denormalized data
MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
MigrationProposal=Data migration for commercial proposals
MigrationInvoice=Data migration for customer's invoices
MigrationContract=Data migration for contracts
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1d29afa1fa5..3a93cd836c6 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -231,7 +231,7 @@ Limit=Limit
Limits=Limits
Logout=Logout
NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s
-Connection=Connection
+Connection=Login
Setup=Setup
Alert=Alert
MenuWarnings=Alerts
@@ -414,7 +414,7 @@ Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
RefPayment=Ref. payment
CommercialProposalsShort=Commercial proposals
Comment=Comment
@@ -619,9 +619,9 @@ BuildDoc=Build Doc
Entity=Environment
Entities=Entities
CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
RefCustomer=Ref. customer
Currency=Currency
InfoAdmin=Information for administrators
@@ -679,7 +679,7 @@ Color=Color
Documents=Linked files
Documents2=Documents
UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
MenuECM=Documents
MenuAWStats=AWStats
MenuMembers=Members
@@ -915,11 +915,11 @@ SearchIntoProductsOrServices=Products or services
SearchIntoProjects=Projects
SearchIntoTasks=Tasks
SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Vendor orders
SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
SearchIntoInterventions=Interventions
SearchIntoContracts=Contracts
SearchIntoCustomerShipments=Customer shipments
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
MargeType2=Margin on Weighted Average Price (WAP)
MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
CostPrice=Cost price
UnitCharges=Unit charges
Charges=Charges
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 8ab5b85b7e6..9942a081e57 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - orders
OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
OrderCard=Order card
OrderId=Order Id
Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
NewOrder=New order
ToOrder=Make order
MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
CustomersOrdersRunning=Current customer orders
CustomersOrdersAndOrdersLines=Customer orders and order lines
OrdersDeliveredToBill=Customer orders delivered to bill
OrdersToBill=Customer orders delivered
OrdersInProcess=Customer orders in process
OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
OrdersOpened=Orders to process
NoDraftOrders=No draft orders
NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
LastOrders=Latest %s customer orders
LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
LastModifiedOrders=Latest %s modified orders
AllOrders=All orders
NbOfOrders=Number of orders
OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
NumberOfOrdersByMonth=Number of orders by month
AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s%s?
DispatchSupplierOrder=Receiving supplier order %s
FirstApprovalAlreadyDone=First approval already done
SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Vendor order %s set billed
OtherOrders=Other orders
##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
TypeContact_commande_external_BILLING=Customer invoice contact
TypeContact_commande_external_SHIPPING=Customer shipping contact
TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up vendor order
TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -1,22 +1,22 @@
# Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
SupplierProposalNew=New price request
CommRequest=Price request
CommRequests=Price requests
SearchRequest=Find a request
DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
LastModifiedRequests=Latest %s modified price requests
RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
NewAskPrice=New price request
ShowSupplierProposal=Show price request
AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+SupplierProposalRefFourn=Vendor ref
SupplierProposalDate=Delivery date
SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
ConfirmValidateAsk=Are you sure you want to validate this price request under name %s?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
DefaultModelSupplierProposalCreate=Default model creation
DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
LastSupplierProposals=Latest %s price requests
AllPriceRequests=All requests
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
OrderDate=Order date
BuyingPriceMin=Best buying price
BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
SomeSubProductHaveNoPrices=Some sub-products have no price defined
AddSupplierPrice=Add buying price
ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s?
DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier %s
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor %s
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
NbDaysToDelivery=Delivery delay in days
DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
DoNotOrderThisProductToThisSupplier=Do not order
NotTheGoodQualitySupplier=Wrong quality
ReputationForThisProduct=Reputation
BuyerName=Buyer name
AllProductServicePrices=All product / service prices
AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index eba04cc44d1..c8724c5f5b2 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source vendor order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
AutomaticCreation=Automatic creation
AutomaticClassification=Automatic classification
\ No newline at end of file