diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 6478bcee276..eb8c8069ed7 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -877,45 +877,48 @@ if (!empty($id) && $action != 'edit') { // Actions buttons print '
'; - - // Re-open - if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED) { - print ''.$langs->trans("ReOpen").''; - } - - print '
id.'">'.$langs->trans('Modify').'
'; - - if ($object->statut == $object::STATUS_DRAFT) { - print '
'.$langs->trans("ValidPromess").'
'; - } - - if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0) { - print '
'.$langs->trans("ClassifyCanceled")."
"; - } - - // Create payment - if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->hasRight('don', 'creer')) { - if ($remaintopay == 0) { - print '
'.$langs->trans('DoPayment').'
'; - } else { - print '
'.$langs->trans('DoPayment').'
'; + $parameters = array(); + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); + if (empty($reshook)) { + // Re-open + if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED) { + print ''.$langs->trans("ReOpen").''; } - } - // Classify 'paid' - if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->hasRight('don', 'creer')) { - print '
'.$langs->trans("ClassifyPaid")."
"; - } + print '
id.'">'.$langs->trans('Modify').'
'; - // Delete - if ($user->hasRight('don', 'supprimer')) { - if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT) { - print '
'.$langs->trans("Delete")."
"; - } else { - print '
'.$langs->trans("Delete")."
"; + if ($object->statut == $object::STATUS_DRAFT) { + print '
'.$langs->trans("ValidPromess").'
'; + } + + if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0) { + print '
'.$langs->trans("ClassifyCanceled")."
"; + } + + // Create payment + if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->hasRight('don', 'creer')) { + if ($remaintopay == 0) { + print '
'.$langs->trans('DoPayment').'
'; + } else { + print '
'.$langs->trans('DoPayment').'
'; + } + } + + // Classify 'paid' + if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->hasRight('don', 'creer')) { + print '
'.$langs->trans("ClassifyPaid")."
"; + } + + // Delete + if ($user->hasRight('don', 'supprimer')) { + if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT) { + print '
'.$langs->trans("Delete")."
"; + } else { + print '
'.$langs->trans("Delete")."
"; + } + } else { + print '
'.$langs->trans("Delete")."
"; } - } else { - print '
'.$langs->trans("Delete")."
"; } print "
"; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index f8aabd7773e..2aeec52f8f1 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -38,7 +38,7 @@ DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization AlreadyInGeneralLedger=Already transferred to accounting journals and ledger -NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger +NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account DetailBy=Detail by @@ -68,7 +68,7 @@ UserAccountNotDefined=Accounting account for user not defined in setup 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 automaticaly the correct default accounting account when transferring data in accounting +AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies... AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s @@ -288,7 +288,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account: Vide=- -DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible) +DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible) 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 @@ -350,14 +350,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "%s" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy. -EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management. +EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management. ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting -ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user +ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3) ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three. OptionsAdvanced=Advanced options ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases -ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page. +ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page. ## Export NotExportLettering=Do not export the lettering when generating the file diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 3844ee142c0..8bfbff04e03 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -463,7 +463,7 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')

for example:
1,value1
2,value2
code3,value3
...

In order to have the list depending on another complementary attribute list:
1,value1|options_parent_list_code:parent_key
2,value2|options_parent_list_code:parent_key

In order to have the list depending on another list:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')

for example:
1,value1
2,value2
3,value3
... ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')

for example:
1,value1
2,value2
3,value3
... -ExtrafieldParamHelpsellist=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql

- id_field is necessarly a primary int key
- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value
You can also use $ID$ in filter which is the current id of current object
To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter

In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpsellist=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql

- id_field is necessarily a primary int key
- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value
You can also use $ID$ in filter which is the current id of current object
To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter

In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter ExtrafieldParamHelpchkbxlst=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql

filter can be a simple test (eg active=1) to display only active value
You can also use $ID$ in filter witch is the current id of current object
To do a SELECT in filter use $SEL$
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter

In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath
Syntax: ObjectName:Classpath ExtrafieldParamHelpSeparator=Keep empty for a simple separator
Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)
Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session) @@ -474,7 +474,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl RefreshPhoneLink=Refresh link LinkToTest=Clickable link generated for user %s (click phone number to test) KeepEmptyToUseDefault=Keep empty to use default value -KeepThisEmptyInMostCases=In most cases, you can keep this field empy. +KeepThisEmptyInMostCases=In most cases, you can keep this field empty. DefaultLink=Default link SetAsDefault=Set as default ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) @@ -519,7 +519,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here. PageUrlForDefaultValuesCreate=
Example:
For the form to create a new third party, it is %s.
For URL of external modules installed into custom directory, do not include the "custom/", so use path like mymodule/mypage.php and not custom/mymodule/mypage.php.
If you want default value only if url has some parameter, you can use %s PageUrlForDefaultValuesList=
Example:
For the page that lists third parties, it is %s.
For URL of external modules installed into custom directory, do not include the "custom/" so use a path like mymodule/mypagelist.php and not custom/mymodule/mypagelist.php.
If you want default value only if url has some parameter, you can use %s -AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...) +AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwriting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...) EnableDefaultValues=Enable customization of default values EnableOverwriteTranslation=Allow customization of translations GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation. @@ -542,7 +542,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required) DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account). DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required) -DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it. +DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adequate permissions to access it. ##### Modules ##### Module0Name=Users & Groups Module0Desc=Users / Employees and Groups management @@ -567,7 +567,7 @@ Module40Desc=Vendors and purchase management (purchase orders and billing of sup Module42Name=Debug Logs Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. Module43Name=Debug Bar -Module43Desc=A tool for developper adding a debug bar in your browser. +Module43Desc=A tool for developer adding a debug bar in your browser. Module49Name=Editors Module49Desc=Editor management Module50Name=Products @@ -1003,7 +1003,7 @@ Permission4031=Read personal information Permission4032=Write personal information Permission4033=Read all evaluations (even those of user not subordinates) Permission10001=Read website content -Permission10002=Create/modify website content (html and javascript content) +Permission10002=Create/modify website content (html and JavaScript content) Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers. Permission10005=Delete website content Permission20001=Read leave requests (your leave and those of your subordinates) @@ -1117,7 +1117,7 @@ BackToModuleList=Back to Module list BackToDictionaryList=Back to Dictionaries list TypeOfRevenueStamp=Type of tax stamp VATManagement=Sales Tax Management -VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:
If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.
If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.
If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.
If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.
If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.
In any other case the proposed default is Sales tax=0. End of rule. +VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:
If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.
If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.
If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.
If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.
If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.
In any other case the proposed default is Sales tax=0. End of rule. VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies. VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration. This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices. @@ -1407,7 +1407,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. into combo lists.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddVatInList=Display Customer/Vendor VAT number into combo lists. -AddAdressInList=Display Customer/Vendor adress into combo lists.
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddAdressInList=Display Customer/Vendor address into combo lists.
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s @@ -1655,7 +1655,7 @@ LDAPFieldGroupidExample=Example : gidnumber LDAPFieldUserid=User id LDAPFieldUseridExample=Example : uidnumber LDAPFieldHomedirectory=Home directory -LDAPFieldHomedirectoryExample=Exemple : homedirectory +LDAPFieldHomedirectoryExample=Example : homedirectory LDAPFieldHomedirectoryprefix=Home directory prefix LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. @@ -1677,7 +1677,7 @@ MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. OPCodeCache=OPCode cache NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad). -HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +HTTPCacheStaticResources=HTTP cache for static resources (css, img, JavaScript) FilesOfTypeCached=Files of type %s are cached by HTTP server FilesOfTypeNotCached=Files of type %s are not cached by HTTP server FilesOfTypeCompressed=Files of type %s are compressed by HTTP server @@ -2091,7 +2091,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total pr MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame -MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame +MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions @@ -2127,7 +2127,7 @@ EMailHost=Host of email IMAP server EMailHostPort=Port of email IMAP server loginPassword=Login/Password oauthToken=OAuth2 token -accessType=Acces type +accessType=Access type oauthService=Oauth service TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail). ImapEncryption = IMAP encryption method @@ -2149,13 +2149,13 @@ EmailCollectorHideMailHeaders=Do not include the content of email header into th EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event. EmailCollectorConfirmCollectTitle=Email collect confirmation EmailCollectorConfirmCollect=Do you want to run this collector now? -EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr). +EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email information. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr). EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only) EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP. EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr' -EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.
Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1. +EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.
Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1. EmailCollectorExampleToCollectLeads=Example collecting leads EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email. EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail @@ -2200,7 +2200,7 @@ ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user fr DefaultCustomerType=Default third-party type for "New customer" creation form ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working. RootCategoryForProductsToSell=Root category of products to sell -RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale +RootCategoryForProductsToSellDesc=If defined, only products inside this category or children of this category will be available in the Point Of Sale DebugBar=Debug Bar DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging DebugBarSetup=DebugBar Setup @@ -2221,7 +2221,7 @@ ImportSetup=Setup of module Import InstanceUniqueID=Unique ID of the instance SmallerThan=Smaller than LargerThan=Larger than -IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object. +IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email already collected and linked to an object, the created event will be automatically linked to the known related object. WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommended to create a dedicated second password for the application instead of using your own account password from https://myaccount.google.com/. EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account. EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.
For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:
'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'
@@ -2246,7 +2246,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias ALIAS_THIRDPARTY=Third-party alias - Third-party name PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages) PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF. -PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF +PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book. RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard JumpToBoxes=Jump to Setup -> Widgets @@ -2263,16 +2263,16 @@ YouMayFindSecurityAdviceHere=You may find security advisory here ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it. ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment. CombinationsSeparator=Separator character for product combinations -SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples +SeeLinkToOnlineDocumentation=See link to online documentation on top menu for examples SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module %s is used, show details of subproducts of a kit on PDF. AskThisIDToYourBank=Contact your bank to get this ID -AdvancedModeOnly=Permision available in Advanced permission mode only +AdvancedModeOnly=Permission available in Advanced permission mode only ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only. MailToSendEventOrganization=Event Organization MailToPartnership=Partnership AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form YouShouldDisablePHPFunctions=You should disable PHP functions -IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions +IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you should disable PHP functions PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good) RecommendedValueIs=Recommended: %s @@ -2369,7 +2369,7 @@ CIDLookupURL=The module brings an URL that can be used by an external tool to ge OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module -MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method +MAIN_MAIL_SMTPS_AUTH_TYPE=Authentication method UsePassword=Use a password UseOauth=Use a OAUTH token Images=Images diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index b4616cf602b..c0d9a1dd9d0 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -217,7 +217,7 @@ ConfirmCustomerPayment=Do you confirm this payment input for %s %s? ConfirmSupplierPayment=Do you confirm this payment input for %s %s? ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated. ValidateBill=Validate invoice -UnvalidateBill=Unvalidate invoice +UnvalidateBill=Invalidate invoice NumberOfBills=No. of invoices NumberOfBillsByMonth=No. of invoices per month AmountOfBills=Amount of invoices @@ -561,10 +561,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template) PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices -TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0 -MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0 +TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0 +MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. -CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0 +CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0 EarlyClosingReason=Early closing reason EarlyClosingComment=Early closing note ##### Types de contacts ##### diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index 3fb18394c7e..63f97d523c1 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -22,7 +22,7 @@ Fingerprint=Fingerprint DownloadLogCSV=Export archived logs (CSV) logDOC_PREVIEW=Preview of a validated document in order to print or download logDOC_DOWNLOAD=Download of a validated document in order to print or send -DataOfArchivedEvent=Full datas of archived event +DataOfArchivedEvent=Full data of archived event ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data) BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit. diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 762ce5ee189..056161ef77c 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -115,7 +115,7 @@ BoxLastCustomerShipments=Last customer shipments BoxTitleLastCustomerShipments=Latest %s customer shipments BoxTitleLastLeaveRequests=Latest %s modified leave requests NoRecordedShipments=No recorded customer shipment -BoxCustomersOutstandingBillReached=Customers with oustanding limit reached +BoxCustomersOutstandingBillReached=Customers with outstanding limit reached # Pages UsersHome=Home users and groups MembersHome=Home Membership diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index f9d444bb9ec..06b5566e9b3 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -48,7 +48,7 @@ Receipt=Receipt Header=Header Footer=Footer AmountAtEndOfPeriod=Amount at end of period (day, month or year) -TheoricalAmount=Theorical amount +TheoricalAmount=Theoretical amount RealAmount=Real amount CashFence=Cash box closing CashFenceDone=Cash box closing done for the period @@ -57,7 +57,7 @@ Paymentnumpad=Type of Pad to enter payment Numberspad=Numbers Pad BillsCoinsPad=Coins and banknotes Pad DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr -TakeposNeedsCategories=TakePOS needs at least one product categorie to work +TakeposNeedsCategories=TakePOS needs at least one product category to work TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category %s to work OrderNotes=Can add some notes to each ordered items CashDeskBankAccountFor=Default account to use for payments in @@ -92,7 +92,7 @@ HeadBar=Head Bar SortProductField=Field for sorting products Browser=Browser BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser. -TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud. +TakeposConnectorMethodDescription=External module with extra features. Possibility to print from the cloud. PrintMethod=Print method ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network). ByTerminal=By terminal diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b57123ee7c3..3a6359db9cc 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -255,7 +255,7 @@ ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) -ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId3MX=Prof Id 3 (Professional Charter) ProfId4MX=- ProfId5MX=- ProfId6MX=- @@ -485,7 +485,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 in 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 sequencial auto-incrementing number with no break and no return to 0. +MonkeyNumRefModelDesc=Return a number in 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 sequential auto-incrementing number 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) @@ -510,7 +510,7 @@ InEEC=Europe (EEC) RestOfEurope=Rest of Europe (EEC) OutOfEurope=Out of Europe (EEC) CurrentOutstandingBillLate=Current outstanding bill late -BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change the third party before adding product to POS. +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be careful, depending on your product price settings, you should change the third party before adding product to POS. EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request CompanySection=Company section @@ -519,4 +519,4 @@ HideSocialNetworks=Hide social networks ExternalSystemID=External system ID IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...) AADEWebserviceCredentials=AADE Webservice Credentials -ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank on Stripe side \ No newline at end of file +ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank on Stripe side diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 557364d0ae1..62cd3bca571 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefine AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode %sIncomes-Expenses%s said cash accounting. SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation based on recorded payments made even if they are not yet accounted in Ledger SeeReportInDueDebtMode=See %sanalysis of recorded documents%s for a calculation based on known recorded documents even if they are not yet accounted in Ledger -SeeReportInBookkeepingMode=See %sanalysis of bookeeping ledger table%s for a report based on Bookkeeping Ledger table +SeeReportInBookkeepingMode=See %sanalysis of bookkeeping ledger table%s for a report based on Bookkeeping Ledger table RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.
- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used. diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 6b83094fabe..af909337ce7 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -78,7 +78,7 @@ CloseAllContracts=Close all contract lines DeleteContractLine=Delete a contract line ConfirmDeleteContractLine=Are you sure you want to delete this contract line? MoveToAnotherContract=Move service into another contract. -ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. +ConfirmMoveToAnotherContract=I chose a new target contract and confirm I want to move this service into this contract. ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to? PaymentRenewContractId=Renew contract %s (service %s) ExpiredSince=Expiration date diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index ccaa67bddf8..3d478f8edf1 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -67,7 +67,7 @@ CronModuleHelp=Name of Dolibarr module directory (also work with external Doliba CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
For example to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
product/class/product.class.php CronObjectHelp=The object name to load.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
Product CronMethodHelp=The object method to launch.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
fetch -CronArgsHelp=The method arguments.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
0, ProductRef +CronArgsHelp=The method arguments.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for parameters can be
0, ProductRef CronCommandHelp=The system command line to execute. CronCreateJob=Create new Scheduled Job CronFrom=From diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index bbd536679fe..4cd89a76348 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -158,7 +158,7 @@ CountryMX=Mexico CountryFM=Micronesia CountryMD=Moldova CountryMN=Mongolia -CountryMS=Monserrat +CountryMS=Montserrat CountryMZ=Mozambique CountryMM=Myanmar (Burma) CountryNA=Namibia @@ -233,7 +233,7 @@ CountryUY=Uruguay CountryUZ=Uzbekistan CountryVU=Vanuatu CountryVE=Venezuela -CountryVN=Viet Nam +CountryVN=Vietnam CountryVG=Virgin Islands, British CountryVI=Virgin Islands, U.S. CountryWF=Wallis and Futuna diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 941977b3e40..4615a41ae88 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -19,7 +19,7 @@ ECMArea=DMS/ECM area ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. ECMAreaDesc2a=* Manual directories can be used to save documents with a free organization of the tree structure. ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element. -ECMAreaDesc3=* Public directories are files into the subdirectory /medias of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example. +ECMAreaDesc3=* Public directories are files into the subdirectory /medias of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example. ECMSectionWasRemoved=Directory %s has been deleted. ECMSectionWasCreated=Directory %s has been created. ECMSearchByKeywords=Search by keywords diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 3e045113b44..61d131e1bc4 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -58,7 +58,7 @@ ErrorSubjectIsRequired=The email subject is required ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). ErrorNoMailDefinedForThisUser=No mail defined for this user ErrorSetupOfEmailsNotComplete=Setup of emails is not complete -ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. +ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display. ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) @@ -69,7 +69,7 @@ ErrorDirNotWritable=Directory %s is not writable. ErrorFileAlreadyExists=A file with this name already exists. ErrorDestinationAlreadyExists=Another file with the name %s already exists. ErrorPartialFile=File not received completely by server. -ErrorNoTmpDir=Temporary directy %s does not exists. +ErrorNoTmpDir=Temporary directory %s does not exists. ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. ErrorFileSizeTooLarge=File size is too large or file not provided. ErrorFieldTooLong=Field %s is too long. @@ -92,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name wh ErrorRecordHasChildren=Failed to delete record since it has some child records. ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object. -ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. +ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display. ErrorPasswordsMustMatch=Both typed passwords must match each other -ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s and provide the error code %s in your message, or add a screen copy of this page. +ErrorContactEMail=A technical error occurred. Please, contact administrator to following email %s and provide the error code %s in your message, or add a screen copy of this page. ErrorWrongValueForField=Field %s: '%s' does not match regex rule %s ErrorHtmlInjectionForField=Field %s: The value '%s' contains a malicious data not allowed ErrorFieldValueNotIn=Field %s: '%s' is not a value found in field %s of %s @@ -106,7 +106,7 @@ ErrorNumRefModel=A reference exists into database (%s) and is not compatible wit ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities ErrorOrderStatusCantBeSetToDelivered=Order status can't be set to delivered. -ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete. +ErrorModuleSetupNotComplete=Setup of module %s looks to be incomplete. Go on Home - Setup - Modules to complete. ErrorBadMask=Error on mask ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number ErrorBadMaskBadRazMonth=Error, bad reset value @@ -169,7 +169,7 @@ ErrorPriceExpression4=Illegal character '%s' ErrorPriceExpression5=Unexpected '%s' ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) ErrorPriceExpression8=Unexpected operator '%s' -ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression9=An unexpected error occurred ErrorPriceExpression10=Operator '%s' lacks operand ErrorPriceExpression11=Expecting '%s' ErrorPriceExpression14=Division by zero diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang index 2487fa2a4e0..71e1a200583 100644 --- a/htdocs/langs/en_US/eventorganization.lang +++ b/htdocs/langs/en_US/eventorganization.lang @@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Price to pay to register or participate in the event PriceOfBooth=Subscription price to stand a booth PriceOfBoothHelp=Subscription price to stand a booth EventOrganizationICSLink=Link ICS for conferences -ConferenceOrBoothInformation=Conference Or Booth informations +ConferenceOrBoothInformation=Conference Or Booth information Attendees=Attendees ListOfAttendeesOfEvent=List of attendees of the event project DownloadICSLink = Download ICS link @@ -166,8 +166,8 @@ RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were alre EmailAttendee=Attendee email EmailCompany=Company email EmailCompanyForInvoice=Company email (for invoice, if different of attendee email) -ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation -ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation +ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation +ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event MaxNbOfAttendees=Max number of attendees DateStartEvent=Event start date diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang index fb47274323f..ae7932e6bb2 100644 --- a/htdocs/langs/en_US/expensereports.lang +++ b/htdocs/langs/en_US/expensereports.lang @@ -26,7 +26,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to 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_CANCEL=Cancellation date DATE_PAIEMENT=Payment date DATE_REFUS=Deny date DATE_SAVE=Validation date @@ -41,7 +41,7 @@ expenseReportCoef=Coefficient expenseReportCoefUndefined=(value not defined) expenseReportOffset=Offset expenseReportPrintExample=offset + (d x coef) = %s -expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay +expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary expenseReportRangeFromTo=from %d to %d expenseReportRangeMoreThan=more than %d expenseReportTotalForFive=Example with d = 5 @@ -105,7 +105,7 @@ ShowExpenseReport=Show expense report ShowTrip=Show expense report TripCard=Expense report card TripId=Id expense report -TripNDF=Informations expense report +TripNDF=Information expense report TripSociete=Information company Trips=Expense reports TripsAndExpenses=Expense reports @@ -164,4 +164,4 @@ TaxUndefinedForThisCategory = Taxe undefined for this category ErrorRecordNotFound=Record not found errorComputeTtcOnMileageExpense=Error on computing mileage expense ErrorBadValueForParameter=Error bad value for parameter %s -ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action \ No newline at end of file +ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index eb0c03fd56f..af4c6f31b24 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -27,8 +27,8 @@ FieldTitle=Field title NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file... AvailableFormats=Available Formats LibraryShort=Library -ExportCsvSeparator=Csv caracter separator -ImportCsvSeparator=Csv caracter separator +ExportCsvSeparator=Csv character separator +ImportCsvSeparator=Csv character separator Step=Step FormatedImport=Import Assistant FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant. @@ -144,4 +144,4 @@ NotUsedFields=Fields of database not used SelectImportFieldsSource = Choose the source file fields you want to import and their target field in database by choosing the fields in each select boxes, or select a predefined import profile: MandatoryTargetFieldsNotMapped=Some mandatory target fields are not mapped AllTargetMandatoryFieldsAreMapped=All target fields that need a mandatory value are mapped -ResultOfSimulationNoError=Result of simulation: No error \ No newline at end of file +ResultOfSimulationNoError=Result of simulation: No error diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index f8c61f327e2..15491a2f347 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -102,7 +102,7 @@ FirstDayOfHoliday=Beginning day of leave request LastDayOfHoliday=Ending day of leave request HolidaysMonthlyUpdate=Monthly update ManualUpdate=Manual update -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Leave request cancellation EmployeeLastname=Employee last name EmployeeFirstname=Employee first name TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed @@ -144,7 +144,7 @@ WatermarkOnDraftHolidayCards=Watermarks on draft leave requests HolidaysToApprove=Holidays to approve NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests HolidayBalanceMonthlyUpdate=Monthly update of leave balance -XIsAUsualNonWorkingDay=%s is usualy a NON working day +XIsAUsualNonWorkingDay=%s is usually a NON working day BlockHolidayIfNegative=Block if balance negative LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 3bbb0e455d5..4062dd8c7c9 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -23,7 +23,7 @@ AddLoan=Create loan FinancialCommitment=Financial commitment InterestAmount=Interest CapitalRemain=Capital remain -TermPaidAllreadyPaid = This term is allready paid +TermPaidAllreadyPaid = This term is already paid CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule # Admin diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 2e60d8549aa..3089eef2ae0 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -182,5 +182,5 @@ WarningLimitSendByDay=WARNING: The setup or contract of your instance limits you NoMoreRecipientToSendTo=No more recipient to send the email to EmailOptedOut=Email owner has requested to not contact him with this email anymore EvenUnsubscribe=Include opt-out emails -EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example. +EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example. XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index d9f071b5642..8d0026d3857 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -36,7 +36,7 @@ NoTranslation=No translation Translation=Translation Translations=Translations CurrentTimeZone=TimeZone PHP (server) -EmptySearchString=Enter non empty search criterias +EmptySearchString=Enter non empty search criteria EnterADateCriteria=Enter a date criteria NoRecordFound=No record found NoRecordDeleted=No record deleted @@ -446,7 +446,7 @@ LT1ES=RE LT2ES=IRPF LT1IN=CGST LT2IN=SGST -LT1GC=Additionnal cents +LT1GC=Additional cents VATRate=Tax Rate RateOfTaxN=Rate of tax %s VATCode=Tax Rate code @@ -771,7 +771,7 @@ DateOfSignature=Date of signature HidePassword=Show command with password hidden UnHidePassword=Show real command with clear password Root=Root -RootOfMedias=Root of public medias (/medias) +RootOfMedias=Root of public media (/medias) Informations=Information Page=Page Notes=Notes @@ -1167,8 +1167,8 @@ AffectTag=Assign a Tag AffectUser=Assign a User SetSupervisor=Set the supervisor CreateExternalUser=Create external user -ConfirmAffectTag=Bulk Tag Assignement -ConfirmAffectUser=Bulk User Assignement +ConfirmAffectTag=Bulk Tag Assignment +ConfirmAffectUser=Bulk User Assignment ProjectRole=Role assigned on each project/opportunity TasksRole=Role assigned on each task (if used) ConfirmSetSupervisor=Bulk Supervisor Set diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 9101966eff2..7d659270184 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -38,7 +38,7 @@ CostPrice=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices. +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitly on the invoices. rateMustBeNumeric=Rate must be a numeric value markRateShouldBeLesserThan100=Mark rate should be lower than 100 ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 3829a265546..1609896d942 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=Sending email on auto registration SendingEmailOnMemberValidation=Sending email on new member validation SendingEmailOnNewSubscription=Sending email on new contribution SendingReminderForExpiredSubscription=Sending reminder for expired contributions -SendingEmailOnCancelation=Sending email on cancelation +SendingEmailOnCancelation=Sending email on cancellation SendingReminderActionComm=Sending reminder for agenda event # Topic of email templates YourMembershipRequestWasReceived=Your membership was received. @@ -159,7 +159,7 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire -DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation +DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancellation DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion DescADHERENT_MAIL_FROM=Sender Email for automatic emails DescADHERENT_CC_MAIL_FROM=Send automatic email copy to @@ -175,7 +175,7 @@ HTPasswordExport=htpassword file generation NoThirdPartyAssociatedToMember=No third party associated with this member MembersAndSubscriptions=Members and Contributions MoreActions=Complementary action on recording -MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution +MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatically on online payment of a contribution MoreActionBankDirect=Create a direct entry on bank account MoreActionBankViaInvoice=Create an invoice, and a payment on bank account MoreActionInvoiceOnly=Create an invoice with no payment @@ -242,4 +242,4 @@ MemberLastname=Member lastname MemberCodeDesc=Member Code, unique for all members NoRecordedMembers=No recorded members MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a -MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -3 days, +1Y = +1 year) (example: +3m = +3 months, -5d = -3 days, +1Y = +1 year) \ No newline at end of file +MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -3 days, +1Y = +1 year) (example: +3m = +3 months, -5d = -3 days, +1Y = +1 year) diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang index da56228b019..291cbd93837 100644 --- a/htdocs/langs/en_US/modulebuilder.lang +++ b/htdocs/langs/en_US/modulebuilder.lang @@ -57,7 +57,7 @@ RegenerateMissingFiles=Generate missing files SpecificationFile=File of documentation LanguageFile=File for language ObjectProperties=Object Properties -Property=Propery +Property=Property PropertyDesc=A property is an attribute that characterizes an object. This attribute has a code, a label and a type with several options. ConfirmDeleteProperty=Are you sure you want to delete the property %s? This will change code in PHP class but also remove column from table definition of object. NotNull=Not NULL @@ -71,7 +71,7 @@ ArrayOfKeyValues=Array of key-val ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values WidgetFile=Widget file CSSFile=CSS file -JSFile=Javascript file +JSFile=JavaScript file ReadmeFile=Readme file ChangeLog=ChangeLog file TestClassFile=File for PHP Unit Test class @@ -128,7 +128,7 @@ RealPathOfModule=Real path of module ContentCantBeEmpty=Content of file can't be empty WidgetDesc=You can generate and edit here the widgets that will be embedded with your module. CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module. -JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module. +JSDesc=You can generate and edit here a file with personalized JavaScript embedded with your module. CLIDesc=You can generate here some command line scripts you want to provide with your module. CLIFile=CLI File NoCLIFile=No CLI files @@ -148,7 +148,7 @@ CSSViewClass=CSS for read form CSSListClass=CSS for list NotEditable=Not editable ForeignKey=Foreign key -ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck +ForeignKeyDesc=If the value of this field must be guaranteed to exist into another table. Enter here a value matching syntax: tablename.parentfieldtocheck TypeOfFieldsHelp=Example:
varchar(99)
email
phone
ip
url
password
double(24,8)
real
text
html
date
datetime
timestamp
integer
integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]

'1' means we add a + button after the combo to create the record
'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))' TypeOfFieldsHelpIntro=This is the type of the field/attribute. AsciiToHtmlConverter=Ascii to HTML converter @@ -182,4 +182,4 @@ DictionariesCreated=Dictionary %s created successfully DictionaryDeleted=Dictionary %s removed successfully PropertyModuleUpdated=Property %s has been update successfully InfoForApiFile=* When you generate file for the first time then all methods will be created for each object.
* When you click in remove you just remove all methods for the selected object. -SetupFile=Page for module setup \ No newline at end of file +SetupFile=Page for module setup diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang index dcb56f8e741..866a83a32ed 100644 --- a/htdocs/langs/en_US/multicurrency.lang +++ b/htdocs/langs/en_US/multicurrency.lang @@ -18,7 +18,7 @@ MulticurrencyReceived=Received, original currency MulticurrencyRemainderToTake=Remaining amount, original currency MulticurrencyPaymentAmount=Payment amount, original currency AmountToOthercurrency=Amount To (in currency of receiving account) -CurrencyRateSyncSucceed=Currency rate synchronization done successfuly +CurrencyRateSyncSucceed=Currency rate synchronization done successfully MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments TabTitleMulticurrencyRate=Rate list ListCurrencyRate=List of exchange rates for the currency diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 9366d9b5ec1..662348b6977 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -72,7 +72,7 @@ Approve2Order=Approve order (second level) UserApproval=User for approval UserApproval2=User for approval (second level) ValidateOrder=Validate order -UnvalidateOrder=Unvalidate order +UnvalidateOrder=Invalidate order DeleteOrder=Delete order CancelOrder=Cancel order OrderReopened= Order %s re-open diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index db28e1c69bc..a771fc5c02c 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -31,7 +31,7 @@ PreviousYearOfInvoice=Previous year of invoice date NextYearOfInvoice=Following year of invoice date DateNextInvoiceBeforeGen=Date of next invoice (before generation) DateNextInvoiceAfterGen=Date of next invoice (after generation) -GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead. +GraphInBarsAreLimitedToNMeasures=Graphics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead. OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected. AtLeastOneMeasureIsRequired=At least 1 field for measure is required AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index b95733f9a2e..4035d17d1b3 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -350,7 +350,7 @@ UseProductFournDesc=Add a feature to define the product description defined by t ProductSupplierDescription=Vendor description for the product UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product) PackagingForThisProduct=Packaging of quantities -PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity. +PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity. QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging #Attributes @@ -421,7 +421,7 @@ ErrorsProductsMerge=Errors in products merge SwitchOnSaleStatus=Switch on sale status SwitchOnPurchaseStatus=Switch on purchase status UpdatePrice=Increase/decrease customer price -StockMouvementExtraFields= Extra Fields (stock mouvement) +StockMouvementExtraFields= Extra Fields (stock movement) InventoryExtraFields= Extra Fields (inventory) ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes PuttingPricesUpToDate=Update prices with current known prices diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 79b64cdcdf3..5d7b4b41b7b 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -82,7 +82,7 @@ MyProjectsArea=My projects Area DurationEffective=Effective duration ProgressDeclared=Declared real progress TaskProgressSummary=Task progress -CurentlyOpenedTasks=Curently open tasks +CurentlyOpenedTasks=Currently open tasks TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption ProgressCalculated=Progress on consumption @@ -122,7 +122,7 @@ TaskHasChild=Task has child NotOwnerOfProject=Not owner of this private project AffectedTo=Allocated to CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'. -ValidateProject=Validate projet +ValidateProject=Validate project ConfirmValidateProject=Are you sure you want to validate this project? CloseAProject=Close project ConfirmCloseAProject=Are you sure you want to close this project? @@ -226,7 +226,7 @@ ProjectsStatistics=Statistics on projects or leads TasksStatistics=Statistics on tasks of projects or leads TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible. IdTaskTime=Id task time -YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX +YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommended to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX OpenedProjectsByThirdparties=Open projects by third parties OnlyOpportunitiesShort=Only leads OpenedOpportunitiesShort=Open leads @@ -238,7 +238,7 @@ OpportunityPonderatedAmountDesc=Leads amount weighted with probability OppStatusPROSP=Prospection OppStatusQUAL=Qualification OppStatusPROPO=Proposal -OppStatusNEGO=Negociation +OppStatusNEGO=Negotiation OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang index a2990fd51e9..b15d5b2f61c 100644 --- a/htdocs/langs/en_US/receptions.lang +++ b/htdocs/langs/en_US/receptions.lang @@ -36,7 +36,7 @@ ValidateReception=Validate reception ConfirmDeleteReception=Are you sure you want to delete this reception? ConfirmValidateReception=Are you sure you want to validate this reception with reference %s? ConfirmCancelReception=Are you sure you want to cancel this reception? -StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known). +StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planned delivery date is not always known). SendReceptionByEMail=Send reception by email SendReceptionRef=Submission of reception %s ActionsOnReception=Events on reception @@ -54,5 +54,5 @@ ReceptionClassifyClosedInDolibarr=Reception %s classified Closed ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open RestoreWithCurrentQtySaved=Fill quantities with latest saved values ReceptionsRecorded=Receptions recorded -ReceptionUpdated=Reception sucessfully updated -ReceptionDistribution=Reception distribution \ No newline at end of file +ReceptionUpdated=Reception successfully updated +ReceptionDistribution=Reception distribution diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang index 515e8960cba..d46ddaf389a 100644 --- a/htdocs/langs/en_US/recruitment.lang +++ b/htdocs/langs/en_US/recruitment.lang @@ -77,5 +77,5 @@ ExtrafieldsApplication=Complementary attributes (job applications) MakeOffer=Make an offer WeAreRecruiting=We are recruiting. This is a list of open positions to be filled... NoPositionOpen=No positions open at the moment -ConfirmClose=Confirm cancelation +ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 1d13fe6e1bc..bb36f5d7a9a 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -212,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date inventoryChangePMPPermission=Allow to change PMP value for a product ColumnNewPMP=New unit PMP OnlyProdsInStock=Do not add product without stock -TheoricalQty=Theorical qty -TheoricalValue=Theorical qty +TheoricalQty=Theoretical qty +TheoricalValue=Theoretical qty LastPA=Last BP -CurrentPA=Curent BP +CurrentPA=Current BP RecordedQty=Recorded Qty RealQty=Real Qty RealValue=Real Value @@ -246,7 +246,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future CurrentStock=Current stock InventoryRealQtyHelp=Set value to 0 to reset qty
Keep field empty, or remove line, to keep unchanged -UpdateByScaning=Complete real qty by scaning +UpdateByScaning=Complete real qty by scanning UpdateByScaningProductBarcode=Update by scan (product barcode) UpdateByScaningLot=Update by scan (lot|serial barcode) DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement. @@ -309,9 +309,9 @@ StockTransferDecrementationCancel=Cancel decrease of source warehouses StockTransferIncrementationCancel=Cancel increase of destination warehouses StockStransferDecremented=Source warehouses decreased StockStransferDecrementedCancel=Decrease of source warehouses canceled -StockStransferIncremented=Closed - Stocks transfered -StockStransferIncrementedShort=Stocks transfered -StockStransferIncrementedShortCancel=Increase of destination warehouses canceled +StockStransferIncremented=Closed - Stocks transferred +StockStransferIncrementedShort=Stocks transferred +StockStransferIncrementedShortCancel=Increase of destination warehouses cancelled StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry StockTransferSetup = Stocks Transfer module configuration Settings=Settings diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index c58930d84f6..460e73e1cf1 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -30,12 +30,12 @@ Permission56006=Export tickets Tickets=Tickets TicketDictType=Ticket - Types -TicketDictCategory=Ticket - Groupes +TicketDictCategory=Ticket - Groups TicketDictSeverity=Ticket - Severities TicketDictResolution=Ticket - Resolution TicketTypeShortCOM=Commercial question -TicketTypeShortHELP=Request for functionnal help +TicketTypeShortHELP=Request for functional help TicketTypeShortISSUE=Issue or bug TicketTypeShortPROBLEM=Problem TicketTypeShortREQUEST=Change or enhancement request diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index b37233a526f..a82933bf032 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -24,7 +24,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to 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_CANCEL=Cancellation date DATE_PAIEMENT=Payment date DATE_REFUS=Deny date DATE_SAVE=Validation date @@ -39,7 +39,7 @@ expenseReportCoef=Coefficient expenseReportCoefUndefined=(value not defined) expenseReportOffset=Offset expenseReportPrintExample=offset + (d x coef) = %s -expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay +expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary expenseReportRangeFromTo=from %d to %d expenseReportRangeMoreThan=more than %d expenseReportTotalForFive=Example with d = 5 @@ -103,7 +103,7 @@ ShowExpenseReport=Show expense report ShowTrip=Show expense report TripCard=Expense report card TripId=Id expense report -TripNDF=Informations expense report +TripNDF=Information expense report TripSociete=Information company Trips=Expense reports TripsAndExpenses=Expenses reports diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 1d88843dd34..1506d1dadad 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -123,7 +123,7 @@ ForceUserHolidayValidator=Force leave request validator ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour. UserPersonalEmail=Personal email UserPersonalMobile=Personal mobile phone -WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s +WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s DateLastLogin=Date last login DatePreviousLogin=Date previous login IPLastLogin=IP last login diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 1390fab322f..7127e4b9a1c 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Alternative page names/aliases WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:
alternativename1, alternativename2, ... WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) -WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_JS_INLINE=JavaScript file content (common to all pages) WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Website .htaccess file @@ -25,7 +25,7 @@ EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header MediaFiles=Media library EditCss=Edit website properties EditMenu=Edit menu -EditMedias=Edit medias +EditMedias=Edit media EditPageMeta=Edit page/container properties EditInLine=Edit inline AddWebsite=Add website @@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=You can create a new page or import a full webs SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">

To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
-#YouCanEditHtmlSource2=
To include a image shared publicaly, use the viewimage.php wrapper:
Example with a shared key 123456789, syntax is:
<img src="/viewimage.php?hashp=12345679012...">
+#YouCanEditHtmlSource2=
To include a image shared publicly, use the viewimage.php wrapper:
Example with a shared key 123456789, syntax is:
<img src="/viewimage.php?hashp=12345679012...">
YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:
<img src="/viewimage.php?hashp=12345679012...">
YouCanEditHtmlSourceMore=
More examples of HTML or dynamic code available on the wiki documentation
. ClonePage=Clone page/container @@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party YouMustDefineTheHomePage=You must first define the default Home page -OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that the inline editor may not works correclty when used on a grabbed external page. +OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that the inline editor may not works correctty when used on a grabbed external page. OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site GrabImagesInto=Grab also images found into css and page. ImagesShouldBeSavedInto=Images should be saved into directory @@ -112,13 +112,13 @@ GoTo=Go to DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '%s' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands). NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified. ReplaceWebsiteContent=Search or Replace website content -DeleteAlsoJs=Delete also all javascript files specific to this website? -DeleteAlsoMedias=Delete also all medias files specific to this website? +DeleteAlsoJs=Delete also all JavaScript files specific to this website? +DeleteAlsoMedias=Delete also all media files specific to this website? MyWebsitePages=My website pages SearchReplaceInto=Search | Replace into ReplaceString=New string CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:

#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }

Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere. -LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page. +LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load JavaScript files also in edit mode, just add your tag 'script src=...' into the page. Dynamiccontent=Sample of a page with dynamic content ImportSite=Import website template EditInLineOnOff=Mode 'Edit inline' is %s diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 441aa7dc24d..fb4ff9a9e8b 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -158,7 +158,7 @@ InfoTransData=Amount: %s
Method: %s
Date: %s InfoRejectSubject=Direct debit payment order refused InfoRejectMessage=Hello,

the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s ModeWarning=Option for real mode was not set, we stop after this simulation -ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use. +ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use. ErrorICSmissing=Missing ICS in Bank account %s TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php index ef35d7a2b7e..06bbfcb71c6 100644 --- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php +++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php @@ -480,7 +480,7 @@ class StockTransfer extends CommonObject if (($this->socid > 0 || $this->fk_soc > 0) && empty($this->thirdparty)) { $this->fetch_thirdparty(); } - if (empty($this->socid) && empty($this->fk_soc)) { + if (empty($this->socid) && empty($this->fk_soc)) { unset($this->thirdparty); } return $res; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 0f175c1e65f..0ebb962cce3 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -781,7 +781,7 @@ class Task extends CommonObjectLine */ public function getNomUrl($withpicto = 0, $option = '', $mode = 'task', $addlabel = 0, $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1) { - global $conf, $langs, $user; + global $action, $conf, $hookmanager, $langs; if (!empty($conf->dol_no_mouse_hover)) { $notooltip = 1; // Force disable tooltips @@ -842,6 +842,14 @@ class Task extends CommonObjectLine $result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : ''); } + $parameters = array('id'=>$this->id, 'getnomurl' => &$result); + $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks + if ($reshook > 0) { + $result = $hookmanager->resPrint; + } else { + $result .= $hookmanager->resPrint; + } + return $result; }