From 1c7189ed4061710eef62f8b742de3276a6c74b26 Mon Sep 17 00:00:00 2001 From: torvista Date: Thu, 13 Dec 2018 22:24:45 +0100 Subject: [PATCH] supplier->vendor suppliers->vendors --- htdocs/langs/en_US/accountancy.lang | 12 +++---- htdocs/langs/en_US/bills.lang | 44 +++++++++++------------ htdocs/langs/en_US/categories.lang | 8 ++--- htdocs/langs/en_US/companies.lang | 55 +++++++++++++++-------------- htdocs/langs/en_US/main.lang | 18 +++++----- htdocs/langs/en_US/products.lang | 26 +++++++------- htdocs/langs/en_US/sendings.lang | 2 +- htdocs/langs/en_US/stripe.lang | 2 +- htdocs/langs/en_US/suppliers.lang | 42 +++++++++++----------- 9 files changed, 105 insertions(+), 104 deletions(-) diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index b4f52352434..c14b7bef0ca 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -44,7 +44,7 @@ CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s 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 vendors 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 @@ -95,7 +95,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 @@ -104,7 +104,7 @@ WriteBookKeeping=Journalize transactions in Ledger Bookkeeping=Ledger AccountBalance=Account balance ObjectsRef=Source object ref -CAHTF=Total purchase supplier before tax +CAHTF=Total purchase vendor before tax TotalExpenseReport=Total expense report InvoiceLines=Lines of invoices to bind InvoiceLinesDone=Bound lines of invoices @@ -194,7 +194,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 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 @@ -214,8 +214,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 suppliers and their accounting account +DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account +DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices 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 have 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/bills.lang b/htdocs/langs/en_US/bills.lang index 644a78507a4..f755aada646 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -3,14 +3,14 @@ Bill=Invoice Bills=Invoices BillsCustomers=Customer invoices BillsCustomer=Customer invoice -BillsSuppliers=Supplier invoices +BillsSuppliers=Vendor invoices BillsCustomersUnpaid=Unpaid customer invoices BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s -BillsSuppliersUnpaid=Unpaid supplier invoices -BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s +BillsSuppliersUnpaid=Unpaid vendor invoices +BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatisticsSuppliers=Vendors invoices statistics DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased @@ -53,9 +53,9 @@ InvoiceLine=Invoice line InvoiceCustomer=Customer invoice CustomerInvoice=Customer invoice CustomersInvoices=Customers invoices -SupplierInvoice=Supplier invoice -SuppliersInvoices=Suppliers invoices -SupplierBill=Supplier invoice +SupplierInvoice=Vendor invoice +SuppliersInvoices=Vendors invoices +SupplierBill=Vendor invoice SupplierBills=suppliers invoices Payment=Payment PaymentBack=Payment back @@ -67,11 +67,11 @@ PaidBack=Paid back DeletePayment=Delete payment ConfirmDeletePayment=Are you sure you want to delete this payment? ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. -ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier. -SupplierPayments=Suppliers payments +ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?
The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor. +SupplierPayments=Vendor payments ReceivedPayments=Received payments ReceivedCustomersPayments=Payments received from customers -PayedSuppliersPayments=Payments paid to suppliers +PayedSuppliersPayments=Payments paid to vendors ReceivedCustomersPaymentsToValid=Received customers payments to validate PaymentsReportsForYear=Payments reports for %s PaymentsReports=Payments reports @@ -104,7 +104,7 @@ AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice -SearchASupplierInvoice=Search for a supplier invoice +SearchASupplierInvoice=Search for a vendor invoice CancelBill=Cancel an invoice SendRemindByMail=Send reminder by EMail DoPayment=Enter payment @@ -163,15 +163,15 @@ NewBill=New invoice LastBills=Latest %s invoices LatestTemplateInvoices=Latest %s template invoices LatestCustomerTemplateInvoices=Latest %s customer template invoices -LatestSupplierTemplateInvoices=Latest %s supplier template invoices +LatestSupplierTemplateInvoices=Latest %s vendor template invoices LastCustomersBills=Latest %s customer invoices -LastSuppliersBills=Latest %s supplier invoices +LastSuppliersBills=Latest %s vendor invoices AllBills=All invoices AllCustomerTemplateInvoices=All template invoices OtherBills=Other invoices DraftBills=Draft invoices CustomersDraftInvoices=Customer draft invoices -SuppliersDraftInvoices=Supplier draft invoices +SuppliersDraftInvoices=Vendor draft invoices Unpaid=Unpaid ConfirmDeleteBill=Are you sure you want to delete this invoice? ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s? @@ -247,7 +247,7 @@ DateInvoice=Invoice date DatePointOfTax=Point of tax NoInvoice=No invoice ClassifyBill=Classify invoice -SupplierBillsToPay=Unpaid supplier invoices +SupplierBillsToPay=Unpaid vendor invoices CustomerBillsUnpaid=Unpaid customer invoices NonPercuRecuperable=Non-recoverable SetConditions=Set Payment Terms @@ -333,7 +333,7 @@ ConfirmRemoveDiscount=Are you sure you want to remove this discount? RelatedBill=Related invoice RelatedBills=Related invoices RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices +RelatedSupplierInvoices=Related vendor invoices LatestRelatedBill=Latest related invoice WarningBillExist=Warning, one or more invoices already exist MergingPDFTool=Merging PDF tool @@ -465,7 +465,7 @@ Cheques=Checks DepositId=Id deposit NbCheque=Number of checks CreditNoteConvertedIntoDiscount=This %s has been converted into %s -UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third party address as recipient for invoices +UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices ShowUnpaidAll=Show all unpaid invoices ShowUnpaidLateOnly=Show late unpaid invoices only PaymentInvoiceRef=Payment invoice %s @@ -488,7 +488,7 @@ ListOfYourUnpaidInvoices=List of unpaid invoices NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. RevenueStamp=Revenue stamp YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party -YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Supplier" of third party +YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template @@ -502,10 +502,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer i TypeContact_facture_external_BILLING=Customer invoice contact TypeContact_facture_external_SHIPPING=Customer shipping contact TypeContact_facture_external_SERVICE=Customer service contact -TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice -TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact -TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact -TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice +TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact +TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact +TypeContact_invoice_supplier_external_SERVICE=Vendor service contact # Situation invoices InvoiceFirstSituationAsk=First situation invoice InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index cef3eaa2815..897e05bfd30 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -10,7 +10,7 @@ modify=modify Classify=Classify CategoriesArea=Tags/Categories area ProductsCategoriesArea=Products/Services tags/categories area -SuppliersCategoriesArea=Suppliers tags/categories area +SuppliersCategoriesArea=Vendors tags/categories area CustomersCategoriesArea=Customers tags/categories area MembersCategoriesArea=Members tags/categories area ContactsCategoriesArea=Contacts tags/categories area @@ -32,7 +32,7 @@ WasAddedSuccessfully=%s was added successfully. ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category. ProductIsInCategories=Product/service is linked to following tags/categories CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories -CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories +CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories MemberIsInCategories=This member is linked to following members tags/categories ContactIsInCategories=This contact is linked to following contacts tags/categories ProductHasNoCategory=This product/service is not in any tags/categories @@ -48,11 +48,11 @@ ContentsNotVisibleByAllShort=Contents not visible by all DeleteCategory=Delete tag/category ConfirmDeleteCategory=Are you sure you want to delete this tag/category? NoCategoriesDefined=No tag/category defined -SuppliersCategoryShort=Suppliers tag/category +SuppliersCategoryShort=Vendors tag/category CustomersCategoryShort=Customers tag/category ProductsCategoryShort=Products tag/category MembersCategoryShort=Members tag/category -SuppliersCategoriesShort=Suppliers tags/categories +SuppliersCategoriesShort=Vendors tags/categories CustomersCategoriesShort=Customers tags/categories ProspectsCategoriesShort=Prospects tags/categories CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index effc78166ba..1510e350b90 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 @@ -80,8 +80,8 @@ VATIsUsed=Sales tax used VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers VATIsNotUsed=Sales tax is not used CopyAddressFromSoc=Copy address from Third-Party details -ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor supplier, no available referring objects -ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available +ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects +ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available PaymentBankAccount=Payment bank account OverAllProposals=Proposals OverAllOrders=Orders @@ -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=Barcode ##### Professional ID ##### ProfId1Short=Prof. id 1 @@ -267,27 +267,27 @@ 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%% CompanyHasNoRelativeDiscount=This customer has no relative discount by default -HasRelativeDiscountFromSupplier=You have a default discount of %s%% from this supplier -HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier +HasRelativeDiscountFromSupplier=You have a default discount of %s%% from this vendor +HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for %s %s CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for %s %s CompanyHasCreditNote=This customer still has credit notes for %s %s -HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier -HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for %s %s from this supplier -HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for %s %s from this supplier -HasCreditNoteFromSupplier=You have credit notes for %s %s from this supplier +HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor +HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for %s %s from this vendor +HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for %s %s from this vendor +HasCreditNoteFromSupplier=You have credit notes for %s %s from this vendor 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 (entered by all users) -SupplierAbsoluteDiscountMy=Absolute supplier discounts (entered by yourself) +SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users) +SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself) DiscountNone=None -Supplier=Supplier +Vendor=Vendor AddContact=Create contact AddContactAddress=Create contact/address EditContact=Edit 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 controlled by module ThisIsModuleRules=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 VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do @@ -394,9 +394,10 @@ ImportDataset_company_2=Third-Parties additional contacts/addresses and attribut ImportDataset_company_3=Third-Parties Bank accounts ImportDataset_company_4=Third-Parties Sales representatives (assign sales representatives/users to companies) PriceLevel=Price Level +PriceLevelLabels=Price Level Labels 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 +407,7 @@ FiscalYearInformation=Fiscal Year FiscalMonthStart=Starting month of the fiscal year YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification. 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/Contacts @@ -420,7 +421,7 @@ CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill OutstandingBillReached=Max. for outstanding bill reached OrderMinAmount=Minimum amount for order -MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. +MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the 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 +432,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=Customer or Supplier code already used, a new code is suggested +NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a9526616781..47cdb28693d 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -417,7 +417,7 @@ Favorite=Favorite ShortInfo=Info. Ref=Ref. ExternalRef=Ref. extern -RefSupplier=Ref. supplier +RefSupplier=Ref. vendor RefPayment=Ref. payment CommercialProposalsShort=Commercial proposals Comment=Comment @@ -612,9 +612,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 @@ -745,9 +745,9 @@ LinkToProposal=Link to proposal LinkToOrder=Link to order LinkToInvoice=Link to invoice LinkToTemplateInvoice=Link to template invoice -LinkToSupplierOrder=Link to supplier order -LinkToSupplierProposal=Link to supplier proposal -LinkToSupplierInvoice=Link to supplier invoice +LinkToSupplierOrder=Link to vendor order +LinkToSupplierProposal=Link to vendor proposal +LinkToSupplierInvoice=Link to vendor invoice LinkToContract=Link to contract LinkToIntervention=Link to intervention CreateDraft=Create draft @@ -875,7 +875,7 @@ Rights=Permissions LineNb=Line no. IncotermLabel=Incoterms TabLetteringCustomer=Customer lettering -TabLetteringSupplier=Supplier lettering +TabLetteringSupplier=Vendor lettering # Week day Monday=Monday Tuesday=Tuesday @@ -923,11 +923,11 @@ SearchIntoProductsOrServices=Products or services SearchIntoProjects=Projects SearchIntoTasks=Tasks SearchIntoCustomerInvoices=Customer invoices -SearchIntoSupplierInvoices=Supplier invoices +SearchIntoSupplierInvoices=Vendor invoices SearchIntoCustomerOrders=Customer orders SearchIntoSupplierOrders=Purchase orders SearchIntoCustomerProposals=Customer proposals -SearchIntoSupplierProposals=Supplier proposals +SearchIntoSupplierProposals=Vendor proposals SearchIntoInterventions=Interventions SearchIntoContracts=Contracts SearchIntoCustomerShipments=Customer shipments diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 9668e00499f..5c1242a4181 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -77,8 +77,8 @@ ErrorProductAlreadyExists=A product with reference %s already exists. ErrorProductBadRefOrLabel=Wrong value for reference or label. ErrorProductClone=There was a problem while trying to clone the product or service. ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price. -Suppliers=Suppliers -SupplierRef=Supplier SKU +Suppliers=Vendors +SupplierRef=Vendor SKU ShowProduct=Show product ShowService=Show service ProductsAndServicesArea=Product and Services area @@ -87,7 +87,7 @@ ServicesArea=Services area ListOfStockMovements=List of stock movements BuyingPrice=Buying price PriceForEachProduct=Products with specific prices -SupplierCard=Supplier card +SupplierCard=Vendor card PriceRemoved=Price removed BarCode=Barcode BarcodeType=Barcode type @@ -125,10 +125,10 @@ ProductSpecial=Special QtyMin=Min. purchase quantity PriceQtyMin=Equivalent/calculated price PriceQtyMinCurrency=Price (currency) for this qty. (no discount) -VATRateForSupplierProduct=VAT Rate (for this supplier/product) +VATRateForSupplierProduct=VAT Rate (for this vendor/product) DiscountQtyMin=Discount for this qty. -NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product -NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product +NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product +NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product PredefinedProductsToSell=Predefined Product PredefinedServicesToSell=Predefined Service PredefinedProductsAndServicesToSell=Predefined products/services to sell @@ -154,8 +154,8 @@ NewRefForClone=Ref. of new product/service SellingPrices=Selling prices BuyingPrices=Buying prices CustomerPrices=Customer prices -SuppliersPrices=Supplier prices -SuppliersPricesOfProductsOrServices=Supplier prices (of products or services) +SuppliersPrices=Vendor prices +SuppliersPricesOfProductsOrServices=Vendor prices (of products or services) CustomCode=Customs / Commodity / HS code CountryOrigin=Origin country Nature=Product Type (material/finished) @@ -243,8 +243,8 @@ PriceExpressionEditor=Price expression editor PriceExpressionSelected=Selected price expression PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# -PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# -PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In vendor prices only: #supplier_quantity# and #supplier_tva_tx# PriceExpressionEditorHelp5=Available global values: PriceMode=Price mode PriceNumeric=Number @@ -254,7 +254,7 @@ ComposedProduct=Child products MinSupplierPrice=Minimum buying price MinCustomerPrice=Minimum selling price DynamicPriceConfiguration=Dynamic price configuration -DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Supplier prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically. +DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically. AddVariable=Add Variable AddUpdater=Add Updater GlobalVariables=Global variables @@ -293,8 +293,8 @@ ProductSheet=Product sheet ServiceSheet=Service sheet PossibleValues=Possible values GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...) -UseProductFournDesc=Use supplier descriptions of products in supplier documents -ProductSupplierDescription=Supplier description for the product +UseProductFournDesc=Use vendor descriptions of products in vendor documents +ProductSupplierDescription=Vendor description for the product #Attributes VariantAttributes=Variant attributes ProductAttributes=Variant attributes for products diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index df91da74688..188533894e1 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -55,7 +55,7 @@ ShipmentLine=Shipment line ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent -ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open vendor order already received NoProductToShipFoundIntoStock=No product to ship found in warehouse %s. Correct stock or go back to choose another warehouse. WeightVolShort=Weight/Vol. ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments. diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 26f0e3ff03b..37dfe689463 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -27,7 +27,7 @@ AccountParameter=Account parameters UsageParameter=Usage parameters InformationToFindParameters=Help to find your %s account information STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment -VendorName=Name of supplier +VendorName=Name of vendor CSSUrlForPaymentForm=CSS style sheet url for payment form NewStripePaymentReceived=New Stripe payment received NewStripePaymentFailed=New Stripe payment tried but failed diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 91fe68b1cf1..b69b11272b4 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=Supplier invoice -ShowSupplierInvoice=Show Supplier Invoice -NewSupplier=New supplier +# Dolibarr language file - Source file is en_US - vendors +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,15 +14,15 @@ 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 -ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -NoRecordedSuppliers=No supplier recorded -SupplierPayment=Supplier payment -SuppliersArea=Supplier area -RefSupplierShort=Ref. supplier +SupplierPrices=Vendor prices +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s +NoRecordedSuppliers=No vendor recorded +SupplierPayment=Vendor payment +SuppliersArea=Vendor area +RefSupplierShort=Ref. vendor Availability=Availability -ExportDataset_fournisseur_1=Supplier invoices and invoice details -ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_1=Vendor invoices and invoice details +ExportDataset_fournisseur_2=Vendor invoices and payments ExportDataset_fournisseur_3=Purchase orders and order details ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s? @@ -30,18 +30,18 @@ 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 Purchase Order -AddSupplierInvoice=Create supplier invoice -ListOfSupplierProductForSupplier=List of products and prices for supplier %s -SentToSuppliers=Sent to suppliers +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 (days) DescNbDaysToDelivery=The longest delivery delay of the products from this order -SupplierReputation=Supplier reputation +SupplierReputation=Vendor reputation DoNotOrderThisProductToThisSupplier=Do not order NotTheGoodQualitySupplier=Low quality ReputationForThisProduct=Reputation BuyerName=Buyer name AllProductServicePrices=All product / service prices -AllProductReferencesOfSupplier=All product / service references of supplier -BuyingPriceNumShort=Supplier prices +AllProductReferencesOfSupplier=All product / service references of vendor +BuyingPriceNumShort=Vendor prices