From ae3228b9e0be3f09a8273e77b4615bffdd97fdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 23 Oct 2020 20:08:35 +0200 Subject: [PATCH] retrieve the spelling :tada: --- .github/CONTRIBUTING.md | 8 +- ChangeLog | 74 +++++++++---------- htdocs/accountancy/journal/bankjournal.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/admin/company.php | 4 +- htdocs/categories/class/categorie.class.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 2 +- .../mailing/class/advtargetemailing.class.php | 2 +- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/commande/class/commande.class.php | 2 +- htdocs/compta/bank/class/account.class.php | 2 +- .../facture/class/facture-rec.class.php | 4 +- htdocs/compta/facture/class/facture.class.php | 4 +- htdocs/compta/resultat/index.php | 4 +- htdocs/contact/class/contact.class.php | 2 +- htdocs/contrat/class/contrat.class.php | 2 +- htdocs/core/class/commonobject.class.php | 2 +- .../browser/default/browser.php | 2 +- .../browser/default/frmactualfolder.php | 2 +- .../browser/default/frmcreatefolder.php | 2 +- .../browser/default/frmfolders.php | 2 +- .../browser/default/frmresourceslist.php | 4 +- .../browser/default/frmupload.php | 2 +- htdocs/core/js/lib_notification.js.php | 2 +- htdocs/core/lib/functions.lib.php | 4 +- .../modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/don/class/don.class.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- .../class/fournisseur.commande.class.php | 4 +- .../fourn/class/fournisseur.facture.class.php | 2 +- .../fourn/class/fournisseur.product.class.php | 2 +- htdocs/livraison/class/livraison.class.php | 2 +- htdocs/main.inc.php | 4 +- htdocs/product/class/product.class.php | 4 +- htdocs/product/price.php | 2 +- htdocs/product/stock/class/entrepot.class.php | 2 +- .../stock/class/mouvementstock.class.php | 2 +- .../product/stock/class/productlot.class.php | 2 +- .../class/productstockentrepot.class.php | 2 +- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/class/task.class.php | 4 +- htdocs/projet/tasks/comment.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/projet/tasks/document.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/public/members/public_card.php | 2 +- htdocs/public/members/public_list.php | 2 +- htdocs/public/onlinesign/newonlinesign.php | 2 +- htdocs/public/payment/newpayment.php | 4 +- htdocs/public/payment/paymentko.php | 2 +- htdocs/public/payment/paymentok.php | 2 +- htdocs/public/ticket/index.php | 2 +- htdocs/resource/class/dolresource.class.php | 2 +- htdocs/salaries/class/paymentsalary.class.php | 2 +- htdocs/stripe/class/stripe.class.php | 8 +- .../class/supplier_proposal.class.php | 4 +- htdocs/user/class/user.class.php | 2 +- htdocs/webservices/server_actioncomm.php | 8 +- htdocs/webservices/server_contact.php | 8 +- htdocs/webservices/server_order.php | 6 +- .../webservices/server_productorservice.php | 6 +- htdocs/webservices/server_project.php | 2 +- htdocs/webservices/server_user.php | 4 +- 65 files changed, 130 insertions(+), 130 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fed73d7b002..f112ea0523b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -56,7 +56,7 @@ You can add it to your git configuration using: git config --local commit.template .gitmessage ``` -where +where #### Keyword In uppercase if you want to have the log comment appears into the generated ChangeLog file. @@ -101,7 +101,7 @@ Long description (Can span accross multiple lines). ### Pull Requests -Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and +Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and a process to follow to optimize the chance to have PRs merged efficiently... * A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic. @@ -120,7 +120,7 @@ Once a PR has been submitted, you may need to wait for its integration. It is co If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion). -If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. +If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet. In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR. @@ -141,7 +141,7 @@ Translations done on transifex are available in the next major release. Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History" -to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. +to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. ### Resources diff --git a/ChangeLog b/ChangeLog index 27d9129c762..9682b0bd3bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,15 +13,15 @@ WARNING: Following changes may create regressions for some external modules, but were necessary to make Dolibarr better: * Properties ->contactid have been renamed into ->contact_id -* Properties ->titre have been renamed into ->title +* Properties ->titre have been renamed into ->title * Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id (english) * The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you used the old syntax in - your email templates. + your email templates. * The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom days of holiday. * Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency. * If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm), - you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait. + you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait. * The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML. * If you have links in your code with '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors. * The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of amount. @@ -385,28 +385,28 @@ Following changes may create regressions for some external modules, but were nec * Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests with HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing the HTML code of content (in such a case, sanitize data later) -* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. -* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced - by a "_" automatically when a reference (with a custom numbering mask that use it) is generated. +* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. +* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced + by a "_" automatically when a reference (with a custom numbering mask that use it) is generated. * Library jflot (replace with chartjs) was removed. -* Library geoip (replaced with geoip2) was removed. +* Library geoip (replaced with geoip2) was removed. * Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL was renamed into ORDER_VALID_AFTER_CLOSE_PROPAL. * Object field ref_int is deprecated and set to 'not used', method to fetch object by only ref_int is not supported anymore. * UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE * A new way to navigate between pages in list is available. To use it (not mandatory), you must: - - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); + - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); - remove input field in form '';' - add parameter $pagenavastextinput to value 1 when calling print_barre_liste() WARNING FOR DOLIWAMP USERS ONLY: Only people that installed Dolibarr using the all-in-one auto-installer for Windows called "DoliWAMP" are concerned by the following warnings: - + * DoliWAMP auto-installer for Windows is no more available on 32 bits systems. Use standard package if you need to use such architecture. -* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one. - You must make a backup of your database, make a fresh installation using the new installer and reload your backup. - Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production - solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one). +* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one. + You must make a backup of your database, make a fresh installation using the new installer and reload your backup. + Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production + solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one). DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard packages for production. @@ -570,7 +570,7 @@ FIX: #13118 FIX: #13124 FIX: #13131 FIX: #13135 -FIX: #13146 +FIX: #13146 FIX: #13198 FIX: #13175 FIX: #13182 @@ -637,7 +637,7 @@ FIX: Confusion between 'bank reconciled' and 'accounted'. Show both data. FIX: Count of Stripe payment mode must take test/live into account FIX: Creation of Stripe card from backoffice must return a clean message FIX: CVE-2019–17223 -FIX: CVE-2019–17223 +FIX: CVE-2019–17223 FIX: CVE-2020-7994 FIX: CVE Need permission to be able to develop modules FIX: #13053 @@ -837,7 +837,7 @@ NEW: #4301 For Developers or integrators: -NEW: Compatible with PHP 7.4 +NEW: Compatible with PHP 7.4 NEW: Code for extrafields uses the new array $extrafields->attributes NEW: Can set a filter on object linked in modulebuilder. NEW: Can defined a position of numbering submodules for thirdparties @@ -904,9 +904,9 @@ Following changes may create regressions for some external modules, but were nec * Removed function dol_micro_time. Use native PHP microtime instead. * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE. * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS. -* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. -* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. -* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. +* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. +* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. +* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. * All properties 'type_libelle' were renamed into 'type_label'. * Renamed property of thirdparty "statut_commercial" into "status_prospect_label" * The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core. @@ -1056,11 +1056,11 @@ FIX: wrong invoice id for fetchObjetctLinked ***** ChangeLog for 10.0.3 compared to 10.0.2 ***** IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card. -The unit were not saved correctly in database making calculation on shipments wrong. +The unit were not saved correctly in database making calculation on shipments wrong. Update to this version must be done if you use them and have installed version 10.0.0, 10.0.1 or 10.0.2 and set some products after installing or upgrading to one of this version. Once update is done you must then edit (manually) the product that has bad unit to set the correct unit to have features restored. -FIX: #11702 +FIX: #11702 FIX: #11861 No consistent code to manage measuring units FIX: #11942 FIX: #12026 @@ -1122,7 +1122,7 @@ FIX: wrong test FIX: XSS FIX: Payment from POS ware not recorded. FIX: Can validate invoice with amount including tax of zero for the case of having a final invoice with - VAT that includes a deposit without vat. + VAT that includes a deposit without vat. ***** ChangeLog for 10.0.2 compared to 10.0.1 ***** FIX: #10460 compatibility with MariaDB 10.4 @@ -1225,14 +1225,14 @@ FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES ***** ChangeLog for 10.0.1 compared to 10.0.0 ***** FIX: #10930 -FIX: #10984 +FIX: #10984 FIX: reposition on "Build backup" button FIX: #11400 FIX: #11412 -FIX: #11460 +FIX: #11460 FIX: #11463 FIX: #11466 -FIX: #11492 +FIX: #11492 FIX: #11498 FIX: #11505 FIX: #11506 @@ -1241,7 +1241,7 @@ FIX: #11509 FIX: #11537 FIX: #11543 FIX: #11553 -FIX: #11576 +FIX: #11576 FIX: #11584 FIX: #11590 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface @@ -1334,14 +1334,14 @@ FIX: wrong path sociales/index.php doesnt exist anymore ***** ChangeLog for 10.0.1 compared to 10.0.0 ***** FIX: #10930 -FIX: #10984 +FIX: #10984 FIX: reposition on "Build backup" button FIX: #11400 FIX: #11412 -FIX: #11460 +FIX: #11460 FIX: #11463 FIX: #11466 -FIX: #11492 +FIX: #11492 FIX: #11498 FIX: #11505 FIX: #11506 @@ -1350,7 +1350,7 @@ FIX: #11509 FIX: #11537 FIX: #11543 FIX: #11553 -FIX: #11576 +FIX: #11576 FIX: #11584 FIX: #11590 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface @@ -1519,7 +1519,7 @@ NEW: Manage account sell_intra & sell_export in page accoutancy admin default pr NEW: Manage loan schedule. NEW: Manage status of member types. NEW: Mass action "create bills" for validated reception -NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import. +NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import. NEW: Template pdf 'canelle_reception' displays linked reception lines. NEW: Moral/physic status can be defined at member type level NEW: Pagination into list of time spent. @@ -1582,7 +1582,7 @@ NEW: Enhance management of webhooks NEW: Generation of doc by modulebuilder can include README and CHANGELOG NEW: massfilesarea feature is possible for external modules NEW: Show list of enabled modules in dol_print_error(). -NEW: Simplification of CSS styles of default themes. +NEW: Simplification of CSS styles of default themes. NEW: Clean code of a lot of deprecated code. NEW: Add hidden option to set a search entry to the top NEW: add hidden option DISPLAY_DISCOUNTED_SUPPLIER_PRICE @@ -1602,8 +1602,8 @@ Following changes may create regressions for some external modules, but were nec * The PHP extension php-intl is not mandatory and must be installed to have new features working correctly. * Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules. * API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules. -* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.; -* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming +* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.; +* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming convention of extension .inc.php for files to be included. * All methods set_draft() were renamed into setDraft(). * Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter. @@ -1615,7 +1615,7 @@ Following changes may create regressions for some external modules, but were nec * Deprecated property ->fk_departement is now ->state_id everywhere. * Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr. * Column llx_facture.facnumber change to llx_facture.ref -* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable +* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable called $dolibarr_main_instance_unique_id is now generated at each installation. It will be used by some future features. @@ -3387,7 +3387,7 @@ Following changes may create regression for some external modules, but were nece entities and to review completely the rights of the groups and the users. * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx') * Some other change were done in the way we read permission of a user when module multicompany is enabled. You can - retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1. + retrieve the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1. * The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow hook specifications so you must return output into "resprint". @@ -6133,7 +6133,7 @@ For users: - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array -- Fix: Expedition creation, can retreive product from other expedition +- Fix: Expedition creation, can retrieve product from other expedition For translators: - Update language files. diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 0ed6db948a2..29777316a64 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -339,7 +339,7 @@ if ($result) { $tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30); $tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id; - // Retreive the accounting code of the social contribution of the payment from link of payment. + // Retrieve the accounting code of the social contribution of the payment from link of payment. // Note: We have the social contribution id, it can be faster to get accounting code from social contribution id. $sqlmid = 'SELECT cchgsoc.accountancy_code'; $sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc"; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 95ca2017b21..3f128ab9c5a 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1320,7 +1320,7 @@ class Adherent extends CommonObject $this->model_pdf = $obj->model_pdf; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels if ($fetch_optionals) { $this->fetch_optionals(); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 3f04e189cf6..2eb2c0edad1 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -142,7 +142,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha')) if ($isimage > 0) { // Create thumbs - //$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get... + //$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get... // Create small thumb, Used on logon for example $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality); @@ -270,7 +270,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred') // Regenerate thumb $reg = array(); // Create thumbs - //$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get... + //$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get... // Create small thumb. Used on logon for example $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 1bc9f47ded4..d3752ef43d8 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -347,7 +347,7 @@ class Categorie extends CommonObject $this->user_creation = $res['fk_user_creat']; $this->user_modification = $res['fk_user_modif']; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 97896448a3f..fbe9891522c 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -626,7 +626,7 @@ class ActionComm extends CommonObject // Load source object $objFrom = clone $this; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index f82ebec9d6f..b5e115d8463 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -451,7 +451,7 @@ class AdvanceTargetingMailing extends CommonObject /** - * Save query in database to retreive it + * Save query in database to retrieve it * * @param User $user User that deletes * @param array $arrayquery All element to Query diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 78c5a263ce1..cdacc5a6afc 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1562,7 +1562,7 @@ class Propal extends CommonObject $this->brouillon = 1; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 4a88c324c88..35e8acf680f 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1889,7 +1889,7 @@ class Commande extends CommonOrder if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index dffd62dc5a3..9e40a39c676 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -984,7 +984,7 @@ class Account extends CommonObject $this->date_creation = $this->db->jdate($obj->date_creation); $this->date_update = $this->db->jdate($obj->date_update); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index d1a6abcdec3..8aeaa2a9fe8 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -585,7 +585,7 @@ class FactureRec extends CommonInvoice if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); @@ -635,7 +635,7 @@ class FactureRec extends CommonInvoice // phpcs:enable $this->lines = array(); - // Retreive all extrafield for line + // Retrieve all extrafield for line // fetch optionals attributes and labels if (!is_object($extrafields)) { diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0c6b438b376..16309d31658 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1026,7 +1026,7 @@ class Facture extends CommonInvoice // Charge facture source $facture = new Facture($this->db); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); @@ -1625,7 +1625,7 @@ class Facture extends CommonInvoice if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 9ae666cb01a..754c84350af 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -449,7 +449,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom } else { dol_print_error($db); } - // TVA retreived + // TVA retrieved $sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."tva as t"; $sql .= " WHERE amount < 0"; @@ -915,7 +915,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) print ''; print ''; $htmlhelp = ''; - // if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive"); + // if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetrieve"); print $form->textwithpicto($langs->trans("Income"), $htmlhelp); print ''; } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 91a32f39f26..ab6e3c732c9 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -987,7 +987,7 @@ class Contact extends CommonObject return -1; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index f25d0ba69ef..d6fcae17ea5 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -891,7 +891,7 @@ class Contrat extends CommonObject $line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); $line->date_fin_reel = $this->db->jdate($objp->date_cloture); - // Retreive all extrafields for contract + // Retrieve all extrafields for contract // fetch optionals attributes and labels $line->fetch_optionals(); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 7dcc933623a..88486028894 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7788,7 +7788,7 @@ abstract class CommonObject { $this->setVarsFromFetchObj($obj); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php index 8f7ff82ecff..50bd538078b 100644 --- a/htdocs/core/filemanagerdol/browser/default/browser.php +++ b/htdocs/core/filemanagerdol/browser/default/browser.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php index a4e43de9fc8..d2d7a0966ce 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php index ec891285319..5e262b9a32a 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php index c2bf1086c2f..b272fd668c4 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php +++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php index a562d30a5a1..5f7f7e1214d 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php +++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -130,7 +130,7 @@ function OpenFile( fileUrl ) funcNum = GetUrlParam('CKEditorFuncNum'); //window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' )); window.top.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl.replace( '#', '%23' )); - + /////////////////////////////////// window.top.close(); window.top.opener.focus(); diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php index e0f0f03e430..c82581cc51c 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmupload.php +++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php @@ -3,7 +3,7 @@ * Copyright (C) 2003-2010 Frederico Caldeira Knabben * * Source modified from part of fckeditor (http://www.fckeditor.net) - * retreived as GPL v2 or later + * retrieved as GPL v2 or later * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php index 8ecca4da2df..ee212b4373f 100644 --- a/htdocs/core/js/lib_notification.js.php +++ b/htdocs/core/js/lib_notification.js.php @@ -80,7 +80,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP //console.log(result); var arrayofpastreminders = Object.values(result.pastreminders); if (arrayofpastreminders && arrayofpastreminders.length > 0) { - console.log("Retreived "+arrayofpastreminders.length+" reminders to do."); + console.log("Retrieved "+arrayofpastreminders.length+" reminders to do."); var audio = null; global->AGENDA_REMINDER_BROWSER_SOUND)) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index bbe45c13748..026b933faad 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -361,7 +361,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null { $out = $_SESSION['lastsearch_limit_'.$relativepathstring]; } - } // Else, retreive default values if we are not doing a sort + } // Else, retrieve default values if we are not doing a sort elseif (!isset($_GET['sortfield'])) // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set { if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) @@ -735,7 +735,7 @@ if (!function_exists('dol_getprefix')) */ function dol_include_once($relpath, $classname = '') { - global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var'] + global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retrieved with $GLOBALS['var'] $fullpath = dol_buildpath($relpath); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index a75d437ab21..82149032c86 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -378,7 +378,7 @@ class pdf_crabe extends ModelePDFFactures $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) // retreive space not used by discount + if (empty($this->atleastonediscount)) // retrieve space not used by discount { $delta = ($this->posxprogress - $this->posxdiscount); $this->posxpicture += $delta; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index b9ec7ebcaa7..b0e802ccc5e 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -689,7 +689,7 @@ class Don extends CommonObject $this->model_pdf = $obj->model_pdf; $this->modelpdf = $obj->model_pdf; // deprecated - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index bdf79081fe2..1f4a0d42386 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -624,7 +624,7 @@ class Expedition extends CommonObject */ $result = $this->fetch_thirdparty(); - // Retreive extrafields + // Retrieve extrafields $this->fetch_optionals(); // Fix Get multicurrency param for transmited diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 95359b7e74f..aad242d9157 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -407,7 +407,7 @@ class CommandeFournisseur extends CommonOrder $this->db->free($resql); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); @@ -530,7 +530,7 @@ class CommandeFournisseur extends CommonOrder $line->rang = $objp->rang; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $line->fetch_optionals(); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 1761215705b..d642e18ff67 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -732,7 +732,7 @@ class FactureFournisseur extends CommonInvoice $this->socid = $obj->socid; $this->socnom = $obj->socnom; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 924734f69c5..ad7c9a1f238 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -285,7 +285,7 @@ class ProductFournisseur extends Product $localtax1 = $localtaxes_array['1']; $localtaxtype2 = $localtaxes_array['2']; $localtax2 = $localtaxes_array['3']; - } else // old method. deprecated because ot can't retreive type + } else // old method. deprecated because ot can't retrieve type { $localtaxtype1 = '0'; $localtax1 = get_localtax($newvat, 1); diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index c612dbf6fe2..7ef93b016d1 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -332,7 +332,7 @@ class Livraison extends CommonObject if ($this->statut == 0) $this->brouillon = 1; - // Retreive all extrafields + // Retrieve all extrafields // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3cfb5c3d1a5..77705242d43 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -656,7 +656,7 @@ if (!defined('NOLOGIN')) exit; } - $resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retreived previously when checking password. + $resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password. if ($resultFetchUser <= 0) { dol_syslog('User not found, connexion refused'); @@ -1122,7 +1122,7 @@ if (!function_exists("llxHeader")) if (empty($conf->dol_hide_leftmenu)) { - left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function + left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function } // main area diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1bd4ca0f1d0..5c3c2a75586 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1903,7 +1903,7 @@ class Product extends CommonObject $localtax1 = $localtaxes_array['1']; $localtaxtype2 = $localtaxes_array['2']; $localtax2 = $localtaxes_array['3']; - } else // old method. deprecated because ot can't retreive type + } else // old method. deprecated because ot can't retrieve type { $localtaxtype1 = '0'; $localtax1 = get_localtax($newvat, 1); @@ -2145,7 +2145,7 @@ class Product extends CommonObject $this->db->free($resql); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 6aae8843cbf..8d10535ae31 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -162,7 +162,7 @@ if (empty($reshook)) if ($error) { //$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2); - $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them. + $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them. $object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode); } diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index a16b1ee189c..170b1395984 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -488,7 +488,7 @@ class Entrepot extends CommonObject $this->model_pdf = $obj->model_pdf; $this->import_key = $obj->import_key; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 53606b1ad1a..8a4697be2a1 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -662,7 +662,7 @@ class MouvementStock extends CommonObject $this->fk_project = $obj->fk_project; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index 9ff36db3c5b..dcc29de4769 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -300,7 +300,7 @@ class Productlot extends CommonObject $this->fk_user_modif = $obj->fk_user_modif; $this->import_key = $obj->import_key; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); } diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php index 469cec4a9a2..27cd603d98a 100644 --- a/htdocs/product/stock/class/productstockentrepot.class.php +++ b/htdocs/product/stock/class/productstockentrepot.class.php @@ -202,7 +202,7 @@ class ProductStockEntrepot extends CommonObject $this->import_key = $obj->import_key; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 69cbb8c86c9..b585482eef5 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -586,7 +586,7 @@ class Project extends CommonObject $this->db->free($resql); - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index e6cabbf7347..9c19d6b45c7 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -317,7 +317,7 @@ class Task extends CommonObject $this->task_parent_position = $obj->task_parent_position; } - // Retreive all extrafield + // Retrieve all extrafield $this->fetch_optionals(); } @@ -1702,7 +1702,7 @@ class Task extends CommonObject { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - //retreive project origin ref to know folder to copy + //retrieve project origin ref to know folder to copy $projectstatic = new Project($this->db); $projectstatic->fetch($ori_project_id); $ori_project_ref = $projectstatic->ref; diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index a8331e20ca1..f1ea6d3b4ac 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -65,7 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); // include comment actions include DOL_DOCUMENT_ROOT.'/core/actions_comments.inc.php'; -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch('', $project_ref) > 0) diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 506dc085573..7ae7b13ed26 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -121,7 +121,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer) } } -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch(0, $project_ref) > 0) diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index aa976667708..d19d587a30a 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -69,7 +69,7 @@ $projectstatic = new Project($db); * Actions */ -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch(0, $project_ref) > 0) diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 44ccc181799..20a38700685 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -63,7 +63,7 @@ if ($id > 0 || !empty($ref)) } -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch(0, $project_ref) > 0) diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 0f2109986d1..528c04b23d1 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -136,7 +136,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s } } -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch('', $project_ref) > 0) diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 9bd12ccfad6..ad53dc30a07 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -293,7 +293,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l } } -// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work if (!empty($project_ref) && !empty($withproject)) { if ($projectstatic->fetch(0, $project_ref) > 0) diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index c1677b2902b..620ee6f202a 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -31,7 +31,7 @@ if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index cb5b9308ed4..94fb90e6bcf 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -30,7 +30,7 @@ if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 4408438ceaf..8c2d8e455b3 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -29,7 +29,7 @@ if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 3d197296df7..2c7e492555a 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -648,7 +648,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) } catch (Exception $e) { $error++; - $errormessage = "CantRetreivePaymentIntent ".$e->getMessage(); + $errormessage = "CantRetrievePaymentIntent ".$e->getMessage(); dol_syslog($errormessage, LOG_WARNING, 0, '_stripe'); setEventMessages($e->getMessage(), null, 'errors'); $action = ''; @@ -657,7 +657,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) if ($paymentintent->status != 'succeeded') { $error++; - $errormessage = "StatusOfRetreivedIntent is not succeeded: ".$paymentintent->status; + $errormessage = "StatusOfRetrievedIntent is not succeeded: ".$paymentintent->status; dol_syslog($errormessage, LOG_WARNING, 0, '_stripe'); setEventMessages($paymentintent->status, null, 'errors'); $action = ''; diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index b3833bd14b5..f99432c2b1a 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -30,7 +30,7 @@ define("NOCSRFCHECK", 1); // We accept to go on this page from external web site // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index 3be1af4935e..5e64294da9e 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -30,7 +30,7 @@ define("NOCSRFCHECK", 1); // We accept to go on this page from external web site // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php index be7c44580cd..bff81497c99 100644 --- a/htdocs/public/ticket/index.php +++ b/htdocs/public/ticket/index.php @@ -29,7 +29,7 @@ if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 87f737043ac..d392375fdd0 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -210,7 +210,7 @@ class Dolresource extends CommonObject $this->note_private = $obj->note_private; $this->type_label = $obj->type_label; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); } diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php index 34b58a5c0e4..1d46981d8d3 100644 --- a/htdocs/salaries/class/paymentsalary.class.php +++ b/htdocs/salaries/class/paymentsalary.class.php @@ -254,7 +254,7 @@ class PaymentSalary extends CommonObject $this->fk_type = $obj->fk_type; $this->rappro = $obj->rappro; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); } diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index a710f092b89..b1268b2648f 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -299,7 +299,7 @@ class Stripe extends CommonObject * Warning. If a payment was tried and failed, a payment intent was created. * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed by Stripe. * Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay), - * that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) + * that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) * Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page * but not when using the STRIPE_USE_NEW_CHECKOUT. * @@ -354,7 +354,7 @@ class Stripe extends CommonObject // But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe. // Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will // automatically return the existing payment intent if idempotency is provided when we try to create the new one. - // That's why we can comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) + // That's why we can comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) $sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi"; @@ -536,7 +536,7 @@ class Stripe extends CommonObject * Warning. If a payment was tried and failed, a payment intent was created. * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed. * Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay), - * that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) + * that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used) * Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page * but not when using the STRIPE_USE_NEW_CHECKOUT. * @@ -1034,7 +1034,7 @@ class Stripe extends CommonObject if (preg_match('/pm_/i', $source)) { - $return->message = 'Payment retreived by card status = '.$charge->status; + $return->message = 'Payment retrieved by card status = '.$charge->status; } else { if ($charge->source->type == 'card') { $return->message = $charge->source->card->brand." ....".$charge->source->card->last4; diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 8a198720e56..07b2dfe1d8b 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -1289,7 +1289,7 @@ class SupplierProposal extends CommonObject $this->brouillon = 1; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); @@ -1379,7 +1379,7 @@ class SupplierProposal extends CommonObject return -1; } - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 1649032fc8d..b6db00d2d16 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -401,7 +401,7 @@ class User extends CommonObject // in such case, this admin user must be admin for ALL entities. if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) $this->entity = 0; - // Retreive all extrafield + // Retrieve all extrafield // fetch optionals attributes and labels $this->fetch_optionals(); diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php index c9e035edc6b..d3a59962d88 100644 --- a/htdocs/webservices/server_actioncomm.php +++ b/htdocs/webservices/server_actioncomm.php @@ -114,7 +114,7 @@ $actioncomm_fields = array( $elementtype = 'actioncomm'; -//Retreive all extrafield for actioncomm +//Retrieve all extrafield for actioncomm // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -308,7 +308,7 @@ function getActionComm($authentication, $id) $elementtype = 'actioncomm'; - // Retreive all extrafield for actioncomm + // Retrieve all extrafield for actioncomm // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -450,7 +450,7 @@ function createActionComm($authentication, $actioncomm) $elementtype = 'actioncomm'; - //Retreive all extrafield for actioncomm + //Retrieve all extrafield for actioncomm // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -547,7 +547,7 @@ function updateActionComm($authentication, $actioncomm) $elementtype = 'actioncomm'; - //Retreive all extrafield for actioncomm + //Retrieve all extrafield for actioncomm // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php index 023cdc1c4ac..c4818d050f6 100644 --- a/htdocs/webservices/server_contact.php +++ b/htdocs/webservices/server_contact.php @@ -119,7 +119,7 @@ $contact_fields = array( $elementtype = 'socpeople'; -//Retreive all extrafield for contact +//Retrieve all extrafield for contact // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -312,7 +312,7 @@ function getContact($authentication, $id, $ref_ext) $elementtype = 'socpeople'; - //Retreive all extrafield for thirdsparty + //Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -420,7 +420,7 @@ function createContact($authentication, $contact) $elementtype = 'socpeople'; - //Retreive all extrafield for thirdsparty + //Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -667,7 +667,7 @@ function updateContact($authentication, $contact) $elementtype = 'socpeople'; - //Retreive all extrafield for contact + //Retrieve all extrafield for contact // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index 98c9be86cfc..82482f8f61a 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -112,7 +112,7 @@ $line_fields = array( $elementtype = 'commandedet'; -//Retreive all extrafield for thirdsparty +//Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -216,7 +216,7 @@ $order_fields = array( $elementtype = 'commande'; -//Retreive all extrafield for thirdsparty +//Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -944,7 +944,7 @@ function updateOrder($authentication, $order) $elementtype = 'commande'; - //Retreive all extrafield for object + //Retrieve all extrafield for object // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index bf29795f0de..d7fbe8283ed 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -134,7 +134,7 @@ $productorservice_fields = array( $elementtype = 'product'; -//Retreive all extrafield for product +//Retrieve all extrafield for product // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -429,7 +429,7 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = '' $elementtype = 'product'; - //Retreive all extrafield for thirdsparty + //Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -1098,7 +1098,7 @@ function getProductsForCategory($authentication, $id, $lang = '') $elementtype = 'product'; - //Retreive all extrafield for thirdsparty + //Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php index dc8fc81db2c..a6b7a7c29ce 100644 --- a/htdocs/webservices/server_project.php +++ b/htdocs/webservices/server_project.php @@ -161,7 +161,7 @@ $project_fields = array( $elementtype = 'project'; -//Retreive all extrafield for thirdsparty +//Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 000bad4b563..99325347a23 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -185,7 +185,7 @@ $thirdpartywithuser_fields = array( $elementtype = 'socpeople'; -//Retreive all extrafield for contact +//Retrieve all extrafield for contact // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true); @@ -595,7 +595,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser) $elementtype = 'socpeople'; - //Retreive all extrafield for thirdsparty + //Retrieve all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($elementtype, true);