diff --git a/.codeclimate.yml b/.codeclimate.yml
index a84e6c1fdd0..0c62d4ed5eb 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -4,10 +4,10 @@ languages:
   JavaScript: true
   PHP: true
 engines:
-  phpcodesniffer: true  
+  phpcodesniffer: true
 exclude_paths:
   - 'build/*'
   - 'dev/*'
   - 'doc/*'
   - 'test/*'
-  - 'htdocs/includes/*'
\ No newline at end of file
+  - 'htdocs/includes/*'
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 6b651234788..cd1513f3576 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,4 +2,4 @@
 
 open_collective: dolibarr
 custom: https://wiki.dolibarr.org/index.php/Subscribe
-github: [eldy]
\ No newline at end of file
+github: [eldy]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3795b1b7222..2c79a8cea03 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
-        
+
   - type: textarea
     id: bug
     attributes:
@@ -27,19 +27,19 @@ body:
     attributes:
       label: Environment OS
       description: Server OS type and version
-      
+
   - type: input
     id: environment-webserver
     attributes:
       label: Environment Web server
       description: Webserver type and version
-      
+
   - type: input
     id: environment-php
     attributes:
       label: Environment PHP
       description: PHP version
-      
+
   - type: input
     id: environment-database
     attributes:
@@ -63,7 +63,7 @@ body:
     attributes:
       label: Steps to reproduce the behavior
       description: Verbose description
-      
+
   - type: textarea
     id: files
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 885f3472d18..5d97ee6a5be 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -21,7 +21,7 @@ body:
     attributes:
       label: Use case
       description: Verbose description
-      
+
   - type: textarea
     id: suggested-implementation
     attributes:
diff --git a/.github/logToCs.py b/.github/logToCs.py
new file mode 100755
index 00000000000..d08628cef84
--- /dev/null
+++ b/.github/logToCs.py
@@ -0,0 +1,417 @@
+#!/usr/bin/env python3
+# pylint: disable=invalid-name
+"""
+Convert a log to CheckStyle format.
+
+Url: https://github.com/mdeweerd/LogToCheckStyle
+
+The log can then be used for generating annotations in a github action.
+
+Note: this script is very young and "quick and dirty".
+      Patterns can be added to "PATTERNS" to match more messages.
+
+# Examples
+
+Assumes that logToCs.py is available as .github/logToCs.py.
+
+## Example 1:
+
+
+```yaml
+      - run: |
+          pre-commit run -all-files | tee pre-commit.log
+          .github/logToCs.py pre-commit.log pre-commit.xml
+      - uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+        with:
+          files: pre-commit.xml
+          notices-as-warnings: true # optional
+```
+
+## Example 2:
+
+
+```yaml
+      - run: |
+          pre-commit run --all-files | tee pre-commit.log
+      - name: Add results to PR
+        if: ${{ always() }}
+        run: |
+          .github/logToCs.py pre-commit.log | cs2pr
+```
+
+Author(s):
+  - https://github.com/mdeweerd
+
+License: MIT License
+
+"""
+
+import argparse
+import os
+import re
+import sys
+import xml.etree.ElementTree as ET  # nosec
+
+
+def remove_prefix(string, prefix):
+    """
+    Remove prefix from string
+
+    Provided for backward compatibility.
+    """
+    if prefix and string.startswith(prefix):
+        return string[len(prefix) :]
+    return string
+
+
+def convert_to_checkstyle(messages, root_path=None):
+    """
+    Convert provided message to CheckStyle format.
+    """
+    root = ET.Element("checkstyle")
+    for message in messages:
+        fields = parse_message(message)
+        if fields:
+            add_error_entry(root, **fields, root_path=root_path)
+    return ET.tostring(root, encoding="utf_8").decode("utf_8")
+
+
+def convert_text_to_checkstyle(text, root_path=None):
+    """
+    Convert provided message to CheckStyle format.
+    """
+    root = ET.Element("checkstyle")
+    for fields in parse_file(text):
+        if fields:
+            add_error_entry(root, **fields, root_path=root_path)
+    return ET.tostring(root, encoding="utf_8").decode("utf_8")
+
+
+ANY_REGEX = r".*?"
+FILE_REGEX = r"\s*(?P<file_name>\S.*?)\s*?"
+FILEGROUP_REGEX = r"\s*(?P<file_group>\S.*?)\s*?"
+EOL_REGEX = r"[\r\n]"
+LINE_REGEX = r"\s*(?P<line>\d+?)\s*?"
+COLUMN_REGEX = r"\s*(?P<column>\d+?)\s*?"
+SEVERITY_REGEX = r"\s*(?P<severity>error|warning|notice|style|info)\s*?"
+MSG_REGEX = r"\s*(?P<message>.+?)\s*?"
+MULTILINE_MSG_REGEX = r"\s*(?P<message>(?:.|.[\r\n])+)"
+# cpplint confidence index
+CONFIDENCE_REGEX = r"\s*\[(?P<confidence>\d+)\]\s*?"
+
+
+# List of message patterns, add more specific patterns earlier in the list
+# Creating patterns by using constants makes them easier to define and read.
+PATTERNS = [
+    # beautysh
+    #  File ftp.sh: error: "esac" before "case" in line 90.
+    re.compile(
+        f"^File {FILE_REGEX}:{SEVERITY_REGEX}:"
+        f" {MSG_REGEX} in line {LINE_REGEX}.$"
+    ),
+    # beautysh
+    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
+    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
+    # yamllint
+    # ##[group].pre-commit-config.yaml
+    # ##[error]97:14 [trailing-spaces] trailing spaces
+    # ##[endgroup]
+    re.compile(rf"^##\[group\]{FILEGROUP_REGEX}$"),  # Start file group
+    re.compile(
+        rf"^##\[{SEVERITY_REGEX}\]{LINE_REGEX}:{COLUMN_REGEX}{MSG_REGEX}$"
+    ),  # Msg
+    re.compile(r"^##(?P<file_endgroup>\[endgroup\])$"),  # End file group
+    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
+    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
+    # ESLint (JavaScript Linter), RoboCop, shellcheck
+    #  path/to/file.js:10:2: Some linting issue
+    #  path/to/file.rb:10:5: Style/Indentation: Incorrect indentation detected
+    #  path/to/script.sh:10:1: SC2034: Some shell script issue
+    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{COLUMN_REGEX}: {MSG_REGEX}$"),
+    # Cpplint default output:
+    #           '%s:%s:  %s  [%s] [%d]\n'
+    #   % (filename, linenum, message, category, confidence)
+    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{MSG_REGEX}{CONFIDENCE_REGEX}$"),
+    # MSVC
+    # file.cpp(10): error C1234: Some error message
+    re.compile(
+        f"^{FILE_REGEX}\\({LINE_REGEX}\\):{SEVERITY_REGEX}{MSG_REGEX}$"
+    ),
+    # Java compiler
+    # File.java:10: error: Some error message
+    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{SEVERITY_REGEX}:{MSG_REGEX}$"),
+    # Python
+    # File ".../logToCs.py", line 90 (note: code line follows)
+    re.compile(f'^File "{FILE_REGEX}", line {LINE_REGEX}$'),
+    # Pylint, others
+    # path/to/file.py:10: [C0111] Missing docstring
+    # others
+    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}: {MSG_REGEX}$"),
+    # Shellcheck:
+    # In script.sh line 76:
+    re.compile(
+        f"^In {FILE_REGEX} line {LINE_REGEX}:{EOL_REGEX}?"
+        f"({MULTILINE_MSG_REGEX})?{EOL_REGEX}{EOL_REGEX}"
+    ),
+    # eslint:
+    #  /path/to/filename
+    #    14:5  error  Unexpected trailing comma  comma-dangle
+    re.compile(
+        f"^{FILE_REGEX}{EOL_REGEX}"
+        rf"\s+{LINE_REGEX}:{COLUMN_REGEX}\s+{SEVERITY_REGEX}\s+{MSG_REGEX}$"
+    ),
+]
+
+# Severities available in CodeSniffer report format
+SEVERITY_NOTICE = "notice"
+SEVERITY_WARNING = "warning"
+SEVERITY_ERROR = "error"
+
+
+def strip_ansi(text: str):
+    """
+    Strip ANSI escape sequences from string (colors, etc)
+    """
+    return re.sub(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", "", text)
+
+
+def parse_file(text):
+    """
+    Parse all messages in a file
+
+    Returns the fields in a dict.
+    """
+    # pylint: disable=too-many-branches
+    # regex required to allow same group names
+    try:
+        import regex  # pylint: disable=import-outside-toplevel
+    except ImportError as exc:
+        raise ImportError(
+            "The 'parsefile' method requires 'python -m pip install regex'"
+        ) from exc
+
+    patterns = [pattern.pattern for pattern in PATTERNS]
+    # patterns = [PATTERNS[0].pattern]
+
+    file_group = None  # The file name for the group (if any)
+    full_regex = "(?:(?:" + (")|(?:".join(patterns)) + "))"
+    results = []
+
+    for fields in regex.finditer(
+        full_regex, strip_ansi(text), regex.MULTILINE
+    ):
+        if not fields:
+            continue
+        result = fields.groupdict()
+
+        if len(result) == 0:
+            continue
+
+        severity = result.get("severity", None)
+        file_name = result.get("file_name", None)
+        confidence = result.pop("confidence", None)
+        new_file_group = result.pop("file_group", None)
+        file_endgroup = result.pop("file_endgroup", None)
+
+        if new_file_group is not None:
+            # Start of file_group, just store file
+            file_group = new_file_group
+            continue
+
+        if file_endgroup is not None:
+            file_group = None
+            continue
+
+        if file_name is None:
+            if file_group is not None:
+                file_name = file_group
+                result["file_name"] = file_name
+            else:
+                # No filename, skip
+                continue
+
+        if confidence is not None:
+            # Convert confidence level of cpplint
+            # to warning, etc.
+            confidence = int(confidence)
+
+            if confidence <= 1:
+                severity = SEVERITY_NOTICE
+            elif confidence >= 5:
+                severity = SEVERITY_ERROR
+            else:
+                severity = SEVERITY_WARNING
+
+        if severity is None:
+            severity = SEVERITY_ERROR
+        else:
+            severity = severity.lower()
+
+        if severity in ["info", "style"]:
+            severity = SEVERITY_NOTICE
+
+        result["severity"] = severity
+
+        results.append(result)
+
+    return results
+
+
+def parse_message(message):
+    """
+    Parse message until it matches a pattern.
+
+    Returns the fields in a dict.
+    """
+    for pattern in PATTERNS:
+        fields = pattern.match(message)
+        if not fields:
+            continue
+        result = fields.groupdict()
+        if len(result) == 0:
+            continue
+
+        if "confidence" in result:
+            # Convert confidence level of cpplint
+            # to warning, etc.
+            confidence = int(result["confidence"])
+            del result["confidence"]
+
+            if confidence <= 1:
+                severity = SEVERITY_NOTICE
+            elif confidence >= 5:
+                severity = SEVERITY_ERROR
+            else:
+                severity = SEVERITY_WARNING
+            result["severity"] = severity
+
+        if "severity" not in result:
+            result["severity"] = SEVERITY_ERROR
+        else:
+            result["severity"] = result["severity"].lower()
+
+        if result["severity"] in ["info", "style"]:
+            result["severity"] = SEVERITY_NOTICE
+
+        return result
+
+    # Nothing matched
+    return None
+
+
+def add_error_entry(  # pylint: disable=too-many-arguments
+    root,
+    severity,
+    file_name,
+    line=None,
+    column=None,
+    message=None,
+    source=None,
+    root_path=None,
+):
+    """
+    Add error information to the CheckStyle output being created.
+    """
+    file_element = find_or_create_file_element(
+        root, file_name, root_path=root_path
+    )
+    error_element = ET.SubElement(file_element, "error")
+    error_element.set("severity", severity)
+    if line:
+        error_element.set("line", line)
+    if column:
+        error_element.set("column", column)
+    if message:
+        error_element.set("message", message)
+    if source:
+        # To verify if this is a valid attribute
+        error_element.set("source", source)
+
+
+def find_or_create_file_element(root, file_name: str, root_path=None):
+    """
+    Find/create file element in XML document tree.
+    """
+
+    if root_path is not None:
+        file_name = remove_prefix(file_name, root_path)
+    for file_element in root.findall("file"):
+        if file_element.get("name") == file_name:
+            return file_element
+    file_element = ET.SubElement(root, "file")
+    file_element.set("name", file_name)
+    return file_element
+
+
+def main():
+    """
+    Parse the script arguments and get the conversion done.
+    """
+    parser = argparse.ArgumentParser(
+        description="Convert messages to Checkstyle XML format."
+    )
+    parser.add_argument(
+        "input", help="Input file. Use '-' for stdin.", nargs="?", default="-"
+    )
+    parser.add_argument(
+        "output",
+        help="Output file. Use '-' for stdout.",
+        nargs="?",
+        default="-",
+    )
+    parser.add_argument(
+        "-i",
+        "--in",
+        dest="input_named",
+        help="Input filename. Overrides positional input.",
+    )
+    parser.add_argument(
+        "-o",
+        "--out",
+        dest="output_named",
+        help="Output filename. Overrides positional output.",
+    )
+    parser.add_argument(
+        "--root",
+        metavar="ROOT_PATH",
+        help="Root directory to remove from file paths."
+        "  Defaults to working directory.",
+        default=os.getcwd(),
+    )
+
+    args = parser.parse_args()
+
+    if args.input == "-" and args.input_named:
+        with open(
+            args.input_named, encoding="utf_8", errors="surrogateescape"
+        ) as input_file:
+            text = input_file.read()
+    elif args.input != "-":
+        with open(
+            args.input, encoding="utf_8", errors="surrogateescape"
+        ) as input_file:
+            text = input_file.read()
+    else:
+        text = sys.stdin.read()
+
+    root_path = os.path.join(args.root, "")
+
+    try:
+        checkstyle_xml = convert_text_to_checkstyle(text, root_path=root_path)
+    except ImportError:
+        checkstyle_xml = convert_to_checkstyle(
+            re.split(r"[\r\n]+", text), root_path=root_path
+        )
+
+    if args.output == "-" and args.output_named:
+        with open(args.output_named, "w", encoding="utf_8") as output_file:
+            output_file.write(checkstyle_xml)
+    elif args.output != "-":
+        with open(args.output, "w", encoding="utf_8") as output_file:
+            output_file.write(checkstyle_xml)
+    else:
+        print(checkstyle_xml)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index 0b33ede5f4f..16e87acd81a 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:
-        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' 
+        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
         ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
-        file_extensions: php   
-        project_reports: Perfile     
\ No newline at end of file
+        file_extensions: php
+        project_reports: Perfile
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 1bb1184586f..6b0b0258823 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -1,6 +1,7 @@
 name: "PHPCS"
 
 on:
+  push:
   pull_request:
     paths:
       - "**.php"
@@ -11,6 +12,7 @@ jobs:
   phpcs:
     runs-on: ubuntu-latest
     steps:
+      # Get git sources
       - uses: actions/checkout@v4
         with:
           fetch-depth: 50 # important!
diff --git a/.github/workflows/phpcsfixer.yml.disabled b/.github/workflows/phpcsfixer.yml.disabled
deleted file mode 100644
index 959ba5ad801..00000000000
--- a/.github/workflows/phpcsfixer.yml.disabled
+++ /dev/null
@@ -1,63 +0,0 @@
-name: GitHub CI PHPCS and PHPCBF
-
-on: 
-  pull_request:
-    types: [opened]
-#on: 
-#  push:
-#    paths:
-#    - '**.php'
-
-jobs:
-  #filesChanged:
-  #  uses: ./.github/workflows/files_changed.yaml
-  #  with:
-  #    folder_path: .*
-
-  linter_name:
-    name: Run & fix PHP Code Sniffer
-    runs-on: ubuntu-latest
-    #needs: filesChanged
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}      
-          #  fetch-depth: 10
-
-      - name: echo Get list of all changed files
-        run: |
-          #echo ${{ needs.filesChanged.outputs.all_changed_files }} 
-          #echo boolean_output=${{ needs.filesChanged.outputs.boolean_output }}
-          echo github.head_ref=${{github.head_ref}}
-          echo github.base_ref=${{github.base_ref}}
-          echo github.ref_name=${{github.ref_name}}
-
-      - uses: eldy/phpcsfixer-action@master
-        with:
-          github_token: ${{ secrets.github_token }}
-          use_default_configuration_file: false
-          phpcs_standard: 'dev/setup/codesniffer/ruleset.xml'
-          phpcs_head_ref: ${{github.head_ref}}
-          phpcs_base_ref: ${{github.base_ref}}
-          phpcs_ref_name: ${{github.ref_name}}
-          phpcs_github_event_name: ${{github.event_name}}
-          phpcs_files: ${{ needs.filesChanged.outputs.all_changed_files }}
-
-      #- uses: stefanzweifel/git-auto-commit-action@v4 # auto commit the fixes action for GitHub
-      #  with:
-      #    commit_message: Fix PHPCS errors by GitHub PHPCSfixer action
-
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9.1.3
-        with:
-          default_author: github_actions
-          committer_name: GitHub Actions
-          committer_email: actions@github.com
-          #author_name: PHP CS fixer
-          #author_email: eldy@destailleur.fr
-          #committer_name: PHP CS fixer
-          #committer_email: eldy@destailleur.fr
-          message: 'PHP CS fixer github action'
-          add: '*.php'
-
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 484c1c84bee..e0a7d71b9b6 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,20 +1,17 @@
 # This is a basic workflow to check code with PHPSTAN tool
 
-name: PHPSTAN
+name: "PHPStan"
 
 # Controls when the workflow will run
-on:
-  # Triggers the workflow on pull request events but only for the develop branch
-  pull_request:
-    branches: [ develop ]
+on: [push, pull_request]
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
     cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
+  # This workflow contains a single job
+  php-stan:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     strategy:
@@ -30,6 +27,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
          fetch-depth: 0
+
+      # Get PHP and addons
       - name: Setup PHP
         id: setup-php
         uses: shivammathur/setup-php@v2
@@ -37,25 +36,32 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           tools: phpstan, cs2pr
           extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap, mysql, pgsql, sqlite3, ldap, xml, mcrypt
+      # ???
       - uses: actions/setup-node@v3
         with:
           node-version: 14.x
           registry-url: 'https://registry.npmjs.org'
+
+      # Restore old cache
       - name: Restore phpstan cache
         uses: actions/cache/restore@v3
         with:
           path: ./.github/tmp
-          key: "phpstan-cache-PR-${{ matrix.php-version }}-${{ github.run_id }}"
+          key: "phpstan-cache-${{ matrix.php-version }}-${{ github.run_id }}"
           restore-keys: |
-            phpstan-cache-PR-${{ matrix.php-version }}-
-      - name: Debug
+            phpstan-cache-${{ matrix.php-version }}-
+      - name: Show debug into
         run: cd ./.github/tmp && ls -al
-      - name: Run PHPSTAN
-        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -c phpstan_action.neon | cs2pr --graceful-warnings
+
+      # Run PHPStan
+      - name: Run PHPStan
+        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | cs2pr --graceful-warnings
         # continue-on-error: true
+
+      # Save cache
       - name: "Save phpstan cache"
         uses: actions/cache/save@v3
         if: always()
         with:
           path: ./.github/tmp
-          key: "phpstan-cache-PR-${{ matrix.php-version }}-${{ github.run_id }}"
+          key: "phpstan-cache-${{ matrix.php-version }}-${{ github.run_id }}"
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 00000000000..345048e8955
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,72 @@
+---
+name: pre-commit
+on:
+  pull_request:
+  push:
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    env:
+      LOG_TO_CS: .github/logToCs.py
+      RAW_LOG: pre-commit.log
+      CS_XML: pre-commit.xml
+    steps:
+      - name: Install required tools
+        run: sudo apt-get update && sudo apt-get install cppcheck
+        if: false
+      # Checkout git sources to analyze
+      - uses: actions/checkout@v4
+      # ???
+      - name: Create requirements.txt if no requirements.txt or pyproject.toml
+        run: |-
+          [ -r requirements.txt ] || [ -r pyproject.toml ] || touch requirements.txt
+      # Install python and pre-commit tool
+      - uses: actions/setup-python@v4
+        with:
+          cache: pip
+          python-version: '3.11'
+      - run: python -m pip install pre-commit regex
+      # Restore previous cache of precommit
+      - uses: actions/cache/restore@v3
+        with:
+          path: ~/.cache/pre-commit/
+          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      # Run all the precommit tools (defined into pre-commit-config.yaml). We can force exclusion of some of them here.
+      - name: Run pre-commit hooks
+        env:
+          # SKIP is used by pre-commit to not execute certain hooks
+          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer
+        run: |
+          set -o pipefail
+          pre-commit gc
+          pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
+      # If error, we convert log in the checkstyle format
+      - name: Convert Raw Log to CheckStyle format
+        if: ${{ failure() }}
+        run: |
+          python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML}
+      # Annotate the git sources with the log messages
+      - name: Annotate Source Code with Messages
+        uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+        if: ${{ failure() }}
+        with:
+          files: ${{ env.CS_XML }}
+          notices-as-warnings: true  # optional
+          prepend-filename: true  # optional
+      # Save the precommit cache
+      - uses: actions/cache/save@v3
+        if: ${{ always() }}
+        with:
+          path: ~/.cache/pre-commit/
+          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml')
+            }}
+      # Upload result log files of precommit into the Artifact shared store
+      - name: Provide log as artifact
+        uses: actions/upload-artifact@v3
+        if: ${{ always() }}
+        with:
+          name: precommit-logs
+          path: |
+            ${{ env.RAW_LOG }}
+            ${{ env.CS_XML }}
+          retention-days: 2
diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index af04675d48d..266227fc057 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -7,7 +7,7 @@ on:
   issue_comment:
     types: [created]
   workflow_dispatch:
-  
+
 permissions: {} # none
 
 jobs:
@@ -26,4 +26,3 @@ jobs:
         days-before-close: 10
         operations-per-run: 100
         dry-run: false
-        
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000000..a3220cc9d85
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,137 @@
+---
+exclude: (?x)^( htdocs/includes/ckeditor/.* )
+repos:
+  # Several miscellaneous checks and fix (on yaml files, end of files fix)
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: no-commit-to-branch
+        args: [--branch, develop, --pattern, \d+.0]
+      - id: check-yaml
+        args: [--unsafe]
+      - id: check-json
+      - id: mixed-line-ending
+        exclude: (?x)^(htdocs/includes/tecnickcom/tcpdf/fonts/.*)$
+      - id: trailing-whitespace
+        exclude_types: [markdown]
+      - id: end-of-file-fixer
+        types: [yaml]
+      - id: check-merge-conflict
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
+        exclude: (?x)^( dev/tools/dolibarr-postgres2mysql.php |test/other/test_serialize.php
+          |test/phpunit/textutf8.txt |test/phpunit/textiso.txt |htdocs/includes/.*
+          |htdocs/modulebuilder/template/.* |build/debian/dolibarr.postrm |build/debian/dolibarr.postinst
+          |build/debian/dolibarr.config )$
+      - id: fix-byte-order-marker
+      - id: check-case-conflict
+
+  # Beautify shell scripts
+  - repo: https://github.com/lovesegfault/beautysh.git
+    rev: v6.2.1
+    hooks:
+      - id: beautysh
+        exclude: (?x)^(dev/setup/git/hooks/pre-commit)$
+        args: [--tab]
+
+  # Run local script
+  - repo: local
+    hooks:
+      - id: local-precommit-script
+        name: Run local script before commit if it exists
+        language: system
+        entry: bash -c '[ ! -x local.sh ] || ./local.sh'
+        pass_filenames: false
+
+  # Check PHP syntax
+  - repo: https://github.com/bolovsky/pre-commit-php
+    rev: 1.5.1
+    hooks:
+      - id: php-cbf
+        files: \.(php)$
+        args: [-p]
+      - id: php-cs
+      - id: php-lint
+
+  # Prettier (format code, only for non common files)
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.0.3
+    hooks:
+      - id: prettier
+        stages: [manual]
+        exclude: (?x)^( .*\.(phar |min\.css |lock) |htdocs/(includes|theme/common)/.*
+          )$
+        exclude_types:
+          - php
+          - executable
+          - binary
+          - shell
+          - javascript
+          - markdown
+          - html
+          - less
+          - plain-text
+          - scss
+          - css
+          - yaml
+
+  # Check format of yam files
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.32.0
+    hooks:
+      - id: yamllint
+        args:
+          - --no-warnings
+          - -d
+          - '{extends: relaxed, rules: {line-length: {max: 120}}}'
+
+  # Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.5
+    hooks:
+      - id: codespell
+        # Due to a current limitation of configuration files,
+        # we can specify two dicts only on the CLI.
+        # You can update the contents of the exclude-file codespell-lines-ignore with the script
+        # dev/tools/codespell/addCodespellIgnores.sh
+        args:
+          - -D
+          - '-'
+          - -D
+          - dev/tools/codespell/codespell-dict.txt
+          - -I
+          - dev/tools/codespell/codespell-ignore.txt
+          - -x
+          - dev/tools/codespell/codespell-lines-ignore.txt
+          - --uri-ignore-words-list
+          - ned
+        exclude: (?x)^(.phan/stubs/.*)$
+        additional_dependencies: [tomli]
+      - alias: codespell-lang-en_US
+        # Only for translations with specialised exceptions
+        # -D contains predefined conversion dictionaries
+        # -L is to ignore some words
+        id: codespell
+        files: ^htdocs/langs/en_US/.*$
+        args:
+          - -D
+          - '-'
+          - -D
+          - dev/tools/codespell/codespell-dict.txt
+          - -L
+          - informations,medias,uptodate,reenable,crypted,developpers
+          - -L
+          - "creat,unitl,alltime,datas,referers"
+          - -I
+          - dev/tools/codespell/codespell-ignore.txt
+          - -x
+          - dev/tools/codespell/codespell-lines-ignore.txt
+          - --uri-ignore-words-list
+          - ned
+
+  # Check some shell scripts
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.9.0.5
+    hooks:
+      - id: shellcheck
+        args: [-W, '100']
diff --git a/.travis.yml b/.travis.yml
index 5c42cd5371e..686b2d72176 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ jobs:
     - stage: PHP min and max
       if: type = push
       php: '7.1'
-      env: 
+      env:
       - DB=postgresql
       - TRAVIS_PHP_VERSION=7.1
     - stage: PHP min and max
@@ -49,7 +49,7 @@ jobs:
     - stage: PHP 8.3
       if: type = push AND branch = develop
       php: '8.3'
-      env: 
+      env:
       - DB=mysql
       - TRAVIS_PHP_VERSION=8.3
 
@@ -89,7 +89,7 @@ before_install:
   if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then
   	sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3
   fi
-  
+
 - |
   echo Install pgsql if run is for pgsql
   if [ "$DB" = 'postgresql' ]; then
@@ -116,15 +116,15 @@ install:
 - |
   if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
     sudo update-alternatives --set php /usr/bin/php7.1
-  fi 
+  fi
   if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
     sudo update-alternatives --set php /usr/bin/php8.1
-  fi 
+  fi
   if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
     sudo update-alternatives --set php /usr/bin/php8.2
-  fi 
+  fi
   php -i | head -
-  
+
 - |
   echo "Updating Composer config"
   curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
@@ -133,7 +133,7 @@ install:
   php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
   sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
   sudo chmod -R a+rwx /usr/local/bin/composer
-  
+
   #sudo apt install composer
   composer -V
   composer -n config -g vendor-dir htdocs/includes
@@ -229,7 +229,7 @@ before_script:
       #sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa
       sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa &
       sleep 3
-      sudo ps fauxww 
+      sudo ps fauxww
       echo "MySQL set root password"
       sudo mysql -u root -h 127.0.0.1 -e "FLUSH PRIVILEGES; CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8'; ALTER USER 'root'@'localhost' IDENTIFIED BY 'password'; CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'password'; CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON travis.* TO root@127.0.0.1; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;"
       echo "MySQL grant"
@@ -238,7 +238,7 @@ before_script:
       sudo mysql -u root -h 127.0.0.1 -ppassword -e 'use mysql; select * from user;'
       echo "List pid file"
       sudo mysql -u root -h 127.0.0.1 -ppassword -e "show variables like '%pid%';"
-      
+
       #sudo kill `cat /var/lib/mysqld/mysqld.pid`
       #sudo systemctl start mariadb
 
@@ -246,7 +246,7 @@ before_script:
       sudo mysql -u root -h 127.0.0.1 -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
       echo "MySQL flush"
       sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES;'
-      
+
       echo "MySQL load sql"
       sudo mysql -u root -h 127.0.0.1 -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
     fi
@@ -415,12 +415,12 @@ script:
     echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
     #cat $INSTALL_FORCED_FILE
     echo
-  
+
   - |
     echo "Upgrading Dolibarr"
     # Ensure we catch errors with -e. Set this to +e if you want to go to the end to see log files.
     # Note: We keep +e because with pgsql, one of upgrade process fails even if migration seems ok, so
-    # I disable stop on error to be able to continue. 
+    # I disable stop on error to be able to continue.
     set +e
     cd htdocs/install
     php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
@@ -483,6 +483,9 @@ script:
     php upgrade.php 18.0.0 19.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade18001900.log || cat $TRAVIS_BUILD_DIR/upgrade18001900.log
     php upgrade2.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-2.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-2.log
     php step5.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-3.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-3.log
+    php upgrade.php 19.0.0 20.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade19002000.log || cat $TRAVIS_BUILD_DIR/upgrade19002000.log
+    php upgrade2.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-2.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-2.log
+    php step5.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-3.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-3.log
     set +e
     echo
 
diff --git a/COPYRIGHT b/COPYRIGHT
index fc50ab2093e..e35a544e3d0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -69,7 +69,6 @@ jQuery jquerytreeview  1.4.1         MIT License                 Yes
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
-JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI              2.2.10        GPL-2+                      Yes             JS library to offer the REST API explorer
 
 Image libraries:
@@ -79,7 +78,7 @@ Font libraries:
 Fontawesome            5.13          Font Awesome Free Licence   Yes
 
 
-For more licenses compatibility informations: https://www.gnu.org/licenses/licenses.en.html
+For more licenses compatibility information: https://www.gnu.org/licenses/licenses.en.html
 
 
 Authors
diff --git a/build/README b/build/README
index 19cf4ad1ec2..dc9c743175f 100644
--- a/build/README
+++ b/build/README
@@ -34,7 +34,7 @@ See makepack-howto.txt for prerequisites.
 
 --------------------------------------------------------------------------------------------------
 
-- To build developper documentation, launch the script
+- To build developer documentation, launch the script
 > perl dolibarr-doxygen-build.pl
 
 
diff --git a/build/debian/README.howto b/build/debian/README.howto
index 45df1e9df70..f01add2f013 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -81,7 +81,7 @@ export QUILT_PATCHES=debian/patches
 # dpkg -l                                List all packages
 # dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
-# dpkg -I package.deb                    Give informations on package
+# dpkg -I package.deb                    Give information on package
 # dpkg -i package.deb                    Install a package
 # dpkg-reconfigure -plow package         Reconfigure package
 # dpkg -L packagename                    List content of installed package 
@@ -173,7 +173,7 @@ or
 > ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
+> schroot -c name_of_chroot  (example schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
 > apt-get install vim dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
@@ -249,7 +249,7 @@ ou
 > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]
 
 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
+Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommitted file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
@@ -345,7 +345,7 @@ To update dolibarr debian package when only files not into debian has changed:
 
 * Checkout the branch you want to work on: master of debian/...  
 * Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
-* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
+* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
 * Update the debian/changelog to add entry of change.
 
 Once files has been prepared, it's time to test:
@@ -357,7 +357,7 @@ ou
 > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
 
 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
+Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommitted file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
diff --git a/build/debian/control b/build/debian/control
old mode 100755
new mode 100644
diff --git a/build/debian/copyright b/build/debian/copyright
index b99b8a65b5d..5f1b73d9b64 100644
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -64,7 +64,7 @@ License: GPL-3+
 Files: htdocs/includes/ckeditor/*
 Copyright: 2003-2012 CKSource - Frederico Knabben
 License: GPL-2+
- The ckeditor is tripple licensed under the GNU General Public License (GPL),
+ The ckeditor is triple licensed under the GNU General Public License (GPL),
  GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL).
  In Debian, it is distributed under the GNU General Public License (GPL).
  .
diff --git a/build/debian/dolibarr.config b/build/debian/dolibarr.config
index 931c5d502df..d9f5d9a3f37 100644
--- a/build/debian/dolibarr.config
+++ b/build/debian/dolibarr.config
@@ -2,6 +2,8 @@
 # Debian install package run: config, preinst, prerm, postinst, postrm
 #
 
+# shellcheck disable=1091,2034
+
 set -e
 
 
diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 1ae26c74025..651f48e7066 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -1,6 +1,8 @@
 #!/bin/sh
 # postinst script for dolibarr
 
+# shellcheck disable=1091,2086,2154
+
 set -e
 
 # summary of how this script can be called:
diff --git a/build/debian/dolibarr.postrm b/build/debian/dolibarr.postrm
index d10f81c0c3e..6d877b16dfb 100644
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@@ -3,6 +3,8 @@
 #
 # see: dh_installdeb(1)
 
+# shellcheck disable=1091,2006,2034,2086,2089,2090
+
 #set -e
 set +e
 
diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh
index fdd38ea0851..9b2de84c7a3 100755
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# shellcheck disable=2034,2086,2103,2164
+
 tmpdir=$(mktemp -d)
 
 
diff --git a/build/debian/rules b/build/debian/rules
index df6abfd1b89..5f8b14e49ea 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -4,7 +4,7 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
-#export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
+#export DH_COMPAT=7    # This is the debhelper compatibility version to use, now defined into compat file
 
 
 %:
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index 69f9e8e227c..07bc35947cf 100755
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -2,8 +2,8 @@
 # Script used by the Dockerfile.
 # See README.md to know how to create a Dolibarr env with docker
 
-usermod -u ${HOST_USER_ID} www-data
-groupmod -g ${HOST_USER_ID} www-data
+usermod -u "${HOST_USER_ID}" www-data
+groupmod -g "${HOST_USER_ID}" www-data
 
 chgrp -hR www-data /var/www/html
 chmod g+rwx /var/www/html/conf
@@ -15,8 +15,8 @@ fi
 echo "[docker-run] => Set Permission to www-data for /var/documents"
 chown -R www-data:www-data /var/documents
 
-echo "[docker-run] => update ${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
-cat <<EOF > ${PHP_INI_DIR}/conf.d/dolibarr-php.ini
+echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
+cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
 date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
 memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
 EOF
diff --git a/build/docker/mariadb/Dockerfile b/build/docker/mariadb/Dockerfile
index a4db0f42065..792f0623bd4 100644
--- a/build/docker/mariadb/Dockerfile
+++ b/build/docker/mariadb/Dockerfile
@@ -1,3 +1,3 @@
 FROM mariadb:latest
-# Enable comented out UTF8 charset/collation options
+# Enable commented out UTF8 charset/collation options
 RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf
diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl
index 5a4849a3a5b..32a852f22d8 100755
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 #--------------------------------------------------------------------
-# Lance la generation de la doc dev doxygen
+# Start the generation of the development documentation with doxygen
 #--------------------------------------------------------------------
 
-# Detecte repertoire du script
+# Determine the patho of this script
 ($DIR=$0) =~ s/([^\/\\]+)$//;
 $DIR||='.';
 $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index debb1ce6301..d6fc7b1ef9e 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -283,10 +283,10 @@ TYPEDEF_HIDES_STRUCT = NO
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
+# causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
diff --git a/build/doxygen/doxygen-awesome.css b/build/doxygen/doxygen-awesome.css
index 0b1c8c20892..21150c99adc 100644
--- a/build/doxygen/doxygen-awesome.css
+++ b/build/doxygen/doxygen-awesome.css
@@ -160,7 +160,7 @@ html {
     --toc-background: var(--side-nav-background);
     --toc-foreground: var(--side-nav-foreground);
 
-    /* height of an item in any tree / collapsable table */
+    /* height of an item in any tree / collapsible table */
     --tree-item-height: 30px;
 
     --memname-font-size: var(--code-font-size);
diff --git a/build/launchpad/README b/build/launchpad/README
index fc284e70b20..b1ebcd25678 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -49,7 +49,7 @@ If you want to build/test package locally:
     Use URL pattern (stable):
     For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
     
-- For Dev, you can also add link serie to GIT HEAD.
+- For Dev, you can also add link series to GIT HEAD.
 - For stable, you can init from command line
 	cd bzr/dolibarr-stable
     bzr init
diff --git a/build/makepack-dolibarrtheme.pl b/build/makepack-dolibarrtheme.pl
index 954111a09cb..2171d87922e 100755
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -258,7 +258,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
     if ($CHOOSEDTARGET{$target} < 0) {
         print "Package $target not built (bad requirement).\n";
     } else {
-        print "Package $target built succeessfully in $DESTI\n";
+        print "Package $target built successfully in $DESTI\n";
     }
 }
 
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index ca228f804d0..654bca95256 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -18,7 +18,7 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke
    See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
 > Add path to ISCC into PATH windows var:
   Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended), 
   open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
 
@@ -47,7 +47,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
 This files describe steps made by Dolibarr packaging team to make a 
 beta version of Dolibarr, step by step.
 
-- Check all files are commited.
+- Check all files are committed.
 - Update version/info in ChangeLog, for this you can: 
 To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
@@ -72,7 +72,7 @@ Recopy the content of the output file into the file ChangeLog.
 This files describe steps made by Dolibarr packaging team to make a 
 complete release of Dolibarr, step by step.
 
-- Check all files are commited.
+- Check all files are committed.
 - Update version/info in ChangeLog, for this you can:
 To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
diff --git a/build/obs/README b/build/obs/README
index 44427c01d49..6b047b42fcf 100644
--- a/build/obs/README
+++ b/build/obs/README
@@ -54,5 +54,5 @@ OBS:QualityCategory   Stable|Testing|Development|Private
 For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
 https://build.opensuse.org/project/show/Application:ERP
 - Once done, go into project, category, subproject and enter a subproject for your application.
-Fo example: Dolibarr
+For example: Dolibarr
 - Then go onto project into your home and ask a publish to the category/you project your created. 
diff --git a/build/patch/README b/build/patch/README
index ec769bd3d71..6b63713122f 100644
--- a/build/patch/README
+++ b/build/patch/README
@@ -4,6 +4,6 @@ Building a Patch file
 ##################################################
 
 This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree. 
-The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
+The output patch file can then be submitted on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
 
 Using this tool is now deprecated. You must use git pull requests to submit contributions.
diff --git a/build/patch/buildpatch.sh b/build/patch/buildpatch.sh
index 9eb787278b3..a2c5787e853 100755
--- a/build/patch/buildpatch.sh
+++ b/build/patch/buildpatch.sh
@@ -10,6 +10,8 @@
 # with explanation on its goal, for inclusion in main branch.
 #----------------------------------------------------------------------------
 
+# shellcheck disable=2086,2291
+
 echo ----- Building patch file mypatch.patch -----
 if [ -z "$1" ] || [ -z "$2" ];
 then
diff --git a/build/phpstan/README b/build/phpstan/README
index 9df049e5526..30f7a20b24e 100644
--- a/build/phpstan/README
+++ b/build/phpstan/README
@@ -5,12 +5,16 @@ PHPStan requires PHP >= 7.1
 
 Config File is: ./phpstan.neon
 
-In dolibarr/build/phpstan
+= Installation =
+
+cd ./build/phpstan
 mkdir phpstan
 cd phpstan
 composer require --dev phpstan/phpstan
 
-Build report from CLI:
+
+= Build report from CLI =
+
 In dolibarr/
 mv htdocs/custom /tmp/
 php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class
@@ -19,4 +23,4 @@ mv /tmp/custom htdocs
 
 Build HTML report from Cron:
 Example of line to add into a cron to generate a HTML report:
-0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
+0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
diff --git a/build/phpstan/bootstrap.php b/build/phpstan/bootstrap.php
index b0cb9f90ef0..8538401f4aa 100644
--- a/build/phpstan/bootstrap.php
+++ b/build/phpstan/bootstrap.php
@@ -16,5 +16,5 @@ if (!defined("NOHTTPSREDIRECT")) {
 	define("NOHTTPSREDIRECT", '1');
 }
 
-global $conf, $langs, $user, $db;
+global $conf, $db, $langs, $user;
 include_once __DIR__ . '/../../htdocs/main.inc.php';
diff --git a/build/phpstan/bootstrap_action.php b/build/phpstan/bootstrap_action.php
index e40a132ead3..1d39c7377f5 100644
--- a/build/phpstan/bootstrap_action.php
+++ b/build/phpstan/bootstrap_action.php
@@ -1,5 +1,16 @@
 <?php
 
+// Load the main.inc.php file to have functions env defined
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1');
+}
+if (!defined("NOSESSION")) {
+	define("NOSESSION", '1');
+}
+if (!defined("NOHTTPSREDIRECT")) {
+	define("NOHTTPSREDIRECT", '1');
+}
+
 // Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
 define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
 define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
@@ -7,9 +18,5 @@ define('DOL_URL_ROOT', '/');
 define('DOL_MAIN_URL_ROOT', '/');
 define('MAIN_DB_PREFIX', 'llx_');
 
-// Load the main.inc.php file to have functions env defined
-define("NOLOGIN", '1');
-define("NOHTTPSREDIRECT", '1');
-
 global $conf, $db, $langs, $user;
 // include_once DOL_DOCUMENT_ROOT . '/../../htdocs/main.inc.php';
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
old mode 100755
new mode 100644
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
old mode 100755
new mode 100644
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
old mode 100755
new mode 100644
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
old mode 100755
new mode 100644
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 6b00d5243b9..58723960150 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -177,14 +177,14 @@ into
 	
 * Removed useless directories ("examples", "tools")
 
-* Optionnaly, removed all fonts except
-    dejavusans* (used by greek, arab, persan, romanian, turkish),
+* Optionally, removed all fonts except
+    dejavusans* (used by greek, arab, person, romanian, turkish),
     freemono* (russian),
     cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
-* Optionnaly, made freemono the default monotype font if we removed courier
+* Optionally, made freemono the default monotype font if we removed courier
 In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
diff --git a/dev/examples/ical/event_recu.txt b/dev/examples/ical/event_recu.txt
index 5bcc491a0b3..2a6b0322595 100644
--- a/dev/examples/ical/event_recu.txt
+++ b/dev/examples/ical/event_recu.txt
@@ -1,4 +1,4 @@
-Example fo recurring event, 1 week, no end, exported by Google
+Example for recurring event, 1 week, no end, exported by Google
 
 # The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
 # first occurrence was moved on tuesday. So this record were added.
@@ -38,7 +38,7 @@ END:VEVENT
 
 
 
-Example fo recurring event, every 2 month, no end, exported by Google
+Example for recurring event, every 2 month, no end, exported by Google
 
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Paris:20150519T080000
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index 554e8ad49d6..68aab032686 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -48,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
 
 
 /*
- * Parametre
+ * Parameter
  */
 
 define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10);
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index 287eaeb173f..4bdcad752ef 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -50,7 +50,7 @@ $listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Doroth
 
 
 /*
- * Parametre
+ * Parameter
  */
 
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index a0e40d7b883..4157cee8686 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -153,7 +153,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 		}
 		$object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
 		if (empty($object->cond_reglement_id)) {
-			print " - Error cant find payment mode for ".$condpayment."\n";
+			print " - Error can't find payment mode for ".$condpayment."\n";
 			$errorrecord++;
 		}
 	}
diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index be971b4d4be..f50b4084c63 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -12,6 +12,8 @@
 # Usage: initdemo.sh confirm
 # usage: initdemo.sh confirm mysqldump_dolibarr_x.x.x.sql database port login pass
 #------------------------------------------------------
+# shellcheck disable=2006,2034,2046,2064,2068,2086,2155,2166,2186,2172,2268
+# shellcheck disable=2012,2016,2115
 
 
 export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index 1e5d96d1bb0..e2929441e76 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -8,6 +8,8 @@
 # Usage: initdemopassword.sh confirm
 # usage: initdemopassword.sh confirm base port login pass
 #------------------------------------------------------
+# shellcheck disable=2006,2034,2046,2064,2068,2086,2155,2166,2186,2172,2268
+# shellcheck disable=2012,2016,2154
 
 
 export mydir=`echo "$0" | sed -e 's/initdemopassword.sh//'`;
diff --git a/dev/initdemo/removeconfdemo.sh b/dev/initdemo/removeconfdemo.sh
index 9bbb01be2a6..a076ebc975b 100755
--- a/dev/initdemo/removeconfdemo.sh
+++ b/dev/initdemo/removeconfdemo.sh
@@ -9,7 +9,7 @@
 # WARNING: This script erase setup of instance,
 # but not the database
 #------------------------------------------------------
-
+# shellcheck disable=2006,2034,2046,2064,2068,2086,2155,2166,2186,2172,2268
 
 export mydir=`echo "$0" | sed -e 's/removedemo.sh//'`;
 if [ "x$mydir" = "x" ]
diff --git a/dev/initdemo/savedemo.sh b/dev/initdemo/savedemo.sh
index 9b509aba788..3e1951fe78d 100755
--- a/dev/initdemo/savedemo.sh
+++ b/dev/initdemo/savedemo.sh
@@ -9,7 +9,7 @@
 # Usage: savedemo.sh
 # usage: savedemo.sh mysqldump_dolibarr_x.x.x.sql database port login pass
 #------------------------------------------------------
-
+# shellcheck disable=2012,2006,2034,2046,2064,2086,2155,2166,2186,2172,2268
 
 export mydir=`echo "$0" | sed -e 's/savedemo.sh//'`;
 if [ "x$mydir" = "x" ]
diff --git a/dev/setup/apache/virtualhost b/dev/setup/apache/virtualhost
index 7eff1859d4f..798031fb404 100644
--- a/dev/setup/apache/virtualhost
+++ b/dev/setup/apache/virtualhost
@@ -71,7 +71,7 @@
     </Files>
 
 
-	# Log directoves        
+	# Log directives        
 	ErrorLog /var/log/apache2/myvirtualalias_error_log
 	TransferLog /var/log/apache2/myvirtualalias_access_log
 	
@@ -82,7 +82,7 @@
 	AddEncoding gzip .jgz
 
 
-	# Add cach performance directives
+	# Add cache performance directives
 	ExpiresActive On
 	ExpiresByType image/x-icon A2592000
 	ExpiresByType image/gif A2592000
diff --git a/dev/setup/codesniffer/php.ini b/dev/setup/codesniffer/php.ini
index 00f3b2d4efa..6a5fa9b6292 100644
--- a/dev/setup/codesniffer/php.ini
+++ b/dev/setup/codesniffer/php.ini
@@ -1533,7 +1533,7 @@ session.cache_expire = 180
 ; - User may send URL contains active session ID
 ;   to other person via. email/irc/etc.
 ; - URL that contains active session ID may be stored
-;   in publically accessible computer.
+;   in publicly accessible computer.
 ; - User may access your site with the same session ID
 ;   always using URL stored in browser's history or bookmarks.
 ; http://php.net/session.use-trans-sid
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e286450f73b..4949fda7800 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -110,7 +110,7 @@
 	</rule> -->
 
 
-	<!-- Check assignement have the = align on each line. Have 20 chars padding maximum and always show as errors -->
+	<!-- Check assignment have the = align on each line. Have 20 chars padding maximum and always show as errors -->
 	<!--  Disabled: Report some false warning
 		<rule ref="Generic.Formatting.MultipleStatementAlignment">
 		<properties>
@@ -136,7 +136,7 @@
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="complexity" value="250" />
-            <property name="absoluteComplexity" value="400" />
+            <property name="absoluteComplexity" value="500" />
         </properties>
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
diff --git a/dev/setup/fail2ban/jail.local b/dev/setup/fail2ban/jail.local
index 4bb38de2cfa..0c7a90e1eeb 100644
--- a/dev/setup/fail2ban/jail.local
+++ b/dev/setup/fail2ban/jail.local
@@ -1,5 +1,5 @@
 #
-# Examle of rule you can add to fail2ban to restrict bruteforce attacks.
+# Example of rule you can add to fail2ban to restrict bruteforce attacks.
 #
 
 
diff --git a/dev/setup/git/hooks/pre-commit b/dev/setup/git/hooks/pre-commit
index 0bb002bade5..033e8556112 100755
--- a/dev/setup/git/hooks/pre-commit
+++ b/dev/setup/git/hooks/pre-commit
@@ -6,21 +6,21 @@
 # When running git commit, it first execute this file checking only modified files, so it is faster than running on all files
 # To run the fix manually: cd ~/git/dolibarr; phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true "fileordir"
 
-PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
-STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep -v '/includes/'| grep \\\\.php`
+PROJECT=$(php -r "echo dirname(dirname(dirname(realpath('$0'))));")
+STAGED_FILES_CMD=$(git diff --cached --name-only --diff-filter=ACMR HEAD | grep -v '/includes/'| grep \\\\.php)
 DIRPHPCS=""
 AUTOFIX=1
 
-echo "Running precommit hook in .git/hooks/pre-commit" 1>&2;
+echo "Running precommit hook in .git/hooks/pre-commit" 1>&2
 
 # Determine if a file list is passed
 if [ "$#" -eq 1 ]
 then
-  oIFS=$IFS
-  IFS='
+	oIFS=$IFS
+  	IFS='
   '
-    SFILES="$1"
-    IFS=$oIFS
+	SFILES="$1"
+	IFS=$oIFS
 fi
 SFILES=${SFILES:-$STAGED_FILES_CMD}
 
@@ -28,47 +28,50 @@ echo "Checking PHP Lint with php -l ..."
 
 for FILE in $SFILES
 do
-    php -l -d display_errors=0 $PROJECT/$FILE
+	php -l -d display_errors=0 "$PROJECT/$FILE"
 
-    result1=$?
+	result1=$?
 
-    if [ "x$result1" != "x0" ]
-    then
-        echo "Fix the error before commit." 1>&2;
-        exit 1
-    fi
-    FILES="$FILES $PROJECT/$FILE"
+	if [ "x$result1" != "x0" ]
+	then
+		echo "Fix the error before commit." 1>&2
+		exit 1
+	fi
+	# shellcheck disable=2089
+	FILES="$FILES '$PROJECT/$FILE'"
 done
 
 
 if [ "$FILES" != "" ]
 then
-    echo "Running PHPCS Code Sniffer..."
+	echo "Running PHPCS Code Sniffer..."
 
-    # Check Dolibarr standard
-    ${DIRPHPCS}phpcs -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+	# Check Dolibarr standard
+	# shellcheck disable=2086,2090
+	"${DIRPHPCS}phpcs" -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
 
-    # Check a common standard
-    #${DIRPHPCS}phpcs -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=PSR2 --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+	# Check a common standard
+	#${DIRPHPCS}phpcs -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=PSR2 --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
 
-    result2=$?
+	result2=$?
 
-    if [ "x$result2" != "x0" ]
-    then
-        # Fix standard errors
-        if [ "x$AUTOFIX" != "x0" ]
-        then
-            ${DIRPHPCS}phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+	if [ "x$result2" != "x0" ]
+	then
+		# Fix standard errors
+		if [ "x$AUTOFIX" != "x0" ]
+		then
+			# shellcheck disable=2086,2090
+			"${DIRPHPCS}phpcbf" -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
 
-            #${DIRPHPCS}phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=htdocs/custom/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+			#${DIRPHPCS}phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=htdocs/custom/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
 
-            echo "Found some errors in syntax rules. An automatic fix has been applied. Check it before commit." 1>&2;
-            exit 1
-        else
-            echo "Found some errors in syntax rules. Fix the error(s) before commit." 1>&2;
-            exit 1
-        fi
-    fi
+			echo "Found some errors in syntax rules. An automatic fix has been applied. Check it before commit." 1>&2
+			exit 1
+		else
+			echo "Found some errors in syntax rules. Fix the error(s) before commit." 1>&2;
+			exit 1
+		fi
+	fi
 fi
 
 exit 0
diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 369f797e204..3a70fc142c4 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -19,7 +19,7 @@
 
 /**
  * \file    dev/tools/apstats.php
- * \brief   Script to report Advanced Statistics on a coding project
+ * \brief   Script to report Advanced Statistics on a coding PHP project
  */
 
 
@@ -38,7 +38,7 @@ error_reporting(E_ALL & ~E_DEPRECATED);
 define('PRODUCT', "apstats");
 define('VERSION', "1.0");
 
-$phpstanlevel = 2;
+$phpstanlevel = 3;
 
 
 print '***** '.constant('PRODUCT').' - '.constant('VERSION').' *****'."\n";
@@ -88,6 +88,10 @@ $resexec = shell_exec($commandcheck);
 $resexec = (int) (empty($resexec) ? 0 : trim($resexec));
 */
 
+// Retrieve the .git information
+$urlgit = 'https://github.com/Dolibarr/dolibarr/blob/develop/';
+
+
 // Count lines of code of application
 $commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=htdocs/includes,htdocs/custom,htdocs/theme/common/fontawesome-5,htdocs/theme/common/octicons';
 print 'Execute SCC to count lines of code in project: '.$commandcheck."\n";
@@ -111,6 +115,16 @@ $output_arrtd = array();
 $resexectd = 0;
 exec($commandcheck, $output_arrtd, $resexectd);
 
+
+// Count lines of code of dependencies
+$commandcheck = "git log --shortstat --no-renames --no-merges --use-mailmap --pretty='format:%cI;%H;%aN;%ae;%ce'";	// --since=  --until=...
+print 'Execute git log to count number of commits by day: '.$commandcheck."\n";
+$output_arrglpu = array();
+$resexecglpu = 0;
+//exec($commandcheck, $output_arrglpu, $resexecglpu);
+
+
+
 $arrayoflineofcode = array();
 $arraycocomo = array();
 $arrayofmetrics = array(
@@ -172,6 +186,15 @@ foreach (array('proj', 'dep') as $source) {
 	}
 }
 
+// Search the max
+$arrayofmax = array('Lines'=>0);
+foreach (array('proj', 'dep') as $source) {
+	foreach ($arrayoflineofcode[$source] as $val) {
+		$arrayofmax['Lines'] = max($arrayofmax['Lines'], $val['Lines']);
+	}
+}
+
+
 $timeend = time();
 
 
@@ -239,7 +262,7 @@ th,td {
 	display: none;
 }
 .trgroup {
-	background-color: #EEE;
+	border-bottom: 1px solid #aaa;
 }
 .seedetail {
 	color: #000088;
@@ -257,6 +280,14 @@ th,td {
 	text-align: center;
 	margin-left: 10px;
 }
+.boxallwidth {
+    border-radius: 9px;
+    border-color: #000;
+    border-width: 2px;
+    padding: 5px;
+    border-style: solid;
+	background-color: #f8f8f8;
+}
 .back1 {
 	background-color: #884466;
 	color: #FFF;
@@ -279,8 +310,23 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
     min-height: 0.01%;
 }
-
-
+.list_technical_debt {
+	/* font-size: smaller */
+}
+.pictofixedwidth {
+	font-size: smaller;
+    width: 28px;
+    vertical-align: middle;
+}
+.bargraph {
+	background-color: #358;
+}
+.small {
+	font-size: smaller;
+}
+.fr {
+	float: right;
+}
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
 {
@@ -296,14 +342,20 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
 
 $html .= '<body>'."\n";
 
+
+// Header
+
 $html .= '<header>'."\n";
 $html .= '<h1>Advanced Project Statistics</h1>'."\n";
 $currentDate = date("Y-m-d H:i:s"); // Format: Year-Month-Day Hour:Minute:Second
 $html .= '<span class="opacitymedium">Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds</span>'."\n";
 $html .= '</header>'."\n";
 
+
+// Lines of code
+
 $html .= '<section class="chapter" id="linesofcode">'."\n";
-$html .= '<h2>Lines of code</h2>'."\n";
+$html .= '<h2><span class="fas fa-code pictofixedwidth"></span>Lines of code</h2>'."\n";
 
 $html .= '<div class="div-table-responsive">'."\n";
 $html .= '<div class="boxallwidth">'."\n";
@@ -313,6 +365,7 @@ $html .= '<th class="left">Language</th>';
 $html .= '<th class="right">Bytes</th>';
 $html .= '<th class="right">Files</th>';
 $html .= '<th class="right">Lines</th>';
+$html .= '<th></th>';
 $html .= '<th class="right">Blanks</th>';
 $html .= '<th class="right">Comments</th>';
 $html .= '<th class="right">Code</th>';
@@ -325,14 +378,15 @@ foreach (array('proj', 'dep') as $source) {
 	} elseif ($source == 'dep') {
 		$html .= '<td>All files of dependencies only';
 	}
-	$html .= ' &nbsp; &nbsp; <span class="seedetail" data-source="'.$source.'">(See detail per file type...)</span>';
+	$html .= ' &nbsp; &nbsp; <div class="seedetail fr" data-source="'.$source.'"><span class="fas fa-chart-bar pictofixedwidth"></span>See detail per file type...</span>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Bytes']).'</td>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Files']).'</td>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Lines']).'</td>';
+	$html .= '<td></td>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Blanks']).'</td>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Comments']).'</td>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Code']).'</td>';
-	$html .= '<td></td>';
+	//$html .= '<td></td>';
 	$html .= '</tr>';
 	if (!empty($arrayoflineofcode[$source])) {
 		foreach ($arrayoflineofcode[$source] as $key => $val) {
@@ -341,26 +395,35 @@ foreach (array('proj', 'dep') as $source) {
 			$html .= '<td class="right"></td>';
 			$html .= '<td class="right nowrap">'.(empty($val['Files']) ? '' : formatNumber($val['Files'])).'</td>';
 			$html .= '<td class="right nowrap">'.(empty($val['Lines']) ? '' : formatNumber($val['Lines'])).'</td>';
+			$html .= '<td class="nowrap">';
+			$percent = $val['Lines'] / $arrayofmax['Lines'];
+			$widthbar = round(200 * $percent);
+			$html .= '<div class="bargraph" style="width: '.max(1, $widthbar).'px">&nbsp;</div>';
+			$html .= '</td>';
 			$html .= '<td class="right nowrap">'.(empty($val['Blanks']) ? '' : formatNumber($val['Blanks'])).'</td>';
 			$html .= '<td class="right nowrap">'.(empty($val['Comments']) ? '' : formatNumber($val['Comments'])).'</td>';
 			$html .= '<td class="right nowrap">'.(empty($val['Code']) ? '' : formatNumber($val['Code'])).'</td>';
 			//$html .= '<td class="right">'.(empty($val['Complexity']) ? '' : $val['Complexity']).'</td>';
-			$html .= '<td class="nowrap">TODO graph here...</td>';
+			/*$html .= '<td class="nowrap">';
+			$html .= '';
+			$html .= '</td>';
+			*/
 			$html .= '</tr>';
 		}
 	}
 }
 
-$html .= '<tr class="trgroup">';
+$html .= '<tr class="trgrouptotal">';
 $html .= '<td class="left">Total</td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Bytes'] + $arrayofmetrics['dep']['Bytes']).'</td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Files'] + $arrayofmetrics['dep']['Files']).'</td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Lines'] + $arrayofmetrics['dep']['Lines']).'</td>';
+$html .= '<td></td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Blanks'] + $arrayofmetrics['dep']['Blanks']).'</td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Comments'] + $arrayofmetrics['dep']['Comments']).'</td>';
 $html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Code'] + $arrayofmetrics['dep']['Code']).'</td>';
 //$html .= '<td>'.$arrayofmetrics['Complexity'].'</td>';
-$html .= '<td></td>';
+//$html .= '<td></td>';
 $html .= '</tr>';
 $html .= '</table>';
 $html .= '</div>';
@@ -368,18 +431,55 @@ $html .= '</div>';
 
 $html .= '</section>'."\n";
 
+
+// Contributions
+
 $html .= '<section class="chapter" id="projectvalue">'."\n";
-$html .= '<h2>Project value</h2><br>'."\n";
+$html .= '<h2><span class="fas fa-tasks pictofixedwidth"></span>Contributions</h2>'."\n";
+
+$html .= '<div class="boxallwidth">'."\n";
+
+$html .= 'TODO...';
+
+$html .= '<!-- ';
+foreach ($output_arrglpu as $line) {
+	$html .= $line."\n";
+}
+$html .= ' -->';
+
+$html .= '</div>';
+
+$html .= '</section>'."\n";
+
+
+// Contributors
+
+$html .= '<section class="chapter" id="projectvalue">'."\n";
+$html .= '<h2><span class="fas fa-user pictofixedwidth"></span>Contributors</h2>'."\n";
+
+$html .= '<div class="boxallwidth">'."\n";
+
+$html .= 'TODO...';
+
+$html .= '</div>';
+
+$html .= '</section>'."\n";
+
+
+// Project value
+
+$html .= '<section class="chapter" id="projectvalue">'."\n";
+$html .= '<h2><span class="fas fa-dollar-sign pictofixedwidth"></span>Project value</h2>'."\n";
 
 $html .= '<div class="boxallwidth">'."\n";
 $html .= '<div class="box inline-box back1">';
-$html .= 'COCOMO value<br><span class="small">(Basic organic model)</span><br>';
+$html .= 'COCOMO value<br><span class="small opacitymedium">(Basic organic model)</span><br>';
 $html .= '<b>$'.formatNumber((empty($arraycocomo['proj']['currency']) ? 0 : $arraycocomo['proj']['currency']) + (empty($arraycocomo['dep']['currency']) ? 0 : $arraycocomo['dep']['currency']), 2).'</b>';
 $html .= '</div>';
 $html .= '<div class="box inline-box back2">';
-$html .= 'COCOMO effort<br><span class="small">(Basic organic model)</span><br>';
+$html .= 'COCOMO effort<br><span class="small opacitymedium">(Basic organic model)</span><br>';
 $html .= '<b>'.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']);
-$html .= ' monthes people</b>';
+$html .= ' months people</b>';
 $html .= '</div>';
 $html .= '</div>';
 
@@ -392,31 +492,48 @@ foreach ($output_arrtd as $line) {
 	//print $line."\n";
 	preg_match('/^::error file=(.*),line=(\d+),col=(\d+)::(.*)$/', $line, $reg);
 	if (!empty($reg[1])) {
-		$tmp .= '<tr><td>'.$reg[1].'</td><td>'.$reg[2].'</td><td>'.$reg[4].'</td></tr>'."\n";
+		if ($nblines < 20) {
+			$tmp .= '<tr class="nohidden">';
+		} else {
+			$tmp .= '<tr class="hidden sourcephpstan">';
+		}
+		$tmp .= '<td>'.$reg[1].'</td>';
+		$tmp .= '<td class="">';
+		$tmp .= '<a href="'.$urlgit.$reg[1].'#L'.$reg[2].'" target="_blank">'.$reg[2].'</a>';
+		$tmp .= '</td>';
+		$tmp .= '<td>'.$reg[4].'</td>';
+		$tmp .= '</tr>'."\n";
 		$nblines++;
 	}
 }
 
+
+// Technical debt
+
 $html .= '<section class="chapter" id="technicaldebt">'."\n";
-$html .= '<h2>Technical debt <span class="opacitymedium">(PHPStan level '.$phpstanlevel.' -> '.$nblines.' warnings)</span></h2><br>'."\n";
+$html .= '<h2><span class="fas fa-book-dead pictofixedwidth"></span>Technical debt <span class="opacitymedium">(PHPStan level '.$phpstanlevel.' -> '.$nblines.' warnings)</span></h2>'."\n";
 
 $html .= '<div class="div-table-responsive">'."\n";
 $html .= '<div class="boxallwidth">'."\n";
-$html .= '<table class="list_technical_debt">'."\n";
-$html .= '<tr><td>File</td><td>Line</td><td>Type</td></tr>'."\n";
+$html .= '<table class="list_technical_debt centpercent">'."\n";
+$html .= '<tr class="trgroup"><td>File</td><td>Line</td><td>Type</td></tr>'."\n";
 $html .= $tmp;
+$html .= '<tr class="sourcephpstan"><td colspan="3"><span class="seedetail" data-source="phpstan" id="sourcephpstan">Show all...</span></td></tr>';
 $html .= '</table>';
 $html .= '</div>';
 $html .= '</div>';
 
 $html .= '</section>'."\n";
 
+
+// JS code
+
 $html .= '
 <script>
 $(document).ready(function() {
-$( ".seedetail" ).on( "click", function() {
+$(".seedetail").on("click", function() {
 	var source = $(this).attr("data-source");
-  	console.log("Click on "+source);
+  	console.log("Click on "+source+" so we show class .source"+source);
 	jQuery(".source"+source).toggle();
 } );
 });
@@ -425,6 +542,7 @@ $( ".seedetail" ).on( "click", function() {
 $html .= '</body>';
 $html .= '</html>';
 
+// Output report into a HTML file
 $fh = fopen($outputpath, 'w');
 if ($fh) {
 	fwrite($fh, $html);
@@ -432,7 +550,7 @@ if ($fh) {
 
 	print 'Generation of output file '.$outputfile.' done.'."\n";
 } else {
-	print 'Failed to open '.$outputfile.' for ouput.'."\n";
+	print 'Failed to open '.$outputfile.' for output.'."\n";
 }
 
 
@@ -441,7 +559,7 @@ if ($fh) {
  *
  * @param	string|int		$number			Number to format
  * @param	int				$nbdec			Number of decimal digits
- * @return	string							Formated string
+ * @return	string							Formatted string
  */
 function formatNumber($number, $nbdec = 0)
 {
diff --git a/dev/tools/codespell/addCodespellIgnores.sh b/dev/tools/codespell/addCodespellIgnores.sh
new file mode 100755
index 00000000000..476c5ba287e
--- /dev/null
+++ b/dev/tools/codespell/addCodespellIgnores.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# Script to add codespell exceptions to the ignores lines file.
+#
+# The file is named '...-lines-ignore' to make TAB expansion on the cli easier.
+#
+# The line in the ignore file must match the line in the source
+# exactly.
+#
+# To clean up or create the ignored lines file, just do
+#   ```shell
+#   echo > dev/tools/codespell/codespell-lines-ignore.txt
+#   ```
+# and then execute this script
+#
+# author: https://github.com/mdeweerd
+
+codespell_ignore_file=dev/tools/codespell/codespell-lines-ignore.txt
+if [ -z "${0##*.sh}" ] ; then
+	# Suppose running from inside script
+	# Get real path
+	script=$(realpath "$(test -L "$0" && readlink "$0" || echo "$0")")
+	PROJECT_ROOT=$(realpath "${script}")
+
+	while [ "${PROJECT_ROOT}" != "/" ] ; do
+		[ -r "${PROJECT_ROOT}/${codespell_ignore_file}" ] && break
+		PROJECT_ROOT=$(dirname "${PROJECT_ROOT}")
+	done
+	if [ "${PROJECT_ROOT}" == "/" ] ; then
+		echo "Project root not found from '${script}'"
+		exit 1
+	fi
+	codespell_ignore_file=${PROJECT_ROOT}/${codespell_ignore_file}
+fi
+
+
+# Make sure we are at the root of the project
+[ -r "${codespell_ignore_file}" ] || { echo "${codespell_ignore_file} not found" ; exit 1 ; }
+# Then:
+#   - Run codespell;
+#   - For each line, create a grep command to find the lines;
+#   - Execute that command by evaluation
+codespell . | sed -n -E 's@^([^:]+):[[:digit:]]+:[[:space:]](\S+)[[:space:]].*@grep -P '\''\\b\2\\b'\'' "\1" >> '"${codespell_ignore_file}"'@p' | \
+	while read -r line ; do eval "$line" ; done
+
+# Finally, sort and remove duplicates to make merges easier.
+sort -u -o "${codespell_ignore_file}"{,}
+
diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
new file mode 100644
index 00000000000..8d270541fb1
--- /dev/null
+++ b/dev/tools/codespell/codespell-dict.txt
@@ -0,0 +1,8 @@
+dolibar->dolibarr
+dollibar->dolibarr
+dollibarr->dolibarr
+not de passe->password
+mot de passe->password
+choosed->chosen
+tableau de bord->state board
+#DoliDB->DoliDB
diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt
new file mode 100644
index 00000000000..92155095f18
--- /dev/null
+++ b/dev/tools/codespell/codespell-ignore.txt
@@ -0,0 +1,91 @@
+# List of words codespell will ignore
+# one per line, case-sensitive (when not lowercase)
+# PROVid
+provid
+# PostgreSQL
+postgresql
+
+alltime
+ba
+blacklist
+whitelist
+bu
+captial
+categorie
+categories
+crypted
+clos
+contaxt
+courant
+datea
+datee
+errorstring
+exten
+falsy
+master
+medias
+noe
+NOO
+noo
+od
+nd
+udate
+periode
+projet
+referer
+referers
+scrit
+ser
+slave
+savvy
+# Inside email
+suport
+te
+technic
+thead
+udo
+ue
+ro
+ws
+# Code string
+ect
+tempdate
+# checkES
+checkes
+sav
+files'
+# Used as array ke
+seeked
+# Used as translation key
+developpers
+# Used as var
+pice
+# Used as key
+marge
+# htdocs/projet/activity/permonth.php
+tweek
+# moral (var name)
+mor
+# reyear, remonth, reday
+reday
+# Strings used as keys for translation
+uptodate
+reenable
+# Function - rename to devalidate ?
+unvalidate
+# Some french strings
+somme
+caracteres
+cas
+sur
+Datas
+datas
+valide
+raison
+que
+dur
+fonction
+espace
+methode
+# Proper names
+tim
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
new file mode 100644
index 00000000000..2f1cfff2ccc
--- /dev/null
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -0,0 +1,64 @@
+
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">';
+						$reponsesadd = str_split($obj->reponses);
+						$sql .= " SET reponses = '".$db->escape($reponsesadd)."'";
+						$sql .= " SET reponses = '0".$db->escape($obj->reponses)."'";
+						print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
+					GETPOST("mouvement", 'int'),
+					jQuery("#mouvement option").removeAttr("selected").change();
+					jQuery("#mouvement option[value=0]").attr("selected","selected").trigger("change");
+					jQuery("#mouvement option[value=1]").attr("selected","selected").trigger("change");
+					jQuery("#mouvement").trigger("change");
+				$action = 'transfert';
+				$this->category->childs[] = $this->_cleanObjectDatas($cat);
+				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
+				//si les reponses ne concerne pas la colonne effacée, on concatenate
+				GETPOST("mouvement", "int"),
+				GETPOST("mouvement", 'alpha'),
+				GETPOST("mouvement", 'int'),
+				if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+			$action = 'transfert';
+			$ensemblereponses = $obj->reponses;
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses, date_creation)';
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses, ip, date_creation)';
+			$sql = 'SELECT s.reponses';
+			$sql2 .= " SET reponses = '".$db->escape($newcar)."'";
+			$this->category->childs = array();
+			// mise a jour des reponses utilisateurs dans la base
+			if ($user->hasRight('stock', 'mouvement', 'lire')) {
+			jQuery("#mouvement").change(function() {
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+		$action = 'transfert';
+		$ensemblereponses = $obj->reponses;
+		$sql = "SELECT id_users, nom as name, id_sondage, reponses";
+		$sql = "SELECT id_users, nom as name, reponses";
+		$test = '/javas:cript/google.com';
+		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+		if ($user->hasRight('stock', 'mouvement', 'creer')) {
+	$ensemblereponses = $obj->reponses;
+	$opensurveysondage->mail_admin = $_SESSION['adresse'];
+	$pdf->SetXY($savx, $savy);
+	$savy = $pdf->getY();
+	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
+	$sql .= " SET reponses = '".$db->escape($nouveauchoix)."'";
+	<strong>TaskItem(<em>pID, pName, pStart, pEnd, pColor, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt</em>)</strong></p>
+	if ($action == "transfert") {
+	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
+	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
+	print ajax_combobox("mouvement");
+	public $childs = array();
+	unset($_SESSION["adresse"]);
+$permissiontoadd = $user->rights->stock->mouvement->creer;
+$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we should never delete
+$permissiontoread = $user->rights->stock->mouvement->lire;
+$sql = "SELECT id_users, nom as name, id_sondage, reponses";
+$sql = 'SELECT nom as name, reponses';
+$usercancreate = $user->rights->stock->mouvement->creer;
+$usercancreate = (($user->rights->stock->mouvement->creer));
+$usercandelete = $user->rights->stock->mouvement->creer;
+$usercandelete = (($user->rights->stock->mouvement->supprimer));
+$usercanread = $user->rights->stock->mouvement->lire;
+$usercanread = (($user->rights->stock->mouvement->lire));
+if (!$user->hasRight('stock', 'mouvement', 'lire')) {
+if ($action == "transfert") {
diff --git a/dev/tools/dolibarr-mysql2pgsql.pl b/dev/tools/dolibarr-mysql2pgsql.pl
index 2fe03aaf2b5..17dda3cb48b 100755
--- a/dev/tools/dolibarr-mysql2pgsql.pl
+++ b/dev/tools/dolibarr-mysql2pgsql.pl
@@ -159,7 +159,7 @@ foreach my $file (keys %filelist) {
     	}
     	if ($create_sql ne "") { 		# we are inside create table statement so lets process datatypes
 
-    		if (/\);/i) {	# end of create table squence
+    		if (/\);/i) {	# end of create table sequence
     			$create_sql =~ s/,$//g;	# strip last , inside create table
     			&output_create;
     			&reset_vars();
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index b69d83ab510..9b7bed014f7 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -95,7 +95,7 @@ function getfieldname($l)
  * formatsize
  *
  * @param  string $s Size to format
- * @return string      Formated size
+ * @return string      Formatted size
  */
 function formatsize($s)
 {
@@ -417,9 +417,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 
 				$before = str_replace("\"", "`", $before);
 
-				// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string'), but could also be (number, E'string'); so we cant search for the previoous '
+				// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string'), but could also be (number, E'string'); so we can't search for the previous '
 				// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
-				// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
+				// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
 				$after = str_replace(" (E'", " ('", $after);
 				$after = str_replace(", E'", ", '", $after);
 
@@ -439,7 +439,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 
 				// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
 				// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
-				// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
+				// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
 				$after = str_replace(" (E'", " ('", $after);
 				$after = str_replace(", E'", ", '", $after);
 
@@ -457,9 +457,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 
 					// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
 					// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
-					// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
+					// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
 
-					// after the first line, we only need to check for it in the middle, not at the beginning of an insert (becuase the beginning will be on the first line)
+					// after the first line, we only need to check for it in the middle, not at the beginning of an insert (because the beginning will be on the first line)
 					// $after=str_replace(" (E'","' ('",$after);
 					$line = $lines[$linenumber];
 					$line = str_replace("', E'", "', '", $line);
diff --git a/dev/tools/fixaltlanguages.sh b/dev/tools/fixaltlanguages.sh
index 00a271049ca..8d1092744b7 100755
--- a/dev/tools/fixaltlanguages.sh
+++ b/dev/tools/fixaltlanguages.sh
@@ -6,6 +6,8 @@
 #
 # Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
 
+# shellcheck disable=2006,2027,2044,2045,2046,2086,2155,2166,2268
+
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
diff --git a/dev/tools/fixdosfiles.sh b/dev/tools/fixdosfiles.sh
index 92d9a82bca9..c1d1b2d4df6 100755
--- a/dev/tools/fixdosfiles.sh
+++ b/dev/tools/fixdosfiles.sh
@@ -6,6 +6,7 @@
 #------------------------------------------------------
 # Usage: fixdosfiles.sh [list|fix]
 #------------------------------------------------------
+# shellcheck disable=2006,2166,2268
 
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
diff --git a/dev/tools/fixduplicatelangkey.sh b/dev/tools/fixduplicatelangkey.sh
index f792a25df4d..885b2e891cc 100755
--- a/dev/tools/fixduplicatelangkey.sh
+++ b/dev/tools/fixduplicatelangkey.sh
@@ -3,6 +3,7 @@
 #
 # Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
 
+# shellcheck disable=2006,2035,2044,2061,2166,2268
 
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
diff --git a/dev/tools/fixduplicatelanglines.sh b/dev/tools/fixduplicatelanglines.sh
index 8cecb3752ea..f61afbaacd2 100755
--- a/dev/tools/fixduplicatelanglines.sh
+++ b/dev/tools/fixduplicatelanglines.sh
@@ -6,6 +6,8 @@
 #
 # Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
 
+# shellcheck disable=2006,2035,2044,2046,2061,2166,2268
+
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
diff --git a/dev/tools/fixhasRights.sh b/dev/tools/fixhasRights.sh
index d25e6abd0b0..b3ca605c359 100755
--- a/dev/tools/fixhasRights.sh
+++ b/dev/tools/fixhasRights.sh
@@ -1,7 +1,8 @@
-#/bin/bash
+#!/bin/bash
 #
 # Example of script to fix code writing of permissions
 #
+# shellcheck disable=2013,2016,2086
 
 for f in $(grep -l -e 'user->rights' -R); do
 	sed -i -r 's/!empty\(\$user->rights->([_a-z0-9]+)->([_a-z0-9]+)->([_a-z0-9]+)\) *\? *\$user->rights->\1->\2->\3 *: *0;/$user->hasRight("\1", "\2", "\3");/' $f
diff --git a/dev/tools/fixnotabfiles.sh b/dev/tools/fixnotabfiles.sh
index ed4df5e50d8..84acd9ce773 100755
--- a/dev/tools/fixnotabfiles.sh
+++ b/dev/tools/fixnotabfiles.sh
@@ -6,6 +6,7 @@
 #------------------------------------------------------
 # Usage: fixnotabfiles.sh [list|fix]
 #------------------------------------------------------
+# shellcheck disable=2166,2268
 
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
diff --git a/dev/tools/fixperms.sh b/dev/tools/fixperms.sh
index e3d7fe3cc69..a265d7c0dcc 100755
--- a/dev/tools/fixperms.sh
+++ b/dev/tools/fixperms.sh
@@ -7,6 +7,8 @@
 # Usage: fixperms.sh (list|fix)
 #------------------------------------------------------
 
+# shellcheck disable=2166,2268
+
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
diff --git a/dev/tools/fixsnakeCaseToCamelCase.sh b/dev/tools/fixsnakeCaseToCamelCase.sh
index 0cfbf256672..0a9c5bff29b 100755
--- a/dev/tools/fixsnakeCaseToCamelCase.sh
+++ b/dev/tools/fixsnakeCaseToCamelCase.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# shellcheck disable=2002,2004,2028,2034,2053,2068,2086,2116,2143,2207
+
 ## Need "rpl" package
 RPL_INSTALLED=$(dpkg -s rpl)
 if [[ -z ${RPL_INSTALLED} ]]; then
diff --git a/dev/tools/fixutf8bomfiles.sh b/dev/tools/fixutf8bomfiles.sh
index 3d0d7975806..a14205e83c5 100755
--- a/dev/tools/fixutf8bomfiles.sh
+++ b/dev/tools/fixutf8bomfiles.sh
@@ -8,6 +8,7 @@
 #------------------------------------------------------
 # Usage: fixutf8bomfiles.sh [list|fix]
 #------------------------------------------------------
+# shellcheck disable=2006,2028,2086,2089,2090,2166,2268
 
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
diff --git a/dev/tools/github_authors_and_commits_bydate.sh b/dev/tools/github_authors_and_commits_bydate.sh
new file mode 100755
index 00000000000..702dcb8ed0e
--- /dev/null
+++ b/dev/tools/github_authors_and_commits_bydate.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Count number of different contributors and number of commits for a given year or month
+# Can be used for statistics (for example to generate the infography of the year)
+#
+
+PERIOD=$1
+STARTYEAR=$2
+ENDYEAR=$3
+
+DEBUG=${DEBUG:=0}  # Example: run script with DEBUG=1 script arguments
+
+echo "***** github_authors_and_commits_bydate.sh *****"
+
+if [ "$PERIOD" != "byyear" ] && [ "$PERIOD" != "bymonth" ] && [ "$PERIOD" != "byday" ]; then
+	echo "Usage: $0  (byyear|bymonth|byday)  YEARSTART  [YEAREND]"
+	exit 1
+fi
+
+# Default is byyear
+DATEFORMAT="%Y"
+if [ "$PERIOD" = "bymonth" ]; then
+	DATEFORMAT="%Y%m"
+elif [ "$PERIOD" = "byday" ]; then
+	DATEFORMAT="%Y%m%d"
+fi
+
+FROM=${STARTYEAR}-01-01
+TO=${STARTYEAR}-12-31
+if [ "${ENDYEAR}" != "" ]; then
+	TO=${ENDYEAR}-12-31
+else
+	ENDYEAR=9999
+fi
+
+echo "--- Number of different contributors for the period $FROM $TO"
+[ "$DEBUG" -ne 0 ] && echo "git log --use-mailmap --since '$FROM' --before '$TO' | iconv -f UTF-8 -t ASCII//TRANSLIT | grep ^Author | awk -F'<' '{ print $1 }' | sort -u -f -i -b | wc -l" >&2
+git log --since "$FROM" --before "$TO" | iconv -c -f UTF-8 -t ASCII//TRANSLIT | grep '^Author' | awk -F"<" '{ print $1 }' | sort -u -f -i -b | wc -l
+
+
+echo "--- Number of commits $1"
+[ "$DEBUG" -ne 0 ] && echo "git log --use-mailmap --pretty='format:%cd' --date=format:'$DATEFORMAT' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort | uniq -c | awk '{ if (\$2 >= '$1') { print \"Year: \"\$2\", commits: \"\$1 } }'" >&2
+git log --pretty='format:%cd' --date=format:"$DATEFORMAT" | iconv -f UTF-8 -t ASCII//TRANSLIT | sort | uniq -c  | awk '{ if ($2 >= '"${STARTYEAR}"' && $2 <='"${ENDYEAR}"') { print "Year: "$2", commits: "$1 } }'
diff --git a/dev/tools/github_authors_and_commits_peryear.sh b/dev/tools/github_authors_and_commits_peryear.sh
deleted file mode 100755
index cbc20503151..00000000000
--- a/dev/tools/github_authors_and_commits_peryear.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Count number of different contributors and number of commits for a given year.
-# Can be used for statistics (for example to generate the inforgraphy of the year)
-#
-
-if [ "x$1" = "x" ]; then
-	echo "Usage: $0 YEARSTART [YEAREND]"
-	exit
-fi
-
-
-FROM=$1-01-01
-TO=$1-12-31
-
-if [ "x$2" != "x" ]; then
-	TO=$2-12-31
-fi
-
-echo "--- Number of contributors for the year"
-echo "git log --since $FROM --before $TO | grep ^Author | awk -F'<' '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l"
-git log --since $FROM --before $TO | grep '^Author' | awk -F"<" '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l
-
-
-echo "--- Number of commit for the year"
-echo "git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if (\$2 >= '"$1"') { print \"Year: \"\$2\", commits: \"\$1 } }'"
-git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if ($2 >= '$1') { print "Year: "$2", commits: "$1 } }'
diff --git a/dev/tools/github_commits_perversion.sh b/dev/tools/github_commits_byversion.sh
similarity index 85%
rename from dev/tools/github_commits_perversion.sh
rename to dev/tools/github_commits_byversion.sh
index 13fcc43936b..bd3405376cf 100755
--- a/dev/tools/github_commits_perversion.sh
+++ b/dev/tools/github_commits_byversion.sh
@@ -1,12 +1,13 @@
-#/bin/bash
+#!/bin/bash
 #
 # Count number of commits per user and per versions (using date for version detection)
 #
+# shellcheck disable=1113,2002,2006,2086,2164,2219
 
 Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "develop")
 let "counter = 0"
 
-echo "Copy script into /tmp/github_commits_perversion.sh"
+echo "Copy script into /tmp/github_commits_byversion.sh"
 cp $0 /tmp/github_commits_perversion.sh
 
 echo "Delete /tmp/git"
@@ -36,7 +37,7 @@ do
 	echo "Checkout into version $i"
 	git checkout $i
 	#git shortlog -s -n  --after=YYYY-MM-DD --before=YYYY-MM-DD | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion.txt
-	git shortlog -s -n $commitidcommon.. | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion.txt
+	git shortlog -s -n $commitidcommon..  | iconv -f UTF-8 -t ASCII//TRANSLIT | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion.txt
 	#cat /tmp/github_commits_perversion.txt
 	echo "Total for version $i:"
 	echo -n "- Nb of commits: "
diff --git a/dev/tools/github_lines_byuser.sh b/dev/tools/github_lines_byuser.sh
new file mode 100755
index 00000000000..591d74688d4
--- /dev/null
+++ b/dev/tools/github_lines_byuser.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Count number of lines modified per user for a given branch
+#
+
+DEBUG=${DEBUG:=0}
+
+if [ "$2" = "" ]; then
+	echo "***** github_lines_perusers.sh *****"
+	echo "Return the number of lines of code produced by each contributor between 2 versions"
+	echo "Usage:   $0  origin/branchstart|tagnamestart|START  origin/branchend|tagnameend|HEAD"
+	echo "Example: $0  origin/18.0 origin/19.0"
+	echo "Example: $0  origin/18.0 HEAD"
+	exit
+fi
+
+START="$1.."
+END=$2
+if [ "$START" = "START.." ]; then
+	START=""
+fi
+
+TMPFILE=/tmp/github_lines_perusers.tmp
+
+[ "$DEBUG" ] && echo "git log '${START}${END}' --shortstat --use-mailmap | grep ... | perl ... > '${TMPFILE}'"
+git log "${START}${END}" --shortstat --use-mailmap | iconv -f UTF-8 -t ASCII//TRANSLIT --byte-subst='?' -c | grep -e 'Author:' -e 'Date:' -e ' changed' -e ' insertion' -e ' deletion' | perl -n -e '/^(.*)$/; $line = $1; if ($line =~ /(changed|insertion|deletion)/) { $line =~ s/[^0-9\s]//g; my @arr=split /\s+/, $line; $tot=0; for (1..@arr) { $tot += $arr[$_]; }; print $tot."\n"; } else { print $line."\n"; };' > "${TMPFILE}"
+
+echo "Users and nb of lines";
+awk < "${TMPFILE}" 'BEGIN { FS="\n"; lastuser=""; } { if ($1 ~ /^Author:/) { sub(/<.*/, ""); lastuser=tolower($1) }; if ($1 ~ /^[0-9]+$/) { aaa[lastuser]+=$1; } } END { for (var in aaa) print var," ",aaa[var]; } ' | sort
+
+# Clean up
+rm "${TMPFILE}"
diff --git a/dev/tools/github_lines_perusers.sh b/dev/tools/github_lines_perusers.sh
deleted file mode 100755
index e67ee61f00c..00000000000
--- a/dev/tools/github_lines_perusers.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#/bin/bash
-#
-# Count number of lines modified per user for a given branch
-#
-
-if [ "x$2" = "x" ]; then
-	echo "Usage: $0  origin/branchstart|tagnamestart|START  origin/branchend|tagnameend|HEAD"
-	exit
-fi
-
-START=$1
-if [ "x$START" = "xSTART" ]; then
-	START=""
-fi
-
-echo "git log $START..$2 --shortstat | grep ... | perl ... > /tmp/github_lines_perusers.tmp"
-git log $START..$2 --shortstat | grep -e 'Author:' -e 'Date:' -e ' changed' -e ' insertion' -e ' deletion' | perl -n -e '/^(.*)$/; $line = $1; if ($line =~ /(changed|insertion|deletion)/) { $line =~ s/[^0-9\s]//g; my @arr=split /\s+/, $line; $tot=0; for (1..@arr) { $tot += $arr[$_]; }; print $tot."\n"; } else { print $line."\n"; };' > /tmp/github_lines_perusers.tmp
-
-cat /tmp/github_lines_perusers.tmp | awk 'BEGIN { FS="\n"; print "user and nb of lines"; lastuser=""; } { if ($1 ~ /Author:/) { lastuser=$1 }; if ($1 ~ /^[0-9]+$/) { aaa[lastuser]+=$1; } } END { for (var in aaa) print var," ",aaa[var]; } '
-
diff --git a/dev/tools/make_sprite.sh b/dev/tools/make_sprite.sh
index 0fb433025d8..b51308a1373 100755
--- a/dev/tools/make_sprite.sh
+++ b/dev/tools/make_sprite.sh
@@ -2,6 +2,8 @@
 
 # Based of: https://gist.github.com/jaymzcd/342399 and https://github.com/buren/flag-sprite-maker
 
+# shellcheck disable=2006,2086,2129,2219,2231
+
 # uses imagemagick to stich together all images in a folder and
 # then writes a css file with the correct offsets along with a
 # test html page for verification that its all good
diff --git a/dev/tools/optimize_images.sh b/dev/tools/optimize_images.sh
index a200a1071c4..5d2e4c3500c 100755
--- a/dev/tools/optimize_images.sh
+++ b/dev/tools/optimize_images.sh
@@ -2,6 +2,8 @@
 # Borrowed from https://gist.github.com/lgiraudel/6065155
 # Inplace mode added by Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
 
+# shellcheck disable=2003,2006,2034,2046,2086,2166,2268
+
 PROGNAME=${0##*/}
 INPUT=''
 QUIET='0'
diff --git a/.php-cs-fixer.dist.php b/dev/tools/php-cs-fixer/.php-cs-fixer.dist.php
similarity index 100%
rename from .php-cs-fixer.dist.php
rename to dev/tools/php-cs-fixer/.php-cs-fixer.dist.php
diff --git a/.phpcs.xml.dist b/dev/tools/php-cs-fixer/.phpcs.xml.dist
similarity index 100%
rename from .phpcs.xml.dist
rename to dev/tools/php-cs-fixer/.phpcs.xml.dist
diff --git a/dev/tools/php-cs-fixer/run-php-cs-fixer.sh b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
index 088e9ac9ee9..c1c8eb98fe3 100755
--- a/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
+++ b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
@@ -35,7 +35,7 @@ MINPHPVERSION="7.0"
 
 echo "***** run-php-cs-fixer.sh *****"
 
-if [ "x$1" = "x" ]; then
+if [ "$1" = "" ]; then
 	echo "Syntax: run-php-cs-fixer.sh check|fix  [path_from_root_project]"
 	exit 1;
 fi
@@ -60,7 +60,7 @@ PHP_CS_FIXER="${COMPOSER_VENDOR_DIR}/bin/php-cs-fixer"
 if [ ! -r "${PHP_CS_FIXER}" ] ; then
 	[[ ! -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} install
 	[[ -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} update
-	php${MINPHPVERSION} ${COMPOSER_CMD} require --dev friendsofphp/php-cs-fixer
+	"php${MINPHPVERSION}" "${COMPOSER_CMD}" require --dev friendsofphp/php-cs-fixer
 	echo
 fi
 
diff --git a/dev/tools/resize_window.sh b/dev/tools/resize_window.sh
index 0ac7c908ef5..94a81222971 100755
--- a/dev/tools/resize_window.sh
+++ b/dev/tools/resize_window.sh
@@ -4,6 +4,7 @@
 # be able to make size fixed screenshots using
 # ALT+Print screen.
 #----------------------------------------------------
+# shellcheck disable=2086,2166,2268
 
 # Syntax
 if [ "x$1" = "x" ]
diff --git a/dev/tools/test/namespacemig/bbb.php b/dev/tools/test/namespacemig/bbb.php
old mode 100755
new mode 100644
diff --git a/dev/tools/test/testperf.php b/dev/tools/test/testperf.php
old mode 100755
new mode 100644
diff --git a/dev/tools/test/testtcpdf.php b/dev/tools/test/testtcpdf.php
old mode 100755
new mode 100644
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index 3d6117b3892..8fa0735fe8d 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -53,7 +53,7 @@ class autoTranslator
 	public function __construct($_destlang, $_refLang, $_langDir, $_limittofile, $_apikey)
 	{
 
-		// Set enviorment variables
+		// Set environment variables
 		$this->_destlang = $_destlang;
 		$this->_refLang = $_refLang;
 		$this->_langDir = $_langDir.self::DIR_SEPARATOR;
@@ -206,7 +206,7 @@ class autoTranslator
 	}
 
 	/**
-	 * Put in array _translatedFiles[$file], line of a new tranlated pair
+	 * Put in array _translatedFiles[$file], line of a new translated pair
 	 *
 	 * @param 	string	$content		Existing content of dest file
 	 * @param 	string	$file			Target file name translated (xxxx.lang)
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index 02a45c71bfd..3a65df1a140 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -219,7 +219,7 @@ foreach ($dups as $string => $pages) {
 
 		$s.=$file." ";
 
-		// Loop on each line keword was found into file.
+		// Loop on each line keyword was found into file.
 		$listoffilesforthisentry=array();
 		foreach ($lines as $line => $translatedvalue) {
 			if (!empty($listoffilesforthisentry[$file])) {
diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index d1f94294399..6df53ce010f 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -7,6 +7,8 @@
 # Usage: txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]
 #------------------------------------------------------
 
+# shellcheck disable=2006,2044,2086,2164,2268
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR/../..
 
diff --git a/dev/translation/txpush.sh b/dev/translation/txpush.sh
index a6c64eeb0fd..2599b68c824 100755
--- a/dev/translation/txpush.sh
+++ b/dev/translation/txpush.sh
@@ -7,6 +7,8 @@
 # Usage: txpush.sh (source|xx_XX) [-r dolibarr.file] [-f]
 #------------------------------------------------------
 
+# shellcheck disable=2006,2044,2086,2155,2164,2268
+
 export project='dolibarr'
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
diff --git a/doc/index.html b/doc/index.html
index 333f96099c3..4aa97c228f9 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 
-This directory contains several subdirectories with entries for informations on Dolibarr.<br>
+This directory contains several subdirectories with entries for information on Dolibarr.<br>
 But if you are looking for other resources (downloads, documentation, addons, ...), you can find this on Internet on web following sites:<br>
 
 <br>
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 6f36d04d7b9..cc43fc0d4d7 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -374,7 +374,7 @@ if ($resql) {
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#change_chart").on("click", function (e) {
-					console.log("chartofaccounts seleted = "+$("#chartofaccounts").val());
+					console.log("chartofaccounts selected = "+$("#chartofaccounts").val());
 					// reload page
 					window.location.href = "'.$_SERVER["PHP_SELF"].'?valid_change_chart=1&chartofaccounts="+$("#chartofaccounts").val();
 			    });
@@ -667,7 +667,7 @@ if ($resql) {
 				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
 				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2; // Sotre an account number for output
+				$accountparent->account_number = $obj->account_number2; // Store an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) {
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 456b1503ca7..a37ffc6bd78 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -457,7 +457,7 @@ if ($id) {
 		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
-			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = ucfirst($fieldlist[$field]); // By default
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = "left";
 			if ($fieldlist[$field] == 'code') {
@@ -566,7 +566,7 @@ if ($id) {
 		// Title line with search boxes
 		print '<tr class="liste_titre liste_titre_add">';
 		foreach ($fieldlist as $field => $value) {
-			$showfield = 1; // By defaut
+			$showfield = 1; // By default
 
 			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
 				$showfield = 0;
@@ -737,7 +737,7 @@ $db->close();
  * 	@param		array	$fieldlist		Array of fields
  * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
  *  @param		string	$tabname		Name of SQL table
- *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
  *	@return		void
  */
 function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context = '')
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 48d7d86e89f..8f34d85d4da 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -91,17 +91,17 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 				$account_number = clean_account($account_number);
 			}
 
-			if (GETPOST('account_parent', 'int') <= 0) {
+			if (GETPOSTINT('account_parent') <= 0) {
 				$account_parent = 0;
 			} else {
-				$account_parent = GETPOST('account_parent', 'int');
+				$account_parent = GETPOSTINT('account_parent');
 			}
 
 			$object->fk_pcg_version = $obj->pcg_version;
 			$object->pcg_type = GETPOST('pcg_type', 'alpha');
 			$object->account_number = $account_number;
 			$object->account_parent = $account_parent;
-			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->account_category = GETPOSTINT('account_category');
 			$object->label = $label;
 			$object->labelshort = GETPOST('labelshort', 'alpha');
 			$object->active = 1;
@@ -154,17 +154,17 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 				$account_number = clean_account($account_number);
 			}
 
-			if (GETPOST('account_parent', 'int') <= 0) {
+			if (GETPOSTINT('account_parent') <= 0) {
 				$account_parent = 0;
 			} else {
-				$account_parent = GETPOST('account_parent', 'int');
+				$account_parent = GETPOSTINT('account_parent');
 			}
 
 			$object->fk_pcg_version = $obj->pcg_version;
 			$object->pcg_type = GETPOST('pcg_type', 'alpha');
 			$object->account_number = $account_number;
 			$object->account_parent = $account_parent;
-			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->account_category = GETPOSTINT('account_category');
 			$object->label = $label;
 			$object->labelshort = GETPOST('labelshort', 'alpha');
 
@@ -217,7 +217,7 @@ $title = $langs->trans('AccountAccounting')." - ".$langs->trans('Card');
 
 $help_url = 'EN:Category:Accounting';
 
-llxheader('', $title, $help_url);
+llxHeader('', $title, $help_url);
 
 
 // Create mode
@@ -329,7 +329,7 @@ if ($action == 'create') {
 			// Account parent
 			print '<tr><td>'.$langs->trans("Accountparent").'</td>';
 			print '<td>';
-			// Note: We accept disabled account as parent account so we can build a hierarchy and use only childs
+			// Note: We accept disabled account as parent account so we can build a hierarchy and use only children
 			print $formaccounting->select_account($object->account_parent, 'account_parent', 1, array(), 0, 0, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1, '');
 			print '</td></tr>';
 
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 014de28bcf3..bd196fb710a 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -113,7 +113,7 @@ if ($action == 'delete') {
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);
 
-llxheader('', $langs->trans('AccountingCategory'));
+llxHeader('', $langs->trans('AccountingCategory'));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 $titlepicto = 'setup';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 66f411c8cca..48d12ca8370 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -495,7 +495,7 @@ if ($tabname[$id]) {
 	foreach ($fieldlist as $field => $value) {
 		// Determine le nom du champ par rapport aux noms possibles
 		// dans les dictionnaires de donnees
-		$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+		$valuetoshow = ucfirst($fieldlist[$field]); // By default
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$class = "left";
 		if ($fieldlist[$field] == 'type') {
@@ -629,7 +629,7 @@ if ($resql) {
 
 	$filterfound = 0;
 	foreach ($fieldlist as $field => $value) {
-		$showfield = 1; // By defaut
+		$showfield = 1; // By default
 		if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
 			$showfield = 0;
 		}
@@ -655,7 +655,7 @@ if ($resql) {
 
 	$filterfound = 0;
 	foreach ($fieldlist as $field => $value) {
-		$showfield = 1; // By defaut
+		$showfield = 1; // By default
 
 		if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
 			$showfield = 0;
@@ -955,7 +955,7 @@ $db->close();
  * 	@param		array	$fieldlist		Array of fields
  * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
  *  @param		string	$tabname		Name of SQL table
- *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
  *	@return		void
  */
 function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $context = '')
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index c1ad8bdb0c5..7150297c6c3 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -402,7 +402,7 @@ if ($id) {
 		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
-			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = ucfirst($fieldlist[$field]); // By default
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = "left";
 			if ($fieldlist[$field] == 'code') {
@@ -518,7 +518,7 @@ if ($id) {
 		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
-			$showfield = 1; // By defaut
+			$showfield = 1; // By default
 			$class = "left";
 			$sortable = 1;
 			$valuetoshow = '';
@@ -529,7 +529,7 @@ if ($id) {
 			$align=$tmp['align'];
 			$sortable=$tmp['sortable'];
 			*/
-			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = ucfirst($fieldlist[$field]); // By default
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			if ($fieldlist[$field] == 'code') {
 				$valuetoshow = $langs->trans("Code");
@@ -688,7 +688,7 @@ $db->close();
  *  @param      array   $fieldlist      Array of fields
  *  @param      Object  $obj            If we show a particular record, obj is filled with record fields
  *  @param      string  $tabname        Name of SQL table
- *  @param      string  $context        'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *  @param      string  $context        'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
  *  @return     void
  */
 function fieldListJournal($fieldlist, $obj = null, $tabname = '', $context = '')
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 6babd94e7bc..8a941c70d86 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -140,7 +140,7 @@ class AccountancyCategory // extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -624,8 +624,8 @@ class AccountancyCategory // extends CommonObject
 	 * @param string 	$date_end			Date end
 	 * @param int 		$sens 				Sens of the account:  0: credit - debit (use this by default), 1: debit - credit
 	 * @param string	$thirdparty_code	Thirdparty code
-	 * @param int       $month 				Specifig month - Can be empty
-	 * @param int       $year 				Specifig year - Can be empty
+	 * @param int       $month 				Specific month - Can be empty
+	 * @param int       $year 				Specific year - Can be empty
 	 * @return integer 						Return integer <0 if KO, >= 0 if OK
 	 */
 	public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code = 'nofilter', $month = 0, $year = 0)
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 06ab11b4f49..fea26deae26 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -95,7 +95,7 @@ class AccountancyExport
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -838,7 +838,7 @@ class AccountancyExport
 
 		$end_line = "\r\n";
 
-		// We should use dol_now function not time however this is wrong date to transfert in accounting
+		// We should use dol_now function not time however this is wrong date to transfer in accounting
 		foreach ($objectLines as $line) {
 			// Clean some data
 			$line->doc_ref = dol_string_unaccent($line->doc_ref);
@@ -907,7 +907,7 @@ class AccountancyExport
 			$tab['code_journal'] = str_pad(self::trunc($line->code_journal, 2), 2);
 			$tab['folio'] = '000';
 
-			// We use invoice date $line->doc_date not $date_ecriture which is the transfert date
+			// We use invoice date $line->doc_date not $date_ecriture which is the transfer date
 			// maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
 			//$tab['date_ecriture'] = $date_ecriture;
 			$tab['date_ecriture'] = dol_print_date($line->doc_date, '%d%m%y');
@@ -965,7 +965,7 @@ class AccountancyExport
 			$tab['libelle_ecriture2'] = str_pad(self::trunc($line->label_operation, 30), 30);
 			$tab['codetva'] = str_repeat(' ', 2);
 
-			// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
+			// We need to keep the 10 latest number of invoices doc_ref not the beginning part that is the useless almost same part
 			// $tab['num_piece3'] = str_pad(self::trunc($line->piece_num, 10), 10);
 			$tab['num_piece3'] = substr(self::trunc($line->doc_ref, 20), -10);
 			$tab['reserved'] = str_repeat(' ', 10); // position 159
@@ -1070,7 +1070,7 @@ class AccountancyExport
 			//$tab['type_ligne'] = 'M';
 			$tab['code_journal'] = str_pad(dol_trunc($line->code_journal, 2, 'right', 'UTF-8', 1), 2);
 
-			//We use invoice date $line->doc_date not $date_ecriture which is the transfert date
+			//We use invoice date $line->doc_date not $date_ecriture which is the transfer date
 			//maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
 			//$tab['date_ecriture'] = $date_ecriture;
 			$tab['date_operation'] = dol_print_date($line->doc_date, '%d%m%Y');
@@ -1954,7 +1954,7 @@ class AccountancyExport
 			} else {
 				$tab[] = "";
 			}
-			// CNAT
+			// C.N.A.T
 			if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) {
 				$tab[] = 'F';
 			} elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) {
@@ -2231,7 +2231,7 @@ class AccountancyExport
 			} else {
 				$tab[] = "";
 			}
-			// CNAT
+			// C.N.A.T
 			if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) {
 				$tab[] = 'F';
 			} elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) {
@@ -2452,7 +2452,7 @@ class AccountancyExport
 				//Libellé Auto
 				$tab[] = "";
 				//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"';
-				//Libellé manuel
+				//Libellé manual
 				$tab[] = dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1);
 				//Numéro de pièce
 				$tab[] = dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1);
@@ -2603,7 +2603,7 @@ class AccountancyExport
 	/**
 	 * toAnsi
 	 *
-	 * @param string	$str 		Original string to encode and optionaly truncate
+	 * @param string	$str 		Original string to encode and optionally truncate
 	 * @param integer 	$size 		Truncate string after $size characters
 	 * @return string 				String encoded in Windows-1251 charset
 	 */
diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index cc21b5ccf6e..2821478a5b3 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -48,7 +48,7 @@ class AccountancyImport
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 423ca2b4ddf..7c0b3b0bdbd 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2021  Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2024  Alexandre Spangaro   <aspangaro@easya.solutions>
  * Copyright (C) 2013-2021  Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015       Ari Elbaz (elarifr)  <github@accedinfo.com>
@@ -166,8 +166,6 @@ class AccountingAccount extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf;
-
 		$this->db = $db;
 		$this->next_prev_filter = "fk_pcg_version IN (SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS')).")"; // Used to add a filter in Form::showrefnav method
 	}
@@ -866,10 +864,14 @@ class AccountingAccount extends CommonObject
 
 			// Level 3 (define $code_t): Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
 			if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
-				if (!empty($buyer->code_compta_product)) {
+				if ($type == 'customer' && !empty($buyer->code_compta_product)) {
 					$code_t = $buyer->code_compta_product;
 					$suggestedid = $accountingAccount['thirdparty'];
 					$suggestedaccountingaccountfor = 'thirdparty';
+				} elseif ($type == 'supplier' && !empty($seller->code_compta_product)) {
+					$code_t = $seller->code_compta_product;
+					$suggestedid = $accountingAccount['thirdparty'];
+					$suggestedaccountingaccountfor = 'thirdparty';
 				}
 			}
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 9de46b09d39..a479ce52bc2 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -206,7 +206,7 @@ class BookKeeping extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -217,10 +217,10 @@ class BookKeeping extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User	$user		User that creates
-	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
+	 * @param  int	$notrigger	false=launch triggers after, true=disable triggers
 	 * @return int				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -567,12 +567,12 @@ class BookKeeping extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User	$user	   User that creates
-	 * @param  bool	$notrigger  false=launch triggers after, true=disable triggers
-	 * @param  string  $mode 	   Mode
-	 * @return int				 Return integer <0 if KO, Id of created object if OK
+	 * @param  User		$user	   	User that creates
+	 * @param  int		$notrigger  false=launch triggers after, true=disable triggers
+	 * @param  string  	$mode 	   	Mode
+	 * @return int				 	Return integer <0 if KO, Id of created object if OK
 	 */
-	public function createStd(User $user, $notrigger = false, $mode = '')
+	public function createStd(User $user, $notrigger = 0, $mode = '')
 	{
 		global $conf, $langs;
 
@@ -1304,12 +1304,12 @@ class BookKeeping extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User    $user       User that modifies
-	 * @param  bool    $notrigger  false=launch triggers after, true=disable triggers
-	 * @param  string  $mode       Mode ('' or _tmp')
-	 * @return int                 Return integer <0 if KO, >0 if OK
+	 * @param  User    	$user       User that modifies
+	 * @param  int		$notrigger  false=launch triggers after, true=disable triggers
+	 * @param  string  	$mode       Mode ('' or _tmp')
+	 * @return int                 	Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false, $mode = '')
+	public function update(User $user, $notrigger = 0, $mode = '')
 	{
 		global $langs;
 		$error = 0;
@@ -1491,12 +1491,12 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @param string $mode Mode
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 		$user 		User that deletes
+	 * @param int 		$notrigger 	false=launch triggers after, true=disable triggers
+	 * @param string 	$mode 		Mode
+	 * @return int 					Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false, $mode = '')
+	public function delete(User $user, $notrigger = 0, $mode = '')
 	{
 		global $langs;
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1854,7 +1854,7 @@ class BookKeeping extends CommonObject
 	}
 
 	/**
-	 * Load all informations of accountancy document
+	 * Load all information of accountancy document
 	 *
 	 * @param  int     $piecenum   Id of line to get
 	 * @param  string  $mode       Mode
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 38a5e7c3c72..5686bab7de9 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -282,10 +282,10 @@ class Lettering extends BookKeeping
 	/**
 	 *
 	 * @param	array		$ids			ids array
-	 * @param	boolean		$notrigger		no trigger
+	 * @param	int			$notrigger		no trigger
 	 * @return	int
 	 */
-	public function updateLettering($ids = array(), $notrigger = false)
+	public function updateLettering($ids = array(), $notrigger = 0)
 	{
 		$error = 0;
 
@@ -363,10 +363,10 @@ class Lettering extends BookKeeping
 	/**
 	 *
 	 * @param	array		$ids			ids array
-	 * @param	boolean		$notrigger		no trigger
+	 * @param	int			$notrigger		no trigger
 	 * @return	int
 	 */
-	public function deleteLettering($ids, $notrigger = false)
+	public function deleteLettering($ids, $notrigger = 0)
 	{
 		$error = 0;
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 4bd365acfa3..1da86215df1 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -455,7 +455,7 @@ if ($result) {
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
 
-					// This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete.
+					// This part of code is no more required. it is here to solve case where a link were missing (with v14.0.0) and keep writing in accountancy complete.
 					// Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
 					if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) {
 						$tmpsalary = new Salary($db);
@@ -544,7 +544,7 @@ if ($result) {
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
 		// This may happens on bank entries without the links lines to 'company'.
-		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we dont find 'company' link because it is an old 'withdraw' record
+		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we don't find 'company' link because it is an old 'withdraw' record
 			foreach ($links as $key => $val) {
 				if ($links[$key]['type'] == 'payment') {
 					// Get thirdparty
@@ -1018,7 +1018,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					print "\n";
 				}
 			}
-		} else {	// If thirdparty unkown, output the waiting account
+		} else {	// If thirdparty unknown, output the waiting account
 			foreach ($tabbq[$key] as $k => $mt) {
 				if ($mt) {
 					$reflabel = '';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 19d003d34e0..49be8fa6f8f 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -81,7 +81,7 @@ $errorforinvoice = array();
 
 $accountingaccount = new AccountingAccount($db);
 
-// Get informations of journal
+// Get information of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 21a624194ca..78f3d5d4db1 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -83,7 +83,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action);
 
 $accountingaccount = new AccountingAccount($db);
 
-// Get informations of journal
+// Get information of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index d8097020289..9f540d2ffd4 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -85,7 +85,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action);
 
 $accountingaccount = new AccountingAccount($db);
 
-// Get informations of journal
+// Get information of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index b78cd367c9d..3faf0de69b8 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -540,7 +540,7 @@ foreach ($dirmodels as $reldir) {
 									print "</td>";
 								}
 
-								// Defaut
+								// Default
 								print '<td class="center">';
 								if (getDolGlobalString('MEMBER_ADDON_PDF_ODT') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index e336cc16ea7..60d8ed98546 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -33,7 +33,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 	/**
 	 *	Constructor
 	 *
-	 *	@param	DoliDB	$db				Handler acces data base
+	 *	@param	DoliDB	$db				Handler access data base
 	 *	@param	string	$dirmodule		Name of directory of module
 	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
 	 *	@param	string	$canvas			Name of canvas
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 4ecdad298ff..224c25c23b6 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -563,7 +563,7 @@ if (empty($reshook)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		}
-		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEMail($email)) {
+		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEmail($email)) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 464f7e8afab..90200347a3a 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -352,7 +352,7 @@ class Adherent extends CommonObject
 		$this->db = $db;
 		$this->statut = self::STATUS_DRAFT;
 		$this->status = self::STATUS_DRAFT;
-		// l'adherent n'est pas public par defaut
+		// l'adherent n'est pas public par default
 		$this->public = 0;
 		// les champs optionnels sont vides
 		$this->array_options = array();
@@ -372,7 +372,7 @@ class Adherent extends CommonObject
 	 *  @param 	string	$addr_bcc           Email bcc
 	 *  @param 	int		$deliveryreceipt	Ask a delivery receipt
 	 *  @param	int		$msgishtml			1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
-	 *  @param	string	$errors_to			erros to
+	 *  @param	string	$errors_to			errors to
 	 *  @param	string	$moreinheader		Add more html headers
 	 *  @deprecated since V18
 	 *  @see sendEmail()
@@ -398,7 +398,7 @@ class Adherent extends CommonObject
 	 *  @param 	string	$addr_bcc           Email bcc
 	 *  @param 	int		$deliveryreceipt	Ask a delivery receipt
 	 *  @param	int		$msgishtml			1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
-	 *  @param	string	$errors_to			erros to
+	 *  @param	string	$errors_to			errors to
 	 *  @param	string	$moreinheader		Add more html headers
 	 * 	@since V18
 	 *  @return	int							Return integer <0 if KO, >0 if OK
@@ -570,7 +570,7 @@ class Adherent extends CommonObject
 	/**
 	 *	Create a member into database
 	 *
-	 *	@param	User	$user        	Objet user qui demande la creation
+	 *	@param	User	$user        	Object user qui demande la creation
 	 *	@param  int		$notrigger		1 ne declenche pas les triggers, 0 sinon
 	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
@@ -586,7 +586,7 @@ class Adherent extends CommonObject
 		$this->import_key = trim($this->import_key);
 
 		// Check parameters
-		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEMail($this->email)) {
+		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEmail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -730,7 +730,7 @@ class Adherent extends CommonObject
 		$this->url = $this->url ? clean_url($this->url, 0) : '';
 		$this->setUpperOrLowerCase();
 		// Check parameters
-		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEMail($this->email)) {
+		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEmail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -912,7 +912,7 @@ class Adherent extends CommonObject
 
 					dol_syslog(get_class($this)."::update update linked thirdparty");
 
-					// This member is linked with a thirdparty, so we also update thirdparty informations
+					// This member is linked with a thirdparty, so we also update thirdparty information
 					// if this is an update.
 					$lthirdparty = new Societe($this->db);
 					$result = $lthirdparty->fetch($this->fk_soc);
@@ -1171,7 +1171,7 @@ class Adherent extends CommonObject
 				if ($this->user_id && !$nosyncuser) {
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
-					// This member is linked with a user, so we also update users informations
+					// This member is linked with a user, so we also update users information
 					// if this is an update.
 					$luser = new User($this->db);
 					$result = $luser->fetch($this->user_id);
@@ -1410,7 +1410,7 @@ class Adherent extends CommonObject
 				$this->ref = $obj->ref;
 				$this->ref_ext = $obj->ref_ext;
 
-				$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
+				$this->civility_id = $obj->civility_code; // Bad. Kept for backward compatibility
 				$this->civility_code = $obj->civility_code;
 				$this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
@@ -1694,7 +1694,7 @@ class Adherent extends CommonObject
 		dol_syslog("subscriptionComplementaryActions subscriptionid=".$subscriptionid." option=".$option." accountid=".$accountid." datesubscription=".$datesubscription." paymentdate=".
 			$paymentdate." label=".$label." amount=".$amount." num_chq=".$num_chq." autocreatethirdparty=".$autocreatethirdparty);
 
-		// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
+		// Insert into bank account directlty (if option chosen for) + link to llx_subscription if option is 'bankdirect'
 		if ($option == 'bankdirect' && $accountid) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
@@ -1705,7 +1705,7 @@ class Adherent extends CommonObject
 
 			$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
 			if ($insertid > 0) {
-				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
+				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullName($langs), 'member');
 				if ($inserturlid > 0) {
 					// Update table subscription
 					$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".((int) $insertid);
@@ -1728,7 +1728,7 @@ class Adherent extends CommonObject
 			}
 		}
 
-		// If option choosed, we create invoice
+		// If option chosen, we create invoice
 		if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
@@ -2034,7 +2034,7 @@ class Adherent extends CommonObject
 	}
 
 	/**
-	 *		Functiun to exlude (set adherent.status to -2) a member
+	 *		Functiun to exclude (set adherent.status to -2) a member
 	 *		TODO
 	 *		A private note should be added to know why the member has been excluded
 	 *		For historical purpose it add an "extra-subscription" type excluded
@@ -2463,7 +2463,7 @@ class Adherent extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge indicateurs this->nb de tableau de bord
+	 *      Load indicators this->nb in state board
 	 *
 	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
@@ -2497,7 +2497,7 @@ class Adherent extends CommonObject
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @param	User	$user   		Objet user
+	 *      @param	User	$user   		Object user
 	 *      @param  string	$mode           "expired" for membership to renew, "shift" for member to validate
 	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
@@ -2579,7 +2579,7 @@ class Adherent extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -2620,7 +2620,7 @@ class Adherent extends CommonObject
 		global $user, $langs;
 		$now = dol_now();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'ABC001';
 		$this->entity = 1;
@@ -2709,9 +2709,9 @@ class Adherent extends CommonObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *	Initialise tableau info (tableau des attributs LDAP)
+	 *	Initialise tableau info (tableau des attributes LDAP)
 	 *
-	 *	@return		array		Tableau info des attributs
+	 *	@return		array		Tableau info des attributes
 	 */
 	public function _load_ldap_info()
 	{
@@ -2905,7 +2905,7 @@ class Adherent extends CommonObject
 		$sql = "SELECT count(mc.email) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 		$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
-		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
+		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec success
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -3173,7 +3173,7 @@ class Adherent extends CommonObject
 			return 1;
 		} else {
 			$this->output = 'Found '.($nbok + $nbko).' members to send reminder to.';
-			$this->output .= ' Send email successfuly to '.$nbok.' members';
+			$this->output .= ' Send email successfully to '.$nbok.' members';
 			if (is_array($listofmembersok)) {
 				$listofids = '';
 				$i = 0;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 19fdae122eb..2be95946311 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -85,7 +85,7 @@ class AdherentType extends CommonObject
 	public $duration_unit;
 
 	/**
-	 * @var int Subsription required (0 or 1)
+	 * @var int Subscription required (0 or 1)
 	 */
 	public $subscription;
 
@@ -95,7 +95,7 @@ class AdherentType extends CommonObject
 	public $amount;
 
 	/**
-	 * @var int Amount can be choosen by the visitor during subscription (0 or 1)
+	 * @var int Amount can be chosen by the visitor during subscription (0 or 1)
 	 */
 	public $caneditamount;
 
@@ -858,7 +858,7 @@ class AdherentType extends CommonObject
 	/**
 	 *	Initialize the info array (array of LDAP values) that will be used to call LDAP functions
 	 *
-	 *	@return		array		Tableau info des attributs
+	 *	@return		array		Tableau info des attributes
 	 */
 	public function _load_ldap_info()
 	{
@@ -905,7 +905,7 @@ class AdherentType extends CommonObject
 	{
 		global $user;
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'MTSPEC';
 		$this->specimen = 1;
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 2f52eb502ba..0416a03de81 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -21,7 +21,7 @@
 /**
  *	\file       htdocs/adherents/class/adherentstats.class.php
  *	\ingroup    member
- *	\brief      Fichier de la classe de gestion des stats des adhérents
+ *	\brief      File for class managing statistics of members
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 435f6a7e24e..db625cdacf4 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -46,19 +46,20 @@ class Members extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 	}
 
 	/**
 	 * Get properties of a member object
 	 *
-	 * Return an array with member informations
+	 * Return an array with member information
 	 *
 	 * @param   int     $id				ID of member
 	 * @return  Object					Object with cleaned properties
 	 *
-	 * @throws  RestException
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
 	 */
 	public function get($id)
 	{
@@ -86,7 +87,7 @@ class Members extends DolibarrApi
 	/**
 	 * Get properties of a member object by linked thirdparty
 	 *
-	 * Return an array with member informations
+	 * Return an array with member information
 	 *
 	 * @param     int     $thirdparty	ID of third party
 	 *
@@ -94,8 +95,8 @@ class Members extends DolibarrApi
 	 *
 	 * @url GET thirdparty/{thirdparty}
 	 *
-	 * @throws RestException 401
-	 * @throws RestException 404
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
 	 */
 	public function getByThirdparty($thirdparty)
 	{
@@ -119,7 +120,7 @@ class Members extends DolibarrApi
 	/**
 	 * Get properties of a member object by linked thirdparty email
 	 *
-	 * Return an array with member informations
+	 * Return an array with member information
 	 *
 	 * @param  string $email            Email of third party
 	 *
@@ -127,8 +128,8 @@ class Members extends DolibarrApi
 	 *
 	 * @url GET thirdparty/email/{email}
 	 *
-	 * @throws RestException 401
-	 * @throws RestException 404
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member or ThirdParty not found
 	 */
 	public function getByThirdpartyEmail($email)
 	{
@@ -158,7 +159,7 @@ class Members extends DolibarrApi
 	/**
 	 * Get properties of a member object by linked thirdparty barcode
 	 *
-	 * Return an array with member informations
+	 * Return an array with member information
 	 *
 	 * @param  string $barcode			Barcode of third party
 	 *
@@ -166,8 +167,8 @@ class Members extends DolibarrApi
 	 *
 	 * @url GET thirdparty/barcode/{barcode}
 	 *
-	 * @throws RestException 401
-	 * @throws RestException 404
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member or ThirdParty not found
 	 */
 	public function getByThirdpartyBarcode($barcode)
 	{
@@ -207,10 +208,13 @@ class Members extends DolibarrApi
 	 * @param int		$category   Use this param to filter list by category
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
 	 *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of member objects
 	 *
-	 * @throws RestException
+	 * @throws	RestException	400		Error on SQL filters
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Member found
+	 * @throws	RestException	503		Error when retrieving Member list
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $typeid = '', $category = 0, $sqlfilters = '', $properties = '')
 	{
@@ -280,6 +284,9 @@ class Members extends DolibarrApi
 	 *
 	 * @param array $request_data   Request data
 	 * @return int  ID of member
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	500		Error when creating Member
 	 */
 	public function post($request_data = null)
 	{
@@ -292,7 +299,7 @@ class Members extends DolibarrApi
 		$member = new Adherent($this->db);
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$member->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -311,6 +318,10 @@ class Members extends DolibarrApi
 	 * @param int   $id             ID of member to update
 	 * @param array $request_data   Datas
 	 * @return Object				Updated object
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
+	 * @throws	RestException	500		Error when resiliating, validating, excluding, updating a Member
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -333,7 +344,7 @@ class Members extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$member->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -376,6 +387,10 @@ class Members extends DolibarrApi
 	 *
 	 * @param int $id   member ID
 	 * @return array
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
+	 * @throws	RestException	500		Error when deleting a Member
 	 */
 	public function delete($id)
 	{
@@ -396,8 +411,6 @@ class Members extends DolibarrApi
 		$res = $member->delete($member->id, DolibarrApiAccess::$user);
 		if ($res < 0) {
 			throw new RestException(500, "Can't delete, error occurs");
-		} elseif ($res == 0) {
-			throw new RestException(409, "Can't delete, that product is probably used");
 		}
 
 		return array(
@@ -465,9 +478,10 @@ class Members extends DolibarrApi
 	 * @param int $id ID of member
 	 * @return array Array of subscription objects
 	 *
-	 * @throws RestException
-	 *
 	 * @url GET {id}/subscriptions
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
 	 */
 	public function getSubscriptions($id)
 	{
@@ -501,6 +515,9 @@ class Members extends DolibarrApi
 	 * @return int  ID of subscription
 	 *
 	 * @url POST {id}/subscriptions
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Member not found
 	 */
 	public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
 	{
@@ -529,6 +546,10 @@ class Members extends DolibarrApi
 	 * @return mixed
 	 *
 	 * @url GET {id}/categories
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Category not found
+	 * @throws	RestException	503		Error when retrieving Category list
 	 */
 	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 302270d5c5f..5b7728af036 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -46,12 +46,13 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Get properties of a member type object
 	 *
-	 * Return an array with member type informations
+	 * Return an array with member type information
 	 *
 	 * @param   int     $id				ID of member type
 	 * @return  Object					Object with cleaned properties
 	 *
-	 * @throws  RestException
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Member Type found
 	 */
 	public function get($id)
 	{
@@ -82,10 +83,12 @@ class MembersTypes extends DolibarrApi
 	 * @param int       $limit      Limit for list
 	 * @param int       $page       Page number
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of member type objects
 	 *
-	 * @throws RestException
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	503		Error when retrieving Member list
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
 	{
@@ -145,6 +148,9 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param array $request_data   Request data
 	 * @return int  ID of member type
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	500		Error when creating Member Type
 	 */
 	public function post($request_data = null)
 	{
@@ -157,7 +163,7 @@ class MembersTypes extends DolibarrApi
 		$membertype = new AdherentType($this->db);
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$membertype->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -176,6 +182,10 @@ class MembersTypes extends DolibarrApi
 	 * @param int   $id             ID of member type to update
 	 * @param array $request_data   Datas
 	 * @return int
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	500		Error when updating Member Type
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -198,7 +208,7 @@ class MembersTypes extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$membertype->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -222,6 +232,10 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int $id   member type ID
 	 * @return array
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	500		Error when deleting Member Type
 	 */
 	public function delete($id)
 	{
@@ -241,8 +255,6 @@ class MembersTypes extends DolibarrApi
 		$res = $membertype->delete(DolibarrApiAccess::$user);
 		if ($res < 0) {
 			throw new RestException(500, "Can't delete, error occurs");
-		} elseif ($res == 0) {
-			throw new RestException(409, "Can't delete, that product is probably used");
 		}
 
 		return array(
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 77c7a8b933a..b98bcb74f6c 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -49,12 +49,13 @@ class Subscriptions extends DolibarrApi
 	/**
 	 * Get properties of a subscription object
 	 *
-	 * Return an array with subscription informations
+	 * Return an array with subscription information
 	 *
 	 * @param   int     $id				ID of subscription
 	 * @return  Object					Object with cleaned properties
 	 *
-	 * @throws  RestException
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Subscription found
 	 */
 	public function get($id)
 	{
@@ -81,10 +82,12 @@ class Subscriptions extends DolibarrApi
 	 * @param int       $limit      Limit for list
 	 * @param int       $page       Page number
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array Array of subscription objects
 	 *
-	 * @throws RestException
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Subscription found
+	 * @throws	RestException	503		Error when retrieving Subscription list
 	 */
 	public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
 	{
@@ -142,6 +145,9 @@ class Subscriptions extends DolibarrApi
 	 *
 	 * @param array $request_data   Request data
 	 * @return int  ID of subscription
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	500		Error when creating Subscription
 	 */
 	public function post($request_data = null)
 	{
@@ -154,7 +160,7 @@ class Subscriptions extends DolibarrApi
 		$subscription = new Subscription($this->db);
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$subscription->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -162,7 +168,7 @@ class Subscriptions extends DolibarrApi
 			$subscription->$field = $value;
 		}
 		if ($subscription->create(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500, 'Error when creating contribution', array_merge(array($subscription->error), $subscription->errors));
+			throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
 		}
 		return $subscription->id;
 	}
@@ -173,6 +179,10 @@ class Subscriptions extends DolibarrApi
 	 * @param int   $id             ID of subscription to update
 	 * @param array $request_data   Datas
 	 * @return Object
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Subscription found
+	 * @throws	RestException	500		Error when updating Subscription
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -191,7 +201,7 @@ class Subscriptions extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$subscription->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -211,6 +221,11 @@ class Subscriptions extends DolibarrApi
 	 *
 	 * @param int $id   ID of subscription to delete
 	 * @return array
+	 *
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		No Subscription found
+	 * @throws	RestException	409		No Subscription deleted
+	 * @throws	RestException	500		Error when deleting Subscription
 	 */
 	public function delete($id)
 	{
@@ -228,7 +243,7 @@ class Subscriptions extends DolibarrApi
 		if ($res < 0) {
 			throw new RestException(500, "Can't delete, error occurs");
 		} elseif ($res == 0) {
-			throw new RestException(409, "Can't delete, that product is probably used");
+			throw new RestException(409, "No subscription whas deleted");
 		}
 
 		return array(
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 08f8ea83399..32daa92d626 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -134,10 +134,10 @@ class Subscription extends CommonObject
 	 *	Function who permitted creation of the subscription
 	 *
 	 *	@param	User	$user			User that create
-	 *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
+	 *	@param  int 	$notrigger 		0=launch triggers after, 1=disable triggers
 	 *	@return	int						Return integer <0 if KO, Id subscription created if OK
 	 */
-	public function create($user, $notrigger = false)
+	public function create($user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -320,10 +320,10 @@ class Subscription extends CommonObject
 	 *	Delete a subscription
 	 *
 	 *	@param	User	$user		User that delete
-	 *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *	@param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *	@return	int					Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function delete($user, $notrigger = false)
+	public function delete($user, $notrigger = 0)
 	{
 		$error = 0;
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 37a294740e8..6bb412abd7e 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -171,7 +171,7 @@ if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalString('LDAP_MEMBER_
 
 
 
-// Affichage attributs LDAP
+// Affichage attributes LDAP
 print load_fiche_titre($langs->trans("LDAPInformationsForThisMember"));
 
 print '<table width="100%" class="noborder">';
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index a12c7069922..2155f8e0872 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -388,8 +388,8 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
-// SQL Aliase adherent
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead od d
+// SQL Alias adherent
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead of d
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
 }
@@ -397,7 +397,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
 
-// SQL Aliase adherent_type
+// SQL Alias adherent_type
 $sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
 $sql .= " WHERE d.fk_adherent_type = t.rowid";
 
@@ -456,7 +456,7 @@ if ($search_filter == 'outofdate') {
 	$sql .= " AND (datefin < '".$db->idate($now)."')";
 }
 if ($search_status != '') {
-	// Peut valoir un nombre ou liste de nombre separes par virgules
+	// Peut valoir un nombre ou liste de nombre separates par virgules
 	$sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
 }
 if ($search_morphy != '' && $search_morphy != '-1') {
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index aaed1e30234..639adb8e950 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -63,7 +63,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index d2cd86f7de0..43875336810 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -150,7 +150,7 @@ if (!count($data)) {
 }
 
 // Print array
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="liste centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("MemberNature").'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index fd64e315ff1..443249a525b 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -296,7 +296,7 @@ if (count($arrayjs) && $mode == 'memberbycountry') {
 
 if ($mode) {
 	// Print array
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="liste centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$label.'</td>';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index ff95d3c12c6..4b8917f62c1 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -208,7 +208,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 	$result = $object->fetch($rowid);
 	$result = $adht->fetch($object->typeid);
 
-	// Subscription informations
+	// Subscription information
 	$datesubscription = 0;
 	$datesubend = 0;
 	$defaultdelay = !empty($adht->duration_value) ? $adht->duration_value : 1;
@@ -226,7 +226,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 	$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
 	$label = GETPOST("label");
 
-	// Payment informations
+	// Payment information
 	$accountid = GETPOST("accountid", 'int');
 	$operation = GETPOST("operation", "alphanohtml"); // Payment mode
 	$num_chq = GETPOST("num_chq", "alphanohtml");
@@ -1034,7 +1034,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 
 			print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>';
 			print '<label for="none"> '.$langs->trans("None").'</label><br>';
-			// Add entry into bank accoun
+			// Add entry into bank account
 			if (isModEnabled('banque')) {
 				print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
 				print '><label for="bankdirect">  '.$langs->trans("MoreActionBankDirect").'</label><br>';
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index aacb12729f3..b2867203410 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -417,7 +417,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
@@ -639,7 +639,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 
-		//fetch informations needs on this mode
+		//fetch information needs on this mode
 
 		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index e19a37bea44..cb8bd1603bb 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -147,7 +147,7 @@ if ($company->id) {
 	}
 }
 
-// Personal informations
+// Personal information
 $v->setPhoneNumber($object->phone_perso, "TYPE=HOME;VOICE");
 if ($object->birth) {
 	$v->setBirthday($object->birth);
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index d29ab9b0b5f..772bc0efa6a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -64,7 +64,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	$value = (GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
@@ -74,7 +74,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 766b8222ed6..fa4dd0df9a1 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -55,7 +55,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	$value = (GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
@@ -65,7 +65,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 5afd1ce8c85..08822da9a59 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -121,7 +121,7 @@ if ($action == 'add_currency') {
 		$currency = new MultiCurrency($db);
 
 		if ($currency->fetch($fk_multicurrency) > 0) {
-			if ($currency->delete() > 0) {
+			if ($currency->delete($user) > 0) {
 				setEventMessages($langs->trans('RecordDeleted'), array());
 			} else {
 				setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 9f84ed56668..74c3894a21b 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -48,7 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	$value = (GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
@@ -56,7 +56,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index b2e070f0815..20c00764b53 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -82,7 +82,7 @@ print load_fiche_titre($title, '', 'title_setup');
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").'<br><span class="opacitymedium">('.$langs->trans("Programs").')</span></td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) {
 	// Compare version with last install database version (upgrades never occurred)
@@ -146,8 +146,8 @@ if (preg_match('/[a-z]+/i', $version)) {
 }
 
 print '</td></tr>'."\n";
-print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</td></tr>'."\n";
-print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.getDolGlobalString('MAIN_VERSION_LAST_INSTALL').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").'<br><span class="opacitymedium">('.$langs->trans("Database").')</span></td><td>'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'<br><span class="opacitymedium">('.$langs->trans("Database").')</span></td><td>'.getDolGlobalString('MAIN_VERSION_LAST_INSTALL').'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
@@ -159,13 +159,15 @@ print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Ses
 print '<tr class="oddeven"><td>'.$langs->trans("SessionSavePath").'</td><td>'.session_save_path().'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("SessionName").'</td><td>'.session_name().'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("SessionId").'</td><td>'.session_id().'</td></tr>'."\n";
-print '<tr class="oddeven"><td>'.$langs->trans("CurrentSessionTimeOut").' (session.gc_maxlifetime)</td>';
+print '<tr class="oddeven"><td>';
+print $langs->trans("CurrentSessionTimeOut");
+print '</td>';
 print '<td>';
 print ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
 print '<!-- session.gc_maxlifetime = '.ini_get("session.gc_maxlifetime").' -->'."\n";
 print '<!-- session.gc_probability = '.ini_get("session.gc_probability").' -->'."\n";
 print '<!-- session.gc_divisor = '.ini_get("session.gc_divisor").' -->'."\n";
-print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor")));
+print $form->textwithpicto('', $langs->trans("Parameter").' <b>php.ini</b>: <b>session.gc_maxlifetime</b><br>'.$langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor")));
 print "</td></tr>\n";
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentTheme").'</td><td>'.$conf->theme.'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentMenuHandler").'</td><td>';
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index ffa57c6e3f8..19fda8b294d 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 class DolibarrApi
 {
 	/**
-	 * @var DoliDb        $db Database object
+	 * @var DoliDB        $db Database object
 	 */
 	protected $db;
 
@@ -42,7 +42,7 @@ class DolibarrApi
 	/**
 	 * Constructor
 	 *
-	 * @param	DoliDb	$db		        Database handler
+	 * @param	DoliDB	$db		        Database handler
 	 * @param   string  $cachedir       Cache dir
 	 * @param   boolean $refreshCache   Update cache
 	 */
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9100e194c96..d1b1a16bd22 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -60,11 +60,11 @@ class Documents extends DolibarrApi
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
 	 * @return  array                   List of documents
 	 *
-	 * @throws RestException 400
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 *
 	 * @url GET /download
+	 *
+	 * @throws	RestException	400		Bad value for parameter modulepart or original_file
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		File not found
 	 */
 	public function index($modulepart, $original_file = '')
 	{
@@ -129,13 +129,14 @@ class Documents extends DolibarrApi
 	 * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
 	 * @return  array                   List of documents
 	 *
-	 * @throws RestException 500 System error
-	 * @throws RestException 501
-	 * @throws RestException 400
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 *
 	 * @url PUT /builddoc
+	 *
+	 * @throws	RestException	400		Bad value for parameter modulepart or original_file
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	403		Generation not available for this modulepart
+	 * @throws	RestException	404		Invoice, Order, Proposal, Contract or Shipment not found
+	 * @throws	RestException	500		Error generating document
+	 * @throws	RestException	501		File not found
 	 */
 	public function builddoc($modulepart, $original_file = '', $doctemplate = '', $langcode = '')
 	{
@@ -296,12 +297,14 @@ class Documents extends DolibarrApi
 	 * @param	string	$sortorder		Sort order ('asc' or 'desc')
 	 * @return	array					Array of documents with path
 	 *
-	 * @throws RestException 400
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 * @throws RestException 500 System error
-	 *
 	 * @url GET /
+	 *
+	 * @throws	RestException	400		Bad value for parameter modulepart, id or ref
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	403		Generation not available for this modulepart
+	 * @throws	RestException	404		Thirdparty, User, Member, Order, Invoice or Proposal not found
+	 * @throws	RestException	500		Error while fetching object
+	 * @throws	RestException	503		Error when retrieve ecm list
 	 */
 	public function getDocumentsListByElement($modulepart, $id = 0, $ref = '', $sortfield = '', $sortorder = '')
 	{
@@ -633,7 +636,7 @@ class Documents extends DolibarrApi
 	 *
 	 * @param   string  $filename           	Name of file to create ('FA1705-0123.txt')
 	 * @param   string  $modulepart         	Name of module or area concerned by file upload ('product', 'service', 'invoice', 'proposal', 'project', 'project_task', 'supplier_invoice', 'expensereport', 'member', ...)
-	 * @param   string  $ref                	Reference of object (This will define subdir automatically and store submited file into it)
+	 * @param   string  $ref                	Reference of object (This will define subdir automatically and store submitted file into it)
 	 * @param   string  $subdir       			Subdirectory (Only if ref not provided)
 	 * @param   string  $filecontent        	File content (string with file content. An empty file will be created if this parameter is not provided)
 	 * @param   string  $fileencoding       	File encoding (''=no encoding, 'base64'=Base 64)
@@ -641,12 +644,12 @@ class Documents extends DolibarrApi
 	 * @param   int 	$createdirifnotexists  	Create subdirectories if the doesn't exists (1 by default)
 	 * @return  string
 	 *
-	 * @throws RestException 400
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 * @throws RestException 500 System error
-	 *
 	 * @url POST /upload
+	 *
+	 * @throws	RestException	400		Bad Request
+	 * @throws	RestException	401		Access denied
+	 * @throws	RestException	404		Object not found
+	 * @throws	RestException	500		Error on file operationw
 	 */
 	public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0, $createdirifnotexists = 1)
 	{
@@ -822,7 +825,7 @@ class Documents extends DolibarrApi
 				if (!empty($tmp['error'])) {
 					throw new RestException(401, 'Error returned by dol_check_secure_access_document: '.$tmp['error']);
 				} else {
-					throw new RestException(500, 'This value of modulepart ('.$modulepart.') is not allowed with this value of subdir ('.$relativefile.')');
+					throw new RestException(400, 'This value of modulepart ('.$modulepart.') is not allowed with this value of subdir ('.$relativefile.')');
 				}
 			}
 		}
@@ -842,11 +845,11 @@ class Documents extends DolibarrApi
 		//var_dump($original_file);exit;
 
 		if (!dol_is_dir(dirname($destfile))) {
-			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
+			throw new RestException(400, 'Directory does not exists : '.dirname($destfile));
 		}
 
 		if (!$overwriteifexists && dol_is_file($destfile)) {
-			throw new RestException(500, "File with name '".$original_file."' already exists.");
+			throw new RestException(400, "File with name '".$original_file."' already exists.");
 		}
 
 		// in case temporary directory admin/temp doesn't exist
@@ -928,11 +931,13 @@ class Documents extends DolibarrApi
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: PRODUCT-REF-999/IMAGE-999.jpg)
 	 * @return  array                   List of documents
 	 *
-	 * @throws RestException 400
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 *
 	 * @url DELETE /
+	 *
+	 * @throws	RestException	400  Bad value for parameter modulepart
+	 * @throws	RestException	400  Bad value for parameter original_file
+	 * @throws	RestException	401  Access denied
+	 * @throws	RestException	404  File not found
+	 * @throws	RestException	500  Error on file operation
 	 */
 	public function delete($modulepart, $original_file)
 	{
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 5c20825307d..fe9e885dcc8 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -727,7 +727,7 @@ class Setup extends DolibarrApi
 	 * @param object   $object    Object with label to translate
 	 * @param string   $lang      Code of the language the name of the object must be translated to
 	 * @param string   $prefix 	  Prefix for translation key
-	 * @param array    $dict      Array of dictionnary for translation
+	 * @param array    $dict      Array of dictionary for translation
 	 * @return void
 	 */
 	private function translateLabel($object, $lang, $prefix = 'Country', $dict = array('dict'))
@@ -1985,7 +1985,7 @@ class Setup extends DolibarrApi
 			throw new RestException(404, 'Error Bad or unknown value for constantname');
 		}
 		if (isASecretKey($constantname)) {
-			throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
+			throw new RestException(403, 'Forbidden. This parameter can not be read with APIs');
 		}
 
 		return getDolGlobalString($constantname);
@@ -2144,7 +2144,7 @@ class Setup extends DolibarrApi
 					}
 				}
 
-				// Files missings
+				// Files missing
 				$out .= load_fiche_titre($langs->trans("FilesMissing"));
 
 				$out .= '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index b824c7b97dc..a2c7328aa21 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -131,7 +131,7 @@ if (preg_match('/api\/index\.php\/explorer/', $url) && getDolGlobalString('API_E
 }
 
 
-// This 2 lines are usefull only if we want to exclude some Urls from the explorer
+// This 2 lines are useful only if we want to exclude some Urls from the explorer
 //use Luracast\Restler\Explorer;
 //Explorer::$excludedPaths = array('/categories');
 
@@ -170,7 +170,7 @@ $api = new DolibarrApi($db, '', $refreshcache);
 if (getDolGlobalString('MAIN_API_DEBUG')) {
 	$r = $api->r;
 	$r->onCall(function () use ($r) {
-		// Don't log Luracast Restler Explorer recources calls
+		// Don't log Luracast Restler Explorer resources calls
 		//if (!preg_match('/^explorer/', $r->url)) {
 		//	'method'  => $api->r->requestMethod,
 		//	'url'     => $api->r->url,
@@ -405,7 +405,7 @@ if ($usecompression) {
 	}
 }
 
-//dol_syslog('We found some compression algoithm: '.$foundonealgorithm.' -> usecompression='.$usecompression, LOG_DEBUG);
+//dol_syslog('We found some compression algorithm: '.$foundonealgorithm.' -> usecompression='.$usecompression, LOG_DEBUG);
 
 Luracast\Restler\Defaults::$returnResponse = $usecompression;
 
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 4232e60e481..135a487952d 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -611,7 +611,7 @@ if ($action == 'edit') {
 					if ($result < 0) {
 						setEventMessages(null, $c->errors, 'errors');
 					} elseif ($result > 0) {
-						$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+						$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
 						$toprint = array();
 						foreach ($ways as $way) {
 							$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index d67e3f7043b..95459707381 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -53,7 +53,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index d28dc14ef34..c40ed08734d 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -75,7 +75,7 @@ class Asset extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -174,7 +174,7 @@ class Asset extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -212,10 +212,10 @@ class Asset extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int	$notrigger false=launch triggers after, true=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		if (!isset($this->date_start) || $this->date_start === "") {
 			$this->date_start = $this->date_acquisition;
@@ -469,10 +469,10 @@ class Asset extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		if (!isset($this->date_start) || $this->date_start === "") {
 			$this->date_start = $this->date_acquisition;
@@ -507,11 +507,11 @@ class Asset extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int  			Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -520,11 +520,11 @@ class Asset extends CommonObject
 	/**
 	 * Set asset model
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int $notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, Id of created object if OK
 	 */
-	public function setDataFromAssetModel(User $user, $notrigger = false)
+	public function setDataFromAssetModel(User $user, $notrigger = 0)
 	{
 		global $langs;
 		$langs->load('assets');
@@ -1301,7 +1301,7 @@ class Asset extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 * @param	int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 * @param	string  $option                     On what the link point to ('nolink', ...)
@@ -1590,7 +1590,7 @@ class Asset extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/asset/class/assetaccountancycodes.class.php b/htdocs/asset/class/assetaccountancycodes.class.php
index 4c9d35cd020..966aaa745c7 100644
--- a/htdocs/asset/class/assetaccountancycodes.class.php
+++ b/htdocs/asset/class/assetaccountancycodes.class.php
@@ -71,7 +71,7 @@ class AssetAccountancyCodes extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index 2c572d89a8f..e77d7106651 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -45,7 +45,7 @@ class AssetDepreciationOptions extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -117,7 +117,7 @@ class AssetDepreciationOptions extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -210,11 +210,11 @@ class AssetDepreciationOptions extends CommonObject
 				$html_name = $mode_key . '_' . $field_key;
 				if ($field_info['type'] == 'duration') {
 					if (GETPOST($html_name . 'hour') == '' && GETPOST($html_name . 'min') == '') {
-						continue; // The field was not submited to be saved
+						continue; // The field was not submitted to be saved
 					}
 				} else {
 					if (!GETPOSTISSET($html_name)) {
-						continue; // The field was not submited to be saved
+						continue; // The field was not submitted to be saved
 					}
 				}
 				// Ignore special fields
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index b8eead48384..9dfdf810fc3 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -81,7 +81,7 @@ class AssetModel extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -149,7 +149,7 @@ class AssetModel extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -187,10 +187,10 @@ class AssetModel extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger false=launch triggers after, true=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -409,10 +409,10 @@ class AssetModel extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -420,11 +420,11 @@ class AssetModel extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -446,7 +446,7 @@ class AssetModel extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this) . "::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -549,7 +549,7 @@ class AssetModel extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 13e11efbefa..19d5facfc43 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -79,7 +79,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -455,7 +455,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
index 5aecdb93f54..fc461d5658d 100644
--- a/htdocs/asset/model/card.php
+++ b/htdocs/asset/model/card.php
@@ -53,7 +53,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index 9b85eded84e..3e63ad70f48 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -77,7 +77,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -458,7 +458,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 91ea757baf5..132c368114c 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -224,13 +224,13 @@ if (empty($reshook)) {
 
 			// For labels
 			if ($mode == 'label') {
-				$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% posible when using TCPDF generator
-				$textleft = make_substitutions((!getDolGlobalString('BARCODE_LABEL_LEFT_TEXT') ? $txtforsticker : $conf->global->BARCODE_LABEL_LEFT_TEXT), $substitutionarray);
-				$textheader = make_substitutions((!getDolGlobalString('BARCODE_LABEL_HEADER_TEXT') ? '' : $conf->global->BARCODE_LABEL_HEADER_TEXT), $substitutionarray);
-				$textfooter = make_substitutions((!getDolGlobalString('BARCODE_LABEL_FOOTER_TEXT') ? '' : $conf->global->BARCODE_LABEL_FOOTER_TEXT), $substitutionarray);
-				$textright = make_substitutions((!getDolGlobalString('BARCODE_LABEL_RIGHT_TEXT') ? '' : $conf->global->BARCODE_LABEL_RIGHT_TEXT), $substitutionarray);
-				$forceimgscalewidth = (!getDolGlobalString('BARCODE_FORCEIMGSCALEWIDTH') ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH);
-				$forceimgscaleheight = (!getDolGlobalString('BARCODE_FORCEIMGSCALEHEIGHT') ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT);
+				$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% possible when using TCPDF generator
+				$textleft = make_substitutions(getDolGlobalString('BARCODE_LABEL_LEFT_TEXT', $txtforsticker), $substitutionarray);
+				$textheader = make_substitutions(getDolGlobalString('BARCODE_LABEL_HEADER_TEXT'), $substitutionarray);
+				$textfooter = make_substitutions(getDolGlobalString('BARCODE_LABEL_FOOTER_TEXT'), $substitutionarray);
+				$textright = make_substitutions(getDolGlobalString('BARCODE_LABEL_RIGHT_TEXT'), $substitutionarray);
+				$forceimgscalewidth = getDolGlobalString('BARCODE_FORCEIMGSCALEWIDTH', 1);
+				$forceimgscaleheight = getDolGlobalString('BARCODE_FORCEIMGSCALEHEIGHT', 1);
 
 				$MAXSTICKERS = 1000;
 				if ($numberofsticker <= $MAXSTICKERS) {
diff --git a/htdocs/blockedlog/README-fr.md b/htdocs/blockedlog/README-fr.md
index a5d709ca7a7..a8ed31169e0 100644
--- a/htdocs/blockedlog/README-fr.md
+++ b/htdocs/blockedlog/README-fr.md
@@ -17,7 +17,7 @@ Remarque: Le type des événements tracés est probablement plus large que la pl
 de ces exigences.
 Vous pouvez aussi lire et faire des recherches au sein de la log inaltérable.
 
-Tous les enregistrements de la logs inaltérable sont liés avec le précédent dans une Blockchain, et leur contenu fait parti de la signature inclue dans ce lien,
+Tous les enregistrements de la logs inaltérable sont liés avec le précédent dans une Blockchain, et leur contenu fait parti de la signature include dans ce lien,
 aussi, une fois le module activé et le premier enregistrement réalisé, il ne sera plus possible d'effacer ni modifier un enregistrement dans la log 
-inaltérable sans corrompre toute la chaine. Dès lors qu'un enregistrement est invalide, tous les suivants pourront également être considérés invalides par votre administration.
+inaltérable sans corrompre toute la chaine. Dès lors qu'un enregistrement est invalid, tous les suivants pourront également être considérés invalides par votre administration.
 
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 75acdf7b230..bb8cd151bbd 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -66,7 +66,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 if (preg_match('/del_(.*)/', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
 		exit;
 	} else {
 		dol_print_error($db);
@@ -104,7 +104,7 @@ print '<span class="opacitymedium">'.$langs->trans("BlockedLogDesc")."</span><br
 
 print '<br>';
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Key").'</td>';
@@ -155,9 +155,9 @@ if ($resql) {
 	}
 }
 
-$seledted = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
+$selected = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
 
-print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $seledted);
+print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $selected);
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</form>';
 
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 9874be8bebe..8a39531b7e0 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -415,7 +415,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 
 // Line of filters
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index ff61a1a512e..23c40994d9b 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -912,7 +912,7 @@ class BlockedLog
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 
-		$this->signature_line = dol_hash($keyforsignature, '5'); // Not really usefull
+		$this->signature_line = dol_hash($keyforsignature, '5'); // Not really useful
 		$this->signature = dol_hash($previoushash.$keyforsignature, '5');
 		if ($forcesignature) {
 			$this->signature = $forcesignature;
@@ -999,7 +999,7 @@ class BlockedLog
 		// Recalculate hash
 		$keyforsignature = $this->buildKeyForSignature();
 
-		//$signature_line = dol_hash($keyforsignature, '5'); // Not really usefull
+		//$signature_line = dol_hash($keyforsignature, '5'); // Not really useful
 		$signature = dol_hash($previoushash.$keyforsignature, 'sha256');
 		//var_dump($previoushash); var_dump($keyforsignature); var_dump($signature_line); var_dump($signature);
 
@@ -1025,7 +1025,7 @@ class BlockedLog
 	/**
 	 * Return a string for signature.
 	 * Note: rowid of line not included as it is not a business data and this allow to make backup of a year
-	 * and restore it into another database with different id wihtout comprimising checksums
+	 * and restore it into another database with different id without comprimising checksums
 	 *
 	 * @return string		Key for signature
 	 */
@@ -1081,7 +1081,7 @@ class BlockedLog
 	}
 
 	/**
-	 *	Return array of log objects (with criterias)
+	 *	Return array of log objects (with criteria)
 	 *
 	 *	@param	string 	$element      	element to search
 	 *	@param	int 	$fk_object		id of object to search
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f375004b4a4..5b105fda2cf 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -61,7 +61,7 @@ $hookmanager->initHooks(array('bomcard', 'globalcard')); // Note that conf->hook
 $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 1e21650810c..05cdb0d10a2 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -80,7 +80,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index 14821d68a42..52b472428b6 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -57,7 +57,7 @@ $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
 $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 9d7e3b326c1..d84b25d7225 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -55,7 +55,7 @@ class Boms extends DolibarrApi
 	/**
 	 * Get properties of a bom object
 	 *
-	 * Return an array with bom informations
+	 * Return an array with bom information
 	 *
 	 * @param	int		$id				ID of bom
 	 * @return  Object					Object with cleaned properties
@@ -92,7 +92,7 @@ class Boms extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -187,7 +187,7 @@ class Boms extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->bom->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -231,7 +231,7 @@ class Boms extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->bom->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 507134881ce..9d2e0babbe0 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -93,7 +93,7 @@ class BOM extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -260,7 +260,7 @@ class BOM extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -296,10 +296,10 @@ class BOM extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger false=launch triggers after, true=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 1)
 	{
 		if ($this->efficiency <= 0 || $this->efficiency > 1) {
 			$this->efficiency = 1;
@@ -561,10 +561,10 @@ class BOM extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 1)
 	{
 		if ($this->efficiency <= 0 || $this->efficiency > 1) {
 			$this->efficiency = 1;
@@ -576,11 +576,11 @@ class BOM extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User $user       	User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 1)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -819,10 +819,10 @@ class BOM extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -927,7 +927,7 @@ class BOM extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -1148,7 +1148,7 @@ class BOM extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -1331,7 +1331,7 @@ class BOM extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1738,7 +1738,7 @@ class BOMLine extends CommonObjectLine
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -1855,7 +1855,7 @@ class BOMLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -1891,10 +1891,10 @@ class BOMLine extends CommonObjectLine
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		if ($this->efficiency < 0 || $this->efficiency > 1) {
 			$this->efficiency = 1;
@@ -1995,10 +1995,10 @@ class BOMLine extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		if ($this->efficiency < 0 || $this->efficiency > 1) {
 			$this->efficiency = 1;
@@ -2010,18 +2010,18 @@ class BOMLine extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 65e2954c0e3..1c7b193d2d5 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -127,7 +127,7 @@ print '</td>';
 // Qty
 print '<td class="linecolqty nowrap right">';
 $coldisplay++;
-echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
+echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formatting role of function price
 print '</td>';
 
 if ($filtertype != 1) {
@@ -146,7 +146,7 @@ if ($filtertype != 1) {
 	print '</td>';
 	print '<td class="linecoldisablestockchange nowrap right">';
 	$coldisplay++;
-	echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price
+	echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formatting role of function price
 	print '</td>';
 
 	print '<td class="linecolefficiency nowrap right">';
@@ -244,7 +244,7 @@ if ($action == 'selectlines') {
 print '</tr>';
 
 // Select of all the sub-BOM lines
-// From this pont to the end of the file, we only take care of sub-BOM lines
+// From this point to the end of the file, we only take care of sub-BOM lines
 $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
 $sql.= ' WHERE fk_bom ='. (int) $tmpbom->id;
 $resql = $object->db->query($sql);
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index fce5ee0674f..ae32bbe7b33 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -57,7 +57,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index e35fcd8ae24..aab8900e1a7 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -85,7 +85,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -510,7 +510,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 20cecf07a51..32d048a2b44 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -24,7 +24,7 @@
 /**
  *	\file       htdocs/bookcal/booking_list.php
  *	\ingroup    bookcal
- *	\brief      Management of direct debit order or credit tranfer of invoices
+ *	\brief      Management of direct debit order or credit transfer of invoices
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php
index 4cd79c357f1..45efc029195 100644
--- a/htdocs/bookcal/calendar_card.php
+++ b/htdocs/bookcal/calendar_card.php
@@ -113,7 +113,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 04b14be5743..7d00e8d10a5 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -105,7 +105,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -531,7 +531,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 56bf44d4578..87a4dc4d0f8 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -92,7 +92,7 @@ class Availabilities extends CommonObject
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -194,7 +194,7 @@ class Availabilities extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -238,10 +238,10 @@ class Availabilities extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -463,11 +463,11 @@ class Availabilities extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int $notrigger 	false=launch triggers after, true=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -475,11 +475,11 @@ class Availabilities extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -490,10 +490,10 @@ class Availabilities extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -521,7 +521,7 @@ class Availabilities extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -710,7 +710,7 @@ class Availabilities extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1048,7 +1048,7 @@ class Availabilities extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1133,7 +1133,7 @@ class AvailabilitiesLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 4490852b2a8..c13266c7df9 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -93,7 +93,7 @@ class Calendar extends CommonObject
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -153,7 +153,7 @@ class Calendar extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -198,10 +198,10 @@ class Calendar extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -421,10 +421,10 @@ class Calendar extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -432,11 +432,11 @@ class Calendar extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -447,10 +447,10 @@ class Calendar extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -478,7 +478,7 @@ class Calendar extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -692,7 +692,7 @@ class Calendar extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1036,7 +1036,7 @@ class Calendar extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1121,7 +1121,7 @@ class CalendarLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index aa3f163fe23..6f7d2e081ca 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -280,7 +280,7 @@ class Bookmark extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index b1d0ff392d6..159d7925e3a 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -78,7 +78,7 @@ class Categories extends DolibarrApi
 	/**
 	 * Get properties of a category object
 	 *
-	 * Return an array with category informations
+	 * Return an array with category information
 	 *
 	 * @param	int		$id ID of category
 	 * @param	bool	$include_childs Include child categories list (true or false)
@@ -126,7 +126,7 @@ class Categories extends DolibarrApi
 	 * @param int		$page		Page number
 	 * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of category objects
 	 *
 	 * @throws RestException
@@ -203,7 +203,7 @@ class Categories extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->category->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -243,7 +243,7 @@ class Categories extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->category->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -674,7 +674,7 @@ class Categories extends DolibarrApi
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
-		// Remove fields not relevent to categories
+		// Remove fields not relevant to categories
 		unset($object->MAP_CAT_FK);
 		unset($object->MAP_CAT_TABLE);
 		unset($object->MAP_OBJ_CLASS);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f7008dad5eb..11d31aaa031 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -260,7 +260,7 @@ class Categorie extends CommonObject
 	public $motherof = array();
 
 	/**
-	 * @var array Childs
+	 * @var array children
 	 */
 	public $childs = array();
 
@@ -859,7 +859,7 @@ class Categorie extends CommonObject
 	 * @param	string		$sortorder	Sort order ('ASC' or 'DESC');
 	 * @param   array       $filter     Filter array. Example array('field'=>'valueforlike', 'customsql'=>...)
 	 * @param   string      $filtermode Filter mode (AND or OR)
-	 * @return  array|int              	-1 if KO, array of instance of object if OK
+	 * @return  CommonObject[]|int[]|int              	Return -1 if KO, array of instance of object if OK
 	 * @see containsObject()
 	 */
 	public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0, $sortfield = '', $sortorder = 'ASC', $filter = array(), $filtermode = 'AND')
@@ -1055,7 +1055,7 @@ class Categorie extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return direct childs id of a category into an array
+	 * Return direct children ids of a category into an array
 	 *
 	 * @return	array|int   Return integer <0 KO, array ok
 	 */
@@ -1119,8 +1119,8 @@ class Categorie extends CommonObject
 	 *                id_mere = id de la categorie mere
 	 *                id_children = tableau des id enfant
 	 *                label = nom de la categorie
-	 *                fulllabel = nom avec chemin complet de la categorie
-	 *                fullpath = chemin complet compose des id
+	 *                fulllabel = Name with full path for the category
+	 *                fullpath = Full path built with the id's
 	 *
 	 * @param   string              $type               Type of categories ('customer', 'supplier', 'contact', 'product', 'member', ...)
 	 * @param   int|string|array	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
@@ -1228,7 +1228,7 @@ class Categorie extends CommonObject
 	}
 
 	/**
-	 *	For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
+	 *	For category id_categ and its children available in this->cats, define property fullpath and fulllabel.
 	 *  It is called by get_full_arbo()
 	 *  This function is a memory scan only from $this->cats and $this->motherof, no database access must be done here.
 	 *
@@ -1393,8 +1393,8 @@ class Categorie extends CommonObject
 		// phpcs:enable
 		$ways = array();
 
-		$allways = $this->get_all_ways(); // Load array of categories
-		foreach ($allways as $way) {
+		$all_ways = $this->get_all_ways(); // Load array of categories
+		foreach ($all_ways as $way) {
 			$w = array();
 			$i = 0;
 			$forced_color = '';
@@ -1481,8 +1481,8 @@ class Categorie extends CommonObject
 		$parents = $this->get_meres();
 		if (is_array($parents)) {
 			foreach ($parents as $parent) {
-				$allways = $parent->get_all_ways();
-				foreach ($allways as $way) {
+				$all_ways = $parent->get_all_ways();
+				foreach ($all_ways as $way) {
 					$w = $way;
 					$w[] = $this;
 					$ways[] = $w;
@@ -1722,9 +1722,9 @@ class Categorie extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Deplace fichier uploade sous le nom $file dans le repertoire sdir
+	 *  Add the image uploaded as $file to the directory $sdir/<category>-<id>/photos/
 	 *
-	 *  @param      string	$sdir       Final destination directory
+	 *  @param      string	$sdir       Root destination directory
 	 *  @param      array	$file		Uploaded file name
 	 *	@return		void
 	 */
@@ -1801,7 +1801,7 @@ class Categorie extends CommonObject
 							$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 						}
 
-						// Objet
+						// Object
 						$obj = array();
 						$obj['photo'] = $photo;
 						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) {
@@ -1998,7 +1998,7 @@ class Categorie extends CommonObject
 	{
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->fk_parent = 0;
 		$this->label = 'SPECIMEN';
@@ -2026,7 +2026,7 @@ class Categorie extends CommonObject
 	}
 
 	/**
-	 * Return the addtional SQL JOIN query for filtering a list by a category
+	 * Return the additional SQL JOIN query for filtering a list by a category
 	 *
 	 * @param string	$type			The category type (e.g Categorie::TYPE_WAREHOUSE)
 	 * @param string	$rowIdName		The name of the row id inside the whole sql query (e.g. "e.rowid")
@@ -2043,7 +2043,7 @@ class Categorie extends CommonObject
 	}
 
 	/**
-	 * Return the addtional SQL SELECT query for filtering a list by a category
+	 * Return the additional SQL SELECT query for filtering a list by a category
 	 *
 	 * @param string	$type			The category type (e.g Categorie::TYPE_WAREHOUSE)
 	 * @param string	$rowIdName		The name of the row id inside the whole sql query (e.g. "e.rowid")
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 13864aa45db..5d1d44738fe 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -499,6 +499,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 		if ($prods < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Product[] $prods */
 			// Form to add record into the category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -584,6 +585,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 		if ($socs < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Societe[] $socs */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -668,6 +670,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 		if ($socs < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Fournisseur[] $socs */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -751,10 +754,11 @@ if ($type == Categorie::TYPE_MEMBER) {
 
 		$permission = $user->hasRight('adherent', 'creer');
 
-		$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
-		if ($prods < 0) {
+		$members = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($members < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Adherent[] $members */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -784,7 +788,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 
 			print '<br>';
 			$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
-			$num = count($prods);
+			$num = count($members);
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddMember"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create&memcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->hasRight('adherent', 'creer'));
 
@@ -793,9 +797,9 @@ if ($type == Categorie::TYPE_MEMBER) {
 			print '<table class="noborder centpecent">'."\n";
 			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Name").'</td></tr>'."\n";
 
-			if (count($prods) > 0) {
+			if (count($members) > 0) {
 				$i = 0;
-				foreach ($prods as $key => $member) {
+				foreach ($members as $key => $member) {
 					$i++;
 					if ($i > $limit) {
 						break;
@@ -841,6 +845,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 		if (is_numeric($contacts) && $contacts < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Contact[] $contacts */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -932,6 +937,7 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 		if ($accounts < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Account[] $accounts */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -1019,6 +1025,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 		if ($objects < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Project $object */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -1104,6 +1111,7 @@ if ($type == Categorie::TYPE_USER) {
 		if ($users < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var User[] $users */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
@@ -1180,7 +1188,7 @@ if ($type == Categorie::TYPE_USER) {
 // List of warehouses
 if ($type == Categorie::TYPE_WAREHOUSE) {
 	if ($user->hasRight("stock", "read")) {
-		$permission = $user->rights->stock->creer;
+		$permission = $user->hasRight('stock', 'creer');
 
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
@@ -1188,6 +1196,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 		if ($objects < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Entrepot[] $objects */
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -1208,7 +1217,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 
 			if (count($objects) > 0) {
 				$i = 0;
-				foreach ($objects as $key => $project) {
+				foreach ($objects as $key => $warehouse) {
 					$i++;
 					if ($i > $limit) {
 						break;
@@ -1216,14 +1225,14 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 
 					print "\t".'<tr class="oddeven">'."\n";
 					print '<td class="nowrap tdtop">';
-					print $project->getNomUrl(1);
+					print $warehouse->getNomUrl(1);
 					print "</td>\n";
-					print '<td class="tdtop">'.$project->ref."</td>\n";
-					print '<td class="tdtop">'.$project->title."</td>\n";
+					print '<td class="tdtop">'.$warehouse->ref."</td>\n";
+					print '<td class="tdtop">'.$warehouse->lieu."</td>\n";
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$warehouse->id."'>";
 						print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1253,6 +1262,7 @@ if ($type == Categorie::TYPE_TICKET) {
 		if ($tickets < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 		} else {
+			/** @var Ticket[] $tickets */
 			// Form to add record into a category
 			$showclassifyform = 1;
 			if ($showclassifyform) {
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index e11663a7dae..eefec70803d 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -93,7 +93,7 @@ $reg = array();
 if (GETPOST('datep')) {
 	if (GETPOST('datep') == 'now') {
 		$datep = dol_now();
-	} elseif (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) {		// Try to not use this. Use insteead '&datep=now'
+	} elseif (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) {		// Try to not use this. Use instead '&datep=now'
 		$datep = dol_mktime(0, 0, 0, $reg[2], $reg[3], $reg[1], 'tzuserrel');
 	}
 }
@@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
 	}
 
-	// Initialisation objet cactioncomm
+	// Initialisation object cactioncomm
 	if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
 		$error++;
 		$donotclearsession = 1;
@@ -354,7 +354,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Initialisation objet actioncomm
+		// Initialisation object actioncomm
 		$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
 		$object->fulldayevent = ($fulldayevent ? 1 : 0);
 		$object->location = GETPOST("location", 'alphanohtml');
@@ -2344,7 +2344,7 @@ if ($id > 0) {
 		// Full day event
 		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent ? 1 : 0, 3).'</td></tr>';
 
-		// Event into a serie
+		// Event into a series
 		if ($object->recurid) {
 			print '<tr><td class="titlefield">'.$langs->trans("EventIntoASerie").'</td><td>'.dol_escape_htmltag($object->recurid).'</td></tr>';
 		}
@@ -2397,7 +2397,7 @@ if ($id > 0) {
 			if ($object->userownerid > 0) {
 				$listofuserid[$object->userownerid] = array(
 					'id'=>$object->userownerid,
-					'transparency'=>$object->transparency, // Force transparency on onwer from preoperty of event
+					'transparency'=>$object->transparency, // Force transparency on owner from property of event
 					'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
 					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
 				);
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d574dcaa241..2cfbc4a99f4 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -194,7 +194,7 @@ class ActionComm extends CommonObject
 	public $datep2;
 
 	/**
-	 * @var int -1=Unkown duration
+	 * @var int -1=Unknown duration
 	 * @deprecated
 	 */
 	public $durationp = -1;
@@ -382,7 +382,7 @@ class ActionComm extends CommonObject
 	/**
 	 * Properties to manage the recurring events
 	 */
-	public $recurid;		/* A string YYYYMMDDHHMMSS shared by allevent of same serie */
+	public $recurid;		/* A string YYYYMMDDHHMMSS shared by allevent of same series */
 	public $recurrule;		/* Rule of recurring */
 	public $recurdateend;	/* Repeat until this date */
 
@@ -1406,7 +1406,7 @@ class ActionComm extends CommonObject
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 * @param	User	$user   			Objet user
+	 * @param	User	$user   			Object user
 	 * @param	int		$load_state_board	Load indicator array this->nb
 	 * @return WorkboardResponse|int 		Return integer <0 if KO, WorkboardResponse if OK
 	 */
@@ -1491,7 +1491,7 @@ class ActionComm extends CommonObject
 
 
 	/**
-	 *  Charge les informations d'ordre info dans l'objet facture
+	 *  Charge les information d'ordre info dans l'objet facture
 	 *
 	 *  @param	int		$id       	Id de la facture a charger
 	 *  @return	void
@@ -1645,7 +1645,7 @@ class ActionComm extends CommonObject
 			if (!empty($this->email_tocc)) {
 				$datas['mailcc'] = '<br><b>'.$langs->trans('MailCC').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_tocc);
 			}
-			/* Disabled because bcc must remain by defintion not visible
+			/* Disabled because bcc must remain by definition not visible
 			if (!empty($this->email_tobcc)) {
 				$datas['mailccc'] = '<br><b>'.$langs->trans('MailCCC').':</b> '.$this->email_tobcc;
 			} */
@@ -1674,7 +1674,7 @@ class ActionComm extends CommonObject
 	 *  Use $this->id, $this->type_code, $this->label and $this->type_label
 	 *
 	 *  @param	int		$withpicto				0 = No picto, 1 = Include picto into link, 2 = Only picto
-	 *  @param	int		$maxlength				Max number of charaters into label. If negative, use the ref as label.
+	 *  @param	int		$maxlength				Max number of characters into label. If negative, use the ref as label.
 	 *  @param	string	$classname				Force style class on a link
 	 *  @param	string	$option					'' = Link to action, 'birthday'= Link to contact, 'holiday' = Link to leave
 	 *  @param	int		$overwritepicto			1 = Overwrite picto with this one
@@ -1749,7 +1749,7 @@ class ActionComm extends CommonObject
 			if (!empty($this->email_tocc)) {
 				$tooltip .= '<br><b>'.$langs->trans('MailCC').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_tocc);
 			}
-			/* Disabled because bcc must remain by defintion not visible
+			/* Disabled because bcc must remain by definition not visible
 			if (!empty($this->email_tobcc)) {
 				$tooltip .= '<br><b>'.$langs->trans('MailCCC').':</b> '.$this->email_tobcc;
 			} */
@@ -2045,7 +2045,7 @@ class ActionComm extends CommonObject
 			$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters); // Note that $action and $object may have been modified by hook
 			$sql .= $hookmanager->resPrint;
 
-			// We must filter on assignement table
+			// We must filter on assignment table
 			if ($filters['logint']) {
 				$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 			}
@@ -2076,7 +2076,7 @@ class ActionComm extends CommonObject
 				if ($key == 'notactiontype') {
 					$sql .= " AND c.type <> '".$this->db->escape($value)."'";
 				}
-				// We must filter on assignement table
+				// We must filter on assignment table
 				if ($key == 'logint') {
 					$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 				}
@@ -2351,7 +2351,7 @@ class ActionComm extends CommonObject
 
 		$now = dol_now();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->specimen = 1;
 
@@ -2667,7 +2667,7 @@ class ActionComm extends CommonObject
 	}
 
 	/**
-	 * Udpate the percent value of a event with the given id
+	 * Update the percent value of a event with the given id
 	 *
 	 * @param int		$id			The id of the event
 	 * @param int		$percent	The new percent value for the event
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 65ca8f8df62..fff59f3fd11 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -146,7 +146,7 @@ class ActionCommReminder extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -166,10 +166,10 @@ class ActionCommReminder extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -192,10 +192,10 @@ class ActionCommReminder extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -203,11 +203,11 @@ class ActionCommReminder extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index beb8bafa2a9..657c585400a 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -54,7 +54,7 @@ class AgendaEvents extends DolibarrApi
 	/**
 	 * Get properties of a Agenda Events object
 	 *
-	 * Return an array with Agenda Events informations
+	 * Return an array with Agenda Events information
 	 *
 	 * @param   int         $id         ID of Agenda Events
 	 * @return  Object					Object with cleaned properties
@@ -100,7 +100,7 @@ class AgendaEvents extends DolibarrApi
 	 * @param int		$page		Page number
 	 * @param string	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of Agenda Events objects
 	 */
 	public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '', $sqlfilters = '', $properties = '')
@@ -203,7 +203,7 @@ class AgendaEvents extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->actioncomm->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -261,7 +261,7 @@ class AgendaEvents extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->actioncomm->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 8d785f08f44..d4df363dd50 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -162,9 +162,9 @@ class CActionComm
 		global $langs, $conf, $user;
 		$langs->load("commercial");
 
-		$repid = array();
-		$repcode = array();
-		$repall = array();
+		$rep_id = array();
+		$rep_code = array();
+		$rep_all = array();
 
 		$sql = "SELECT id, code, libelle as label, module, type, color, picto";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
@@ -301,7 +301,7 @@ class CActionComm
 									$module = $obj->module;
 								}
 								$label = '&nbsp;&nbsp; '.$label;
-								if (!isset($repcode['AC_ALL_'.strtoupper($module)])) {	// If first time for this module
+								if (!isset($rep_code['AC_ALL_'.strtoupper($module)])) {	// If first time for this module
 									$idforallfornewmodule--;
 								}
 								$TModule['id'][$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module));
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index d7b60f5e5ef..a6dce13a694 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -339,7 +339,7 @@ class ICal
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
+	 * Return Unix time from ical date time format (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
 	 *
 	 * @param 	string		$ical_date		String date
 	 * @return 	int
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f8bc4e88215..ad681813b42 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -318,7 +318,7 @@ if (empty($mode) || $mode == 'show_month') {
 	$max_day_in_prev_month = date("t", dol_mktime(12, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
 	$max_day_in_month = date("t", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')); // Nb of days in next month
 	// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
+	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 	if ($tmpday >= 1) {
 		$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
@@ -721,7 +721,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncom
 if ($resourceid > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 }
@@ -782,7 +782,7 @@ if ($search_sale && $search_sale != '-1') {
 if ($socid) {
 	$sql .= " AND a.fk_soc = ".((int) $socid);
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
@@ -832,7 +832,7 @@ if ($status == 'done' || $status == '100') {
 if ($status == 'todo') {
 	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
 	if ($filtert > 0) {
@@ -1029,7 +1029,7 @@ if ($showbirthday) {
 			$datebirth = dol_stringtotime($obj->birthday, 1);
 			//print 'ee'.$obj->birthday.'-'.$datebirth;
 			$datearray = dol_getdate($datebirth, true);
-			$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output
+			$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they won't but converted during output
 			$event->datef = $event->datep;
 
 			$event->type_code = 'BIRTHDAY';
@@ -1213,7 +1213,7 @@ if (count($listofextcals)) {
 						// datecurstart and datecurend are now GMT date
 						//var_dump($datecurstart); var_dump($datecurend); exit;
 					} else {
-						// Not a recongized record
+						// Not a recognized record
 						dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
 						continue;
 					}
@@ -1243,7 +1243,7 @@ if (count($listofextcals)) {
 							}
 							$moreicalevents[] = $newevent;
 						}
-						// Jump on next occurence
+						// Jump on next occurrence
 						$numofevent++;
 						$savdatecurstart = $datecurstart;
 						if ($icalevent['RRULE']['FREQ'] == 'DAILY') {
@@ -1285,7 +1285,7 @@ if (count($listofextcals)) {
 				$event = new ActionComm($db);
 				$addevent = false;
 				if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event
-					// For full day events, date are also GMT but they wont but converted using tz during output
+					// For full day events, date are also GMT but they won't but converted using tz during output
 					$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
 					if (empty($icalevent['DTEND;VALUE=DATE'])) {
 						$dateend = $datestart + 86400 - 1;
@@ -1349,7 +1349,7 @@ if (count($listofextcals)) {
 
 					$event->icalname = $namecal;
 					$event->icalcolor = $colorcal;
-					$usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
+					$usertime = 0; // We don't modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
 					$event->datep = $datestart + $usertime;
 					$event->datef = $dateend + $usertime;
 
@@ -1695,7 +1695,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 	/* WIP View per hour */
 	$useviewhour = 0;
 	if ($useviewhour) {
-		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 
 		$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
 
@@ -1734,7 +1734,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 
 		print '</div>';
 	} else {
-		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars);
 
@@ -1809,7 +1809,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 		print '</a>';
 		print '</div><div class="nowrap floatright inline-block marginrightonly">';
 		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
+			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, useful for nojs interfaces
 			print img_picto($langs->trans("NewAction"), 'edit_add.png');
 			print '</a>';
 		}
@@ -2073,6 +2073,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						print $listofusertoshow;
 					}
 
+					$parameters = array();
 					$reshook = $hookmanager->executeHooks('eventOptions', $parameters, $event, $action); // Note that $action and $object may have been modified by some hooks
 					if ($reshook < 0) {
 						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -2353,7 +2354,7 @@ function sort_events_by_date($a, $b)
 function sort_events_by_percentage($a, $b)
 {
 	// Sort events with no percentage before each other
-	// (usefull to sort holidays, sick days or similar on the top)
+	// (useful to sort holidays, sick days or similar on the top)
 
 	if ($a->percentage < 0) {
 		return -1;
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 2301e3e329c..3af992cec85 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -19,7 +19,7 @@
 /**
  *      \file       htdocs/comm/action/info.php
  *      \ingroup    agenda
- *		\brief      Page des informations d'une action
+ *		\brief      Page des information d'une action
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index d499b8b050f..c4846a646d3 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -445,7 +445,7 @@ $sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";
 if ($resourceid > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 }
@@ -506,7 +506,7 @@ if ($search_sale && $search_sale != '-1') {
 if ($socid) {
 	$sql .= " AND a.fk_soc = ".((int) $socid);
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
@@ -540,7 +540,7 @@ if ($search_title) {
 if ($search_note) {
 	$sql .= natural_search('a.note', $search_note);
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
 	if ($filtert > 0) {
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index a18f98ebdaa..40aa0e8ad5d 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -526,7 +526,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncom
 if ($resourceid > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 }
@@ -587,7 +587,7 @@ if ($search_sale && $search_sale != '-1') {
 if ($socid) {
 	$sql .= " AND a.fk_soc = ".((int) $socid);
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
@@ -635,7 +635,7 @@ if ($status == 'done' || $status == '100') {
 if ($status == 'todo') {
 	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
 	if ($filtert > 0) {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 818ff18c13b..1e480c79a14 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -539,7 +539,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as ca, ".MAIN_DB_PREFIX."actioncom
 if ($resourceid > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
 }
-// We must filter on assignement table
+// We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 	$sql .= " ON ar.fk_actioncomm = a.id AND ar.element_type='user'";
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index ed6a3f8ed9e..5ef15ca226a 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -58,7 +58,7 @@ if (!$sortfield) {
 // Security check
 //$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
 if (!$user->hasRight("agenda", "allactions", "read")) {
-	accessForbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7de1f77ba5c..230f9b4a43d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -513,7 +513,7 @@ if ($object->id > 0) {
 
 	if ($object->client) {
 		if (isModEnabled('commande') && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
-			print '<!-- Minimim amount for orders -->'."\n";
+			print '<!-- Minimum amount for orders -->'."\n";
 			print '<tr class="nowrap">';
 			print '<td>';
 			print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->hasRight('societe', 'creer'));
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 3023a70c546..255ab70afa7 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -105,7 +105,7 @@ if (!empty($search_firstname)) {
 if (!empty($search_company)) {
 	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
-if (!empty($contactname)) { // acces a partir du module de recherche
+if (!empty($contactname)) { // access a partir du module de recherche
 	$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
 	$sortfield = "p.name";
 	$sortorder = "ASC";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 91d667348af..a8f940ba16e 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -56,7 +56,7 @@ $langs->loadLangs(array("boxes", "commercial", "contracts", "orders", "propal",
 $action = GETPOST('action', 'aZ09');
 $bid = GETPOST('bid', 'int');
 
-// Securite acces client
+// Securite access client
 $socid = GETPOST('socid', 'int');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 52ad525b850..e657b133185 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2016 Laurent Destailleur  <eldy@uers.sourceforge.net>
+ * Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -256,7 +256,7 @@ if ($action == 'add') {
 }
 
 if ($action == 'clear') {
-	// Chargement de la classe
+	// Load a new class instance
 	$classname = "MailingTargets";
 	$obj = new $classname($db);
 	$obj->clear_target($id);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 829db35466b..0a5916135d1 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005-2019	Laurent Destailleur		<eldy@uers.sourceforge.net>
+ * Copyright (C) 2005-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2016	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
  *
@@ -482,7 +482,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			// Is the message in html
-			$msgishtml = -1; // Unknow = autodetect by default
+			$msgishtml = -1; // Unknown = autodetect by default
 			if (preg_match('/[\s\t]*<html>/i', $object->body)) {
 				$msgishtml = 1;
 			}
@@ -852,7 +852,7 @@ if ($action == 'create') {
 			 * View mode mailing
 			 */
 			if ($action == 'sendall') {
-				// Define message to recommand from command line
+				// Define message to recommend from command line
 				$sendingmode = getDolGlobalString('EMAILING_MAIL_SENDMODE');
 				if (empty($sendingmode)) {
 					$sendingmode = getDolGlobalString('MAIN_MAIL_SENDMODE');
@@ -863,8 +863,8 @@ if ($action == 'create') {
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
 				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
-				// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
-				// MAILING_LIMIT_SENDBYDAY may be defined ot not (0 or undefined=no limit).
+				// MAILING_LIMIT_SENDBYCLI may be defined or not (-1=forbidden, 0 or undefined=no limit).
+				// MAILING_LIMIT_SENDBYDAY may be defined or not (0 or undefined=no limit).
 				if (getDolGlobalString('MAILING_NO_USING_PHPMAIL') && $sendingmode == 'mail') {
 					// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
 					// You ensure that every user is using its own SMTP server when using the mass emailing module.
@@ -893,7 +893,7 @@ if ($action == 'create') {
 					// The feature is forbidden from GUI, we show just message to use from command line.
 					setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
-					if ($conf->file->mailing_limit_sendbyweb != '-1') {  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
+					if ($conf->file->mailing_limit_sendbyweb != '-1') {  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed to increase it.
 						setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 9f18de8d931..e7769acca7e 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2023 Laurent Destailleur  <eldy@uers.sourceforge.net>
+ * Copyright (C) 2005-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index ef9f7c1444a..8c615b0c334 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Advance Targeting Emailling for mass emailing module
+/* Advance Targeting Emailing for mass emailing module
  * Copyright (C) 2013  Florian Henry <florian.henry@open-concept.pro>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -104,7 +104,7 @@ class AdvanceTargetingMailing extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param  DoliDb		$db		Database handler
+	 *  @param  DoliDB		$db		Database handler
 	 */
 	public function __construct($db)
 	{
@@ -918,12 +918,12 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 	/**
-	 * Parse criteria to return a SQL qury formated
+	 * Parse criteria to return a SQL query formatted
 	 *
 	 * 	@param		string		$column_to_test	column to test
-	 *  @param		string		$criteria	Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
+	 *  @param		string		$criteria	Use %% as magic characters. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
 	 *  									and use ! for except this value.
-	 *  									For exemple  jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
+	 *  									For example  jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig that start by jima
 	 * 	@return		string		Sql to use for the where condition
 	 */
 	public function transformToSQL($column_to_test, $criteria)
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 006405ee1dc..0d009bcd6ee 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -19,7 +19,7 @@
 /**
  * \file    comm/mailing/class/html.formadvtargetemailing.class.php
  * \ingroup mailing
- * \brief   Fichier de la classe des fonctions predefinies de composant html advtargetemailing
+ * \brief   File for the class with functions for the building of HTML components for advtargetemailing
  */
 
 /**
@@ -339,7 +339,7 @@ class FormAdvTargetEmailing extends Form
 	 * Return a combo list to select emailing target selector
 	 *
 	 * @param	string 		$htmlname 		control name
-	 * @param	integer 	$selected  		defaut selected
+	 * @param	integer 	$selected  		default selected
 	 * @param	integer 	$showempty 		empty lines
 	 * @param	string		$type_element	Type element. Example: 'mailing'
 	 * @param	string		$morecss		More CSS
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index ca218ba9173..e7058d81216 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -211,7 +211,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb      $db      Database handler
+	 *  @param      DoliDB      $db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -558,7 +558,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Validate emailing
 	 *
-	 *  @param	User	$user      	Objet user qui valide
+	 *  @param	User	$user      	Object user qui valide
 	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function valid($user)
@@ -660,7 +660,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Change status of each recipient
 	 *
-	 *	@param	User	$user      	Objet user qui valide
+	 *	@param	User	$user      	Object user qui valide
 	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function reset_targets_status($user)
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9e861d863f9..9098b0dc63a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -799,10 +799,14 @@ if (empty($reshook)) {
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED || $object->statut == Propal::STATUS_CANCELED) {
 			$db->begin();
 
-			$result = $object->reopen($user, !getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE'));
+			$newstatus = (getDolGlobalInt('PROPAL_SKIP_ACCEPT_REFUSE') ? Propal::STATUS_DRAFT : Propal::STATUS_VALIDATED);
+			$result = $object->reopen($user, $newstatus);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
+			} else {
+				$object->statut = $newstatus;
+				$object->status = $newstatus;
 			}
 
 			if (!$error) {
@@ -1220,7 +1224,7 @@ if (empty($reshook)) {
 					$desc = $prod->description;
 				}
 
-				//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
+				//If text set in desc is the same as product description (as now it's preloaded) we add it only one time
 				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
@@ -1306,7 +1310,7 @@ if (empty($reshook)) {
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
-			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
+			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
@@ -1435,7 +1439,7 @@ if (empty($reshook)) {
 
 		// Add buying price
 		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
 		$pu_ttc_devise = price2num(GETPOST('multicurrency_subprice_ttc'), '', 2);
@@ -1904,7 +1908,7 @@ if ($action == 'create') {
 			print '<td class="valuefieldcreate">';
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
-			// reload page to retrieve customer informations
+			// reload page to retrieve customer information
 			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
@@ -2515,8 +2519,8 @@ if ($action == 'create') {
 
 		// Link for thirdparty discounts
 		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index e460e2e4b8a..27408b28a79 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -57,7 +57,7 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get properties of a commercial proposal object
 	 *
-	 * Return an array with commercial proposal informations
+	 * Return an array with commercial proposal information
 	 *
 	 * @param   int         $id				ID of commercial proposal
 	 * @param   int         $contact_list	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -73,7 +73,7 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get properties of an proposal object by ref
 	 *
-	 * Return an array with proposal informations
+	 * Return an array with proposal information
 	 *
 	 * @param       string		$ref			Ref of object
 	 * @param       int         $contact_list	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -91,7 +91,7 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get properties of an proposal object by ref_ext
 	 *
-	 * Return an array with proposal informations
+	 * Return an array with proposal information
 	 *
 	 * @param       string		$ref_ext		External reference of object
 	 * @param       int         $contact_list	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -109,7 +109,7 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get properties of an proposal object
 	 *
-	 * Return an array with proposal informations
+	 * Return an array with proposal information
 	 *
 	 * @param   int         $id             ID of order
 	 * @param	string		$ref			Ref of object
@@ -156,7 +156,7 @@ class Proposals extends DolibarrApi
 	 * @param int		$page				Page number
 	 * @param string	$thirdparty_ids		Thirdparty ids to filter commercial proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                       Array of order objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $properties = '')
@@ -255,7 +255,7 @@ class Proposals extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->propal->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -693,7 +693,7 @@ class Proposals extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->propal->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index da70e894763..9b9c7d0dc15 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -236,24 +236,24 @@ class Propal extends CommonObject
 	public $address;
 
 	/**
-	 * @var int availabilty ID
+	 * @var int availability ID
 	 */
 	public $availability_id;
 
 	/**
-	 * @var int availabilty ID
+	 * @var int availability ID
 	 * @deprecated
 	 * @see $availability_id
 	 */
 	public $fk_availability;
 
 	/**
-	 * @var string availabilty code
+	 * @var string availability code
 	 */
 	public $availability_code;
 
 	/**
-	 * @var string availabilty label
+	 * @var string availability label
 	 */
 	public $availability;
 
@@ -304,7 +304,7 @@ class Propal extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -430,7 +430,7 @@ class Propal extends CommonObject
 	 * 	@param  int		$remise_percent  	Discount effected on Product
 	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 *
-	 *	TODO	Replace calls to this function by generation objet Ligne
+	 *	TODO	Replace calls to this function by generation object Ligne
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0)
 	{
@@ -786,7 +786,7 @@ class Propal extends CommonObject
 					}
 				}
 
-				// Mise a jour informations denormalisees au niveau de la propale meme
+				// Mise a jour information denormalisees au niveau de la propale meme
 				if (empty($noupdateafterinsertline)) {
 					$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
 				}
@@ -824,7 +824,7 @@ class Propal extends CommonObject
 	 *  @param	  	float		$txlocaltax2		Local tax 2 rate
 	 *  @param      string		$desc            	Description
 	 *	@param	  	string		$price_base_type	HT or TTC
-	 *	@param      int			$info_bits        	Miscellaneous informations
+	 *	@param      int			$info_bits        	Miscellaneous information
 	 *	@param		int			$special_code		Special code (also used by externals modules!)
 	 * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
 	 * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
@@ -1614,7 +1614,7 @@ class Propal extends CommonObject
 			}
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
 		} else {
-			// Dont't use entity if you use rowid
+			// Don't use entity if you use rowid
 			$sql .= " WHERE p.rowid = ".((int) $rowid);
 		}
 
@@ -1987,7 +1987,7 @@ class Propal extends CommonObject
 
 		// Protection
 		if ($this->statut == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -2981,7 +2981,7 @@ class Propal extends CommonObject
 	 *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
 	 *    @param	int		$draft				0=not draft, 1=draft
 	 *    @param	int		$notcurrentuser		0=all user, 1=not current user
-	 *    @param    int		$socid				Id third pary
+	 *    @param    int		$socid				Id third party
 	 *    @param    int		$limit				For pagination
 	 *    @param    int		$offset				For pagination
 	 *    @param    string	$sortfield			Sort criteria
@@ -3082,14 +3082,14 @@ class Propal extends CommonObject
 
 		$this->fetchObjectLinked($id, $this->element);
 		foreach ($this->linkedObjectsIds as $objecttype => $objectid) {
-			// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
+			// Nouveau système du common object renvoi des rowid et non un id linéaire de 1 à n
 			// On parcourt donc une liste d'objets en tant qu'objet unique
 			foreach ($objectid as $key => $object) {
 				// Cas des factures liees directement
 				if ($objecttype == 'facture') {
 					$linkedInvoices[] = $object;
 				} else {
-					// Cas des factures liees par un autre objet (ex: commande)
+					// Cas des factures liees par un autre object (ex: commande)
 					$this->fetchObjectLinked($object, $objecttype);
 					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid) {
 						foreach ($subobjectid as $subkey => $subobject) {
@@ -3623,7 +3623,7 @@ class Propal extends CommonObject
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->ref_client = 'NEMICEPS';
@@ -3687,7 +3687,7 @@ class Propal extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge indicateurs this->nb de tableau de bord
+	 *      Load the indicators this->nb for the state board
 	 *
 	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
@@ -3854,7 +3854,7 @@ class Propal extends CommonObject
 	 *
 	 *	@param      int		$withpicto		          Add picto into link
 	 *	@param      string	$option			          Where point the link ('expedition', 'document', ...)
-	 *	@param      string	$get_params    	          Parametres added to url
+	 *	@param      string	$get_params    	          Parameters added to url
 	 *  @param	    int   	$notooltip		          1=Disable tooltip
 	 *  @param      int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @param      int     $addlinktonotes           -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
@@ -4156,14 +4156,14 @@ class PropaleLigne extends CommonObjectLine
 	public $marge_tx;
 	public $marque_tx;
 
-	public $special_code; // Tag for special lines (exlusive tags)
+	public $special_code; // Tag for special lines (exclusive tags)
 	// 1: frais de port
 	// 2: ecotaxe
 	// 3: option line (when qty = 0)
 
 	public $info_bits = 0; // Some other info:
-	// Bit 0: 	0 si TVA normal - 1 si TVA NPR
-	// Bit 1:	0 ligne normale - 1 si ligne de remise fixe
+	// Bit 0: 	0 si TVA normal - 1 if TVA NPR
+	// Bit 1:	0 ligne normal - 1 if line with fixed discount
 
 	public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
 	public $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
@@ -4246,7 +4246,7 @@ class PropaleLigne extends CommonObjectLine
 
 
 	/**
-	 * 	Class line Contructor
+	 * 	Class line Constructor
 	 *
 	 * 	@param	DoliDB	$db	Database handler
 	 */
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index e56d383550c..1da537b7d89 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -22,7 +22,7 @@
 /**
  *       \file       htdocs/comm/propal/contact.php
  *       \ingroup    propal
- *       \brief      Tab to manage contacts/adresses of proposal
+ *       \brief      Tab to manage contacts/addresses of proposal
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index a3da222a216..b17ae959b9a 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -151,7 +151,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permi
 		$newid2 = $newdiscount2->create($user);
 		if ($res > 0 && $newid1 > 0 && $newid2 > 0) {
 			$db->commit();
-			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb with back
 			exit;
 		} else {
 			$db->rollback();
@@ -210,7 +210,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 	$result = $discount->delete($user);
 	if ($result > 0) {
 		$db->commit();
-		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb with back
 		exit;
 	} else {
 		setEventMessages($discount->error, $discount->errors, 'errors');
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index bc71e961fb1..d96c42c38ed 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -916,7 +916,7 @@ if (empty($reshook)) {
 					$desc = $prod->description;
 				}
 
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
@@ -1002,7 +1002,7 @@ if (empty($reshook)) {
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
-			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
+			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 			// Prepare a price equivalent for minimum price check
 			$pu_equivalent = $pu_ht;
@@ -1162,7 +1162,7 @@ if (empty($reshook)) {
 
 		// Add buying price
 		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1855,7 +1855,7 @@ if ($action == 'create' && $usercancreate) {
 			print '<td class="valuefieldcreate">';
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
-			// reload page to retrieve customer informations
+			// reload page to retrieve customer information
 			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
@@ -2495,8 +2495,8 @@ if ($action == 'create' && $usercancreate) {
 
 			// Relative and absolute discounts
 			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-				$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+				$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+				$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 			} else {
 				$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 				$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
@@ -2542,7 +2542,7 @@ if ($action == 'create' && $usercancreate) {
 			print '</td>';
 			print '</tr>';
 
-			// Delivery date planed
+			// Delivery date planned
 			print '<tr><td>';
 			$editenable = $usercancreate;
 			print $form->editfieldkey("DateDeliveryPlanned", 'date_livraison', '', $object, $editenable);
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index b622f3d9d22..d3952d1db1f 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -54,7 +54,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Get properties of an order object by id
 	 *
-	 * Return an array with order informations
+	 * Return an array with order information
 	 *
 	 * @param       int         $id            ID of order
 	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -70,7 +70,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Get properties of an order object by ref
 	 *
-	 * Return an array with order informations
+	 * Return an array with order information
 	 *
 	 * @param       string		$ref			Ref of object
 	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -88,7 +88,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Get properties of an order object by ref_ext
 	 *
-	 * Return an array with order informations
+	 * Return an array with order information
 	 *
 	 * @param       string		$ref_ext			External reference of object
 	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@@ -106,7 +106,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Get properties of an order object
 	 *
-	 * Return an array with order informations
+	 * Return an array with order information
 	 *
 	 * @param       int         $id				ID of order
 	 * @param		string		$ref			Ref of object
@@ -157,7 +157,7 @@ class Orders extends DolibarrApi
 	 * @param string		   $thirdparty_ids		Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param string           $sqlfilterlines      Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException 404 Not found
@@ -257,7 +257,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Create a sale order
 	 *
-	 * Exemple: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
+	 * Example: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
 	 *
 	 * @param   array   $request_data   Request data
 	 * @return  int     ID of order
@@ -272,7 +272,7 @@ class Orders extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->commande->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -496,7 +496,7 @@ class Orders extends DolibarrApi
 	/**
 	 * Get contacts of given order
 	 *
-	 * Return an array with contact informations
+	 * Return an array with contact information
 	 *
 	 * @param	int		$id			ID of order
 	 * @param	string	$type		Type of the contact (BILLING, SHIPPING, CUSTOMER)
@@ -648,7 +648,7 @@ class Orders extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->commande->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9435db2389e..5a0081baf88 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -298,7 +298,7 @@ class Commande extends CommonOrder
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -475,7 +475,7 @@ class Commande extends CommonOrder
 
 		// Protection
 		if ($this->statut == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -766,7 +766,7 @@ class Commande extends CommonOrder
 	/**
 	 *  Close order
 	 *
-	 * 	@param      User	$user       Objet user that close
+	 * 	@param      User	$user       Object user that close
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
@@ -899,7 +899,7 @@ class Commande extends CommonOrder
 	 *	Create order
 	 *	Note that this->ref can be set or empty. If empty, we will use "(PROV)"
 	 *
-	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		User	$user 		Object user that make creation
 	 *	@param		int	    $notrigger	Disable all triggers
 	 *	@return 	int			        Return integer <0 if KO, >0 if OK
 	 */
@@ -1453,7 +1453,7 @@ class Commande extends CommonOrder
 			}
 
 			if (!$error) {
-				// Validate immediatly the order
+				// Validate immediately the order
 				if (getDolGlobalString('ORDER_VALID_AFTER_CLOSE_PROPAL')) {
 					$this->fetch($ret);
 					$this->valid($user);
@@ -1503,7 +1503,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@see        add_product()
 	 *
-	 *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 *	Les parameters sont deja cense etre juste et avec valeurs finales a l'appel
 	 *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
 	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
 	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
@@ -1722,7 +1722,7 @@ class Commande extends CommonOrder
 					}
 				}
 
-				// Mise a jour informations denormalisees au niveau de la commande meme
+				// Mise a jour information denormalisees au niveau de la commande meme
 				if (empty($noupdateafterinsertline)) {
 					$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
 				}
@@ -1759,7 +1759,7 @@ class Commande extends CommonOrder
 	 * 	@param  int|string   $date_end           End date of the line
 	 * 	@return void
 	 *
-	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
+	 *	TODO	Remplacer les appels a cette fonction par generation object Ligne
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
 	{
@@ -1885,7 +1885,7 @@ class Commande extends CommonOrder
 		if ($id) {
 			$sql .= " WHERE c.rowid=".((int) $id);
 		} else {
-			$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
+			$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Don't use entity if you use rowid
 		}
 
 		if ($ref) {
@@ -2001,10 +2001,10 @@ class Commande extends CommonOrder
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Adding line of fixed discount in the order in DB
+	 *	Add line of fixed discount in the order in DB
 	 *
-	 *	@param     int	$idremise			Id de la remise fixe
-	 *	@return    int          			>0 si ok, <0 si ko
+	 *	@param     int	$idremise			Id for the fixed discount
+	 *	@return    int          			>0 if OK, <0 if KO
 	 */
 	public function insert_discount($idremise)
 	{
@@ -2661,7 +2661,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Set the planned delivery date
 	 *
-	 *	@param      User	$user        		Objet utilisateur qui modifie
+	 *	@param      User	$user        		Object utilisateur qui modifie
 	 *	@param      int		$delivery_date     Delivery date
 	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				Return integer <0 si ko, >0 si ok
@@ -2720,8 +2720,8 @@ class Commande extends CommonOrder
 	 *
 	 *  @param		int		$shortlist		0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
 	 *  @param      int		$draft      	0=not draft, 1=draft
-	 *  @param      User	$excluser      	Objet user to exclude
-	 *  @param    	int		$socid			Id third pary
+	 *  @param      User	$excluser      	Object user to exclude
+	 *  @param    	int		$socid			Id third party
 	 *  @param    	int		$limit			For pagination
 	 *  @param    	int		$offset			For pagination
 	 *  @param    	string	$sortfield		Sort criteria
@@ -3091,7 +3091,7 @@ class Commande extends CommonOrder
 	 * 	@param		float			$txlocaltax1		Local tax 1 rate
 	 *  @param		float			$txlocaltax2		Local tax 2 rate
 	 *  @param    	string			$price_base_type	HT or TTC
-	 *  @param    	int				$info_bits        	Miscellaneous informations on line
+	 *  @param    	int				$info_bits        	Miscellaneous information on line
 	 *  @param    	int|string		$date_start        	Start date of the line
 	 *  @param    	int|string		$date_end          	End date of the line
 	 * 	@param		int				$type				Type of line (0=product, 1=service)
@@ -3929,7 +3929,7 @@ class Commande extends CommonOrder
 
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
@@ -4002,7 +4002,7 @@ class Commande extends CommonOrder
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -4064,9 +4064,9 @@ class Commande extends CommonOrder
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Charge indicateurs this->nb de tableau de bord
+	 *	Load the indicators this->nb for the state board
 	 *
-	 *	@return     int         Return integer <0 si ko, >0 si ok
+	 *	@return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -4114,7 +4114,7 @@ class Commande extends CommonOrder
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 81f94a5b823..3d3bdc94425 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -157,7 +157,7 @@ print '</div><div class="fichetwothirdright">';
 $max = 5;
 
 /*
- * Lattest modified orders
+ * Latest modified orders
  */
 
 $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index bc106bef635..4e85de3a593 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -359,7 +359,7 @@ if (empty($reshook)) {
 
 			$objecttmp = new Facture($db);
 			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
-				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
+				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we reuse it.
 				$objecttmp = $TFactThird[$cmd->socid];
 			} else {
 				// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
@@ -894,7 +894,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
 		if ($search_status == 1 && !isModEnabled('expedition')) {
-			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
+			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
 			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
 		}
@@ -1522,7 +1522,7 @@ if (GETPOST('autoselectall', 'int')) {
 	$selectedfields .= '</script>';
 }
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
@@ -2660,7 +2660,7 @@ while ($i < $imaxinloop) {
 							} else {  // BUGGED CODE.
 								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
 								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
-								// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
+								// Detailed virtual stock, looks bugged, incomplete and need heavy load.
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index d5be3f7b82d..4a51d05908d 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -473,9 +473,9 @@ if ($search_billed != '' && $search_billed >= 0) {
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
 		if ($search_status == 1 && !isModEnabled('expedition')) {
-			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
+			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
-			$sql .= ' AND c.fk_statut = '.((int) $search_status); // brouillon, validee, en cours, annulee
+			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
 		}
 	}
 	if ($search_status == -2) {	// To process
@@ -2119,7 +2119,7 @@ if ($resql) {
 						} else {  // BUGGED CODE.
 							// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
 							// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
-							// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
+							// Detailed virtual stock, looks bugged, incomplete and need heavy load.
 							// stock order and stock order_supplier
 							$stock_order = 0;
 							$stock_order_supplier = 0;
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index c26a10cec34..6bd2223a627 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -261,7 +261,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
 			$sql .= " WHERE t.date_ech between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
-			//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
+			//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_UNPAID;
 			if (!empty($projectid)) {
 				$sql .= " AND fk_projet = ".((int) $projectid);
 			}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 0960b984c04..522b2d56939 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -147,7 +147,7 @@ if ($id > 0 || !empty($ref)) {
 		dol_print_error($db);
 	}
 } else {
-	Header('Location: index.php');
+	header('Location: index.php');
 	exit;
 }
 
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 3ea7584d05f..88ab3172ad9 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -338,10 +338,10 @@ class CashControl extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -349,11 +349,11 @@ class CashControl extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 1b02beaa5f4..e7df4ff4342 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -356,6 +356,47 @@ class Invoices extends DolibarrApi
 		return $this->_cleanObjectDatas($this->invoice);
 	}
 
+	/**
+	* Create an invoice using a contract.
+	*
+	* @param int   $contractid       Id of the contract
+	* @return     Object                          Object with cleaned properties
+	*
+	* @url     POST /createfromcontract/{contractid}
+	*
+	* @throws RestException 400
+	* @throws RestException 401
+	* @throws RestException 404
+	* @throws RestException 405
+	*/
+	public function createInvoiceFromContract($contractid)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+		if (!DolibarrApiAccess::$user->hasRight('contrat', 'lire')) {
+			throw new RestException(401);
+		}
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($contractid)) {
+			throw new RestException(400, 'Contract ID is mandatory');
+		}
+
+		$contract = new Contrat($this->db);
+		$result = $contract->fetch($contractid);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
+
+		$result = $this->invoice->createFromContract($contract, DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+		$this->invoice->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->invoice);
+	}
+
 	/**
 	 * Get lines of an invoice
 	 *
@@ -623,6 +664,11 @@ class Invoices extends DolibarrApi
 			}
 
 			$this->invoice->$field = $value;
+
+			// If cond reglement => update date lim reglement
+			if ($field == 'cond_reglement_id') {
+				$this->invoice->date_lim_reglement = $this->invoice->calculate_date_lim_reglement();
+			}
 		}
 
 		// update bank account
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index f6750d673e5..84db8a44be2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3007,7 +3007,7 @@ class Facture extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Tags the invoice as incompletely paied and call the trigger BILL_UNPAYED
+	 *  Tags the invoice as incompletely paid and call the trigger BILL_UNPAYED
 	 *	This method is used when a direct debit (fr:prelevement) is refused
 	 * 	or when a canceled invoice is reopened.
 	 *
@@ -3242,7 +3242,7 @@ class Facture extends CommonInvoice
 				} else {
 					if ($key == 'EMAIL') {
 						// Check for mandatory
-						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEMail($this->thirdparty->email)) {
+						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEmail($this->thirdparty->email)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorBadEMail", $this->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -6623,10 +6623,10 @@ class FactureLigne extends CommonInvoiceLine
 	 * Delete line in database
 	 *
 	 * @param 	User 	$tmpuser    User that deletes
-	 * @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 * @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 * @return 	int		           	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($tmpuser = null, $notrigger = false)
+	public function delete($tmpuser = null, $notrigger = 0)
 	{
 		global $user;
 
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index de21bfeadd1..b8a4bb77c64 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -60,7 +60,7 @@ class Cpaiement extends CommonDict
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -70,12 +70,11 @@ class Cpaiement extends CommonDict
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -226,12 +225,11 @@ class Cpaiement extends CommonDict
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int $notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -311,12 +309,11 @@ class Cpaiement extends CommonDict
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index a73c6e140c7..98d4adb5c60 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -41,14 +41,14 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
 
-$action				= GETPOST('action', 'alpha');
-$massaction			= GETPOST('massaction', 'alpha');
-$confirm			= GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
-$facid				= GETPOST('facid', 'int');
-$socid				= GETPOST('socid', 'int');
+$facid = GETPOST('facid', 'int');
+$socid = GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
 
 $search_ref = GETPOST("search_ref", "alpha");
@@ -68,9 +68,10 @@ $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be
 $search_status = GETPOST('search_status', 'intcomma');
 $search_sale = GETPOST('search_sale', 'int');
 
+$mode = GETPOST('mode', 'alpha');
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST('sortfield', 'aZ09comma');
-$sortorder			= GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 8e35e46de3f..31a5893185d 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -439,10 +439,10 @@ class BonPrelevement extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -2084,7 +2084,7 @@ class BonPrelevement extends CommonObject
 		fputs($this->file, substr(strtoupper($client_nom)."                         ", 0, 24));
 
 		// Domiciliation facultative D1
-		$domiciliation = strtr($rib_dom, array(" " => "-", CHR(13) => " ", CHR(10) => ""));
+		$domiciliation = strtr($rib_dom, array(" " => "-", chr(13) => " ", chr(10) => ""));
 		fputs($this->file, substr($domiciliation."                         ", 0, 24));
 
 		// Zone Reservee D2
@@ -2189,8 +2189,8 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
 			$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
-			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
+			$addressline1 = strtr($row_address, array(chr(13) => ", ", chr(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
 			if (trim($addressline1)) {
 				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
@@ -2258,8 +2258,8 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
 			$XML_CREDITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
-			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
+			$addressline1 = strtr($row_address, array(chr(13) => ", ", chr(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
 			if (trim($addressline1)) {
 				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
@@ -2436,8 +2436,8 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => ""));
-				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => ""));
+				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(chr(13) => ", ", chr(10) => ""));
+				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
 				if ($addressline1) {
 					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
@@ -2502,8 +2502,8 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => ""));
-				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => ""));
+				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(chr(13) => ", ", chr(10) => ""));
+				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
 				if ($addressline1) {
 					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 58a692d2f11..8c29fe94dc8 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -78,7 +78,7 @@ class LignePrelevement
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb	$db			Database handler
+	 *  @param	DoliDB	$db			Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 13fffee6cc0..c66dda3df0a 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -67,7 +67,7 @@ class RejetPrelevement
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb	$db			Database handler
+	 *  @param	DoliDB	$db			Database handler
 	 *  @param 	User	$user       Object user
 	 *  @param	string	$type		Type ('direct-debit' for direct debit or 'bank-transfer' for credit transfer)
 	 */
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index c1ace761438..653c14b49e6 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -182,7 +182,7 @@ $months = array(
 	$langs->trans("MonthShort12"),
 );
 
-llxheader('', $langs->trans('ReportInOut'));
+llxHeader('', $langs->trans('ReportInOut'));
 
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 89b6db0e0cc..c670676806b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -85,7 +85,7 @@ if ($id > 0 || $ref) {
 
 $permissiontoread = $user->rights->tax->charges->lire;
 $permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_UNPAID);
 $permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1];
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index baaadd685d1..1c106b8d399 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -82,7 +82,7 @@ class Cchargesociales
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -92,12 +92,11 @@ class Cchargesociales
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -236,12 +235,11 @@ class Cchargesociales
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -310,12 +308,11 @@ class Cchargesociales
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index c0751d0f842..5ca22da196c 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -84,7 +84,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $permissiontoread = $user->rights->tax->charges->lire;
 $permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_UNPAID);
 $permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1].'/vat';
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 65dbb19aca7..d6d1a6c04d6 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -187,7 +187,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	 */
 	$head = array();
 	if ($id > 0) {
-		// Si edition contact deja existant
+		// Si edition contact deja existent
 		$object = new Contact($db);
 		$res = $object->fetch($id, $user);
 		if ($res < 0) {
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 301f9dbac0c..2061d2c711f 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -18,12 +18,12 @@
 /**
  *	\file       htdocs/contact/canvas/actions_contactcard_common.class.php
  *	\ingroup    thirdparty
- *	\brief      Fichier de la classe Thirdparty contact card controller (common)
+ *	\brief      File for the class Thirdparty contact card controller (common)
  */
 
 /**
  *	\class      ActionsContactCardCommon
- *	\brief      Classe permettant la gestion des contacts par defaut
+ *	\brief      Common Abstract Class for contact managmeent
  */
 abstract class ActionsContactCardCommon
 {
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index adad330f60c..7816e07148a 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -19,20 +19,20 @@
 /**
  *	\file       htdocs/contact/canvas/default/actions_contactcard_default.class.php
  *	\ingroup    thirdparty
- *	\brief      Fichier de la classe Thirdparty contact card controller (default canvas)
+ *	\brief      File for the class Thirdparty contact card controller (default canvas)
  */
 include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php';
 
 /**
  *	\class      ActionsContactCardDefault
- *	\brief      Classe permettant la gestion des contacts par defaut
+ *	\brief      Default Class to manage contacts
  */
 class ActionsContactCardDefault extends ActionsContactCardCommon
 {
 	/**
 	 *  Constructor
 	 *
-	 *	@param	DoliDB	$db				Handler acces base de donnees
+	 *	@param	DoliDB	$db				Handler access base de donnees
 	 *	@param	string	$dirmodule		Name of directory of module
 	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
 	 *	@param	string	$canvas			Name of canvas
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1f3aa963476..43e65ab45be 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -175,7 +175,7 @@ if (empty($reshook)) {
 	}
 
 
-	// Confirmation desactivation
+	// Confirmation deactivation
 	if ($action == 'disable' && !empty($permissiontoadd)) {
 		$object->fetch($id);
 		if ($object->setstatus(0) < 0) {
@@ -257,7 +257,7 @@ if (empty($reshook)) {
 			$action = 'create';
 		}
 
-		if (!empty($object->email) && !isValidEMail($object->email)) {
+		if (!empty($object->email) && !isValidEmail($object->email)) {
 			$langs->load("errors");
 			$error++;
 			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
@@ -348,7 +348,7 @@ if (empty($reshook)) {
 			$action = 'edit';
 		}
 
-		if (!empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)) && !isValidEMail(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (!empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)) && !isValidEmail(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$langs->load("errors");
 			$error++;
 			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
@@ -608,7 +608,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	 */
 	$head = array();
 	if ($id > 0) {
-		// Si edition contact deja existant
+		// Si edition contact deja existent
 		$object = new Contact($db);
 		$res = $object->fetch($id, $user);
 		if ($res < 0) {
@@ -896,7 +896,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '<hr style="margin-bottom: 20px">';
 
-			// Add personnal information
+			// Add personal information
 			print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>', '', '');
 
 			print '<table class="border centpercent">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 5931e4e5de6..92e3d3b2369 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -81,7 +81,7 @@ class Contact extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -557,10 +557,10 @@ class Contact extends CommonObject
 	}
 
 	/**
-	 *      Update informations into database
+	 *      Update information into database
 	 *
 	 *      @param      int		$id          	Id of contact/address to update
-	 *      @param      User	$user        	Objet user making change
+	 *      @param      User	$user        	Object user making change
 	 *      @param      int		$notrigger	    0=no, 1=yes
 	 *      @param		string	$action			Current action for hookmanager
 	 *      @param		int		$nosyncuser		No sync linked user (external users and contacts are linked)
@@ -889,7 +889,7 @@ class Contact extends CommonObject
 
 		$this->db->begin();
 
-		// Mis a jour contact
+		// Update the contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
 		$sql .= " birthday = ".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
@@ -1961,7 +1961,7 @@ class Contact extends CommonObject
 		global $langs;
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
-		// If lib not found in language file, we get label from cache/databse
+		// If lib not found in language file, we get label from cache/database
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
@@ -2120,7 +2120,7 @@ class Contact extends CommonObject
 
 	/**
 	 *  get "blacklist" mailing status
-	 * 	set no_email attribut to 1 or 0
+	 * 	set no_email attribute to 1 or 0
 	 *
 	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index ee74c92c52e..0692572d396 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -149,7 +149,7 @@ if (getDolGlobalString('LDAP_CONTACT_ACTIVE') && getDolGlobalInt('LDAP_CONTACT_A
 
 
 
-// Affichage attributs LDAP
+// Affichage attributes LDAP
 print load_fiche_titre($langs->trans("LDAPInformationsForThisContact"));
 
 print '<table width="100%" class="noborder">';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 8ecd25f94ae..cacc80be90f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -441,7 +441,7 @@ if (getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES'))
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-// Select every potentiels, and note each potentiels which fit in search parameters
+// Select every potentials, and note each potentials which fit in search parameters
 $tab_level = array();
 $sql = "SELECT code, label, sortorder";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index aec034fbe8c..b475262ca32 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -21,7 +21,7 @@
 /**
  *       \file       htdocs/contact/perso.php
  *       \ingroup    societe
- *       \brief      Onglet informations personnelles d'un contact
+ *       \brief      Onglet information personnelles d'un contact
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 33818122a4f..5760cc9e670 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -117,7 +117,7 @@ if ($company->id) {
 	}
 }
 
-// Personal informations
+// Personal information
 $v->setPhoneNumber($contact->phone_perso, "TYPE=HOME;VOICE");
 if ($contact->birthday) {
 	$v->setBirthday($contact->birthday);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index eedd7c948e0..7f6a0958e06 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -560,7 +560,7 @@ if (empty($reshook)) {
 
 				$desc = $prod->description;
 
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 				if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc = '';
 				}
@@ -1690,7 +1690,7 @@ if ($action == 'create') {
 						$colspan++;
 					}
 
-					// Dates of service planed and real
+					// Dates of service planned and real
 					if ($objp->subprice >= 0) {
 						print '<tr class="oddeven" '.$moreparam.'>';
 						print '<td colspan="'.$colspan.'">';
@@ -1820,7 +1820,7 @@ if ($action == 'create') {
 						$colspan++;
 					}
 
-					// Line dates planed
+					// Line dates planned
 					print '<tr class="oddeven">';
 					print '<td colspan="'.$colspan.'">';
 					print $langs->trans("DateStartPlanned").' ';
@@ -1971,7 +1971,7 @@ if ($action == 'create') {
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
 
-				// Definie date debut et fin par defaut
+				// Definie date debut et fin par default
 				$dateactstart = $objp->date_start;
 				if (GETPOST('remonth')) {
 					$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@@ -2028,7 +2028,7 @@ if ($action == 'create') {
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
 
-				// Definie date debut et fin par defaut
+				// Definie date debut et fin par default
 				$dateactstart = $objp->date_start_real;
 				if (GETPOST('remonth')) {
 					$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 2cd4ec3d349..8e54ba37989 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -57,7 +57,7 @@ class Contracts extends DolibarrApi
 	/**
 	 * Get properties of a contract object
 	 *
-	 * Return an array with contract informations
+	 * Return an array with contract information
 	 *
 	 * @param   int         $id         ID of contract
 	 * @return  Object					Object with cleaned properties
@@ -95,7 +95,7 @@ class Contracts extends DolibarrApi
 	 * @param int			   $page				Page number
 	 * @param string		   $thirdparty_ids		Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of contract objects
 	 *
 	 * @throws RestException 404 Not found
@@ -191,7 +191,7 @@ class Contracts extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->contract->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -504,7 +504,7 @@ class Contracts extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->contract->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index cc7f992053c..2e7b222698a 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -122,7 +122,7 @@ class Contrat extends CommonObject
 	public $fk_soc;
 
 
-	public $societe; // Objet societe
+	public $societe; // Object societe
 
 	/**
 	 * Status of the contract
@@ -226,7 +226,7 @@ class Contrat extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -338,7 +338,7 @@ class Contrat extends CommonObject
 	/**
 	 *  Activate a contract line
 	 *
-	 *  @param	User		$user       Objet User who activate contract
+	 *  @param	User		$user       Object User who activate contract
 	 *  @param  int			$line_id    Id of line to activate
 	 *  @param  int			$date_start Opening date
 	 *  @param  int|string	$date_end   Expected end date
@@ -361,7 +361,7 @@ class Contrat extends CommonObject
 	/**
 	 *  Close a contract line
 	 *
-	 *  @param	User		$user       Objet User who close contract
+	 *  @param	User		$user       Object User who close contract
 	 *  @param  int			$line_id    Id of line to close
 	 *  @param  int			$date_end	End date
 	 * 	@param	string		$comment	A comment typed by user
@@ -490,7 +490,7 @@ class Contrat extends CommonObject
 	/**
 	 * Validate a contract
 	 *
-	 * @param	User	$user      		Objet User
+	 * @param	User	$user      		Object User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @return	int						Return integer <0 if KO, >0 if OK
@@ -2163,7 +2163,7 @@ class Contrat extends CommonObject
 	}
 
 	/**
-	 *  Charge les informations d'ordre info dans l'objet contrat
+	 *  Charge les information d'ordre info dans l'objet contrat
 	 *
 	 *  @param  int		$id     id du contrat a charger
 	 *  @return	void
@@ -2280,7 +2280,7 @@ class Contrat extends CommonObject
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @param	User	$user           Objet user
+	 *      @param	User	$user           Object user
 	 *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
 	 *      @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
@@ -2376,7 +2376,7 @@ class Contrat extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *   Charge indicateurs this->nb de tableau de bord
+	 *   Load the indicators this->nb for state board
 	 *
 	 *   @return     int         Return integer <0 si ko, >0 si ok
 	 */
@@ -2467,7 +2467,7 @@ class Contrat extends CommonObject
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->specimen = 1;
 
@@ -3130,7 +3130,7 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -3744,7 +3744,7 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  Activate a contract line
 	 *
-	 * @param   User 		$user 		Objet User who activate contract
+	 * @param   User 		$user 		Object User who activate contract
 	 * @param  	int 		$date 		Date real activation
 	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
 	 * @param   string 		$comment 	A comment typed by user
@@ -3802,7 +3802,7 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  Close a contract line
 	 *
-	 * @param    User 	$user 			Objet User who close contract
+	 * @param    User 	$user 			Object User who close contract
 	 * @param  	 int 	$date_end_real 	Date end
 	 * @param    string $comment 		A comment typed by user
 	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index d93128db070..86c7abfb7f2 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -50,7 +50,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<td class="center"><?php echo dol_print_date($objectlink->date_contrat, 'day'); ?></td>
 	<td class="nowraponall right"><?php
 	// Price of contract is not shown by default because a contract is a list of service with
-	// start and end date that change with time andd that may be different that the period of reference for price.
+	// start and end date that change with time and that may be different that the period of reference for price.
 	// So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
 	if ($user->hasRight('contrat', 'lire') && !getDolGlobalString('CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE')) {
 		$totalcontrat = 0;
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 754e3eceda3..f5b8f27c939 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -58,11 +58,11 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 	foreach ($object->fields as $key => $val) {
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') {
-				continue; // The field was not submited to be saved
+				continue; // The field was not submitted to be saved
 			}
 		} else {
 			if (!GETPOSTISSET($key) && !preg_match('/^chkbxlst:/', $object->fields[$key]['type'])) {
-				continue; // The field was not submited to be saved
+				continue; // The field was not submitted to be saved
 			}
 		}
 		// Ignore special fields
@@ -197,10 +197,10 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 // Action to update record
 if ($action == 'update' && !empty($permissiontoadd)) {
 	foreach ($object->fields as $key => $val) {
-		// Check if field was submited to be edited
+		// Check if field was submitted to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) {
-				continue; // The field was not submited to be saved
+				continue; // The field was not submitted to be saved
 			}
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
@@ -209,7 +209,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			}
 		} else {
 			if (!GETPOSTISSET($key) && !preg_match('/^chkbxlst:/', $object->fields[$key]['type']) && $object->fields[$key]['type']!=='checkbox') {
-				continue; // The field was not submited to be saved
+				continue; // The field was not submitted to be saved
 			}
 		}
 		// Ignore special fields
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 65f722ff0bb..a563b791f51 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -348,7 +348,7 @@ if ($action == 'update') {
 						$params['options'] = array($parameters=>null);
 					}
 				} else {
-					//Esle it's separated key/value and coma list
+					//Else it's separated key/value and coma list
 					foreach ($parameters_array as $param_ligne) {
 						list($key, $value) = explode(',', $param_ligne);
 						if (!array_key_exists('options', $params)) {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index f48011c252a..459869c274a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -319,7 +319,7 @@ if (!$error && $massaction == 'confirm_presend') {
 
 				if (empty($sendto)) {
 					if ($objectobj->element == 'societe') {
-						$objectobj->thirdparty = $objectobj; // Hack so following code is comaptible when objectobj is a thirdparty
+						$objectobj->thirdparty = $objectobj; // Hack so following code is compatible when objectobj is a thirdparty
 					}
 
 					//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
@@ -334,7 +334,7 @@ if (!$error && $massaction == 'confirm_presend') {
 
 				if (GETPOST('addmaindocfile')) {
 					// TODO Use future field $objectobj->fullpathdoc to know where is stored default file
-					// TODO If not defined, use $objectobj->model_pdf (or defaut invoice config) to know what is template to use to regenerate doc.
+					// TODO If not defined, use $objectobj->model_pdf (or default invoice config) to know what is template to use to regenerate doc.
 					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
 					$subdir = '';
 					// TODO Set subdir to be compatible with multi levels dir trees
@@ -674,7 +674,7 @@ if (!$error && $massaction == 'confirm_presend') {
 		$resaction .= $langs->trans("NbSent").': '.($nbsent ? $nbsent : 0)."\n<br>";
 
 		if ($nbsent) {
-			$action = ''; // Do not show form post if there was at least one successfull sent
+			$action = ''; // Do not show form post if there was at least one successful sent
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
@@ -1215,7 +1215,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		setEventMessage('CategTypeNotFound', 'errors');
 	}
 	if (!empty($affecttag_type_array)) {
-		//check if tag type submited exists into Tag Map categorie class
+		//check if tag type submitted exists into Tag Map categorie class
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categ = new Categorie($db);
 		$to_affecttag_type_array=array();
@@ -1586,7 +1586,7 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 
 				// If no SQL error, we redirect to the request form
 				if (!$error) {
-					// Calculcate number of days consumed
+					// Calculate number of days consumed
 					$nbopenedday = num_open_day($objecttmp->date_debut_gmt, $objecttmp->date_fin_gmt, 0, 1, $objecttmp->halfday);
 					$soldeActuel = $objecttmp->getCpforUser($objecttmp->fk_user, $objecttmp->fk_type);
 					$newSolde = ($soldeActuel - $nbopenedday);
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index ebc6d5fe3ae..4bda5b8de86 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -91,7 +91,7 @@ if (GETPOST('removAll', 'alpha')) {
 	foreach ($listofpaths as $key => $value) {
 		$pathtodelete = $value;
 		$filetodelete = $listofnames[$key];
-		$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
+		$result = dol_delete_file($pathtodelete, 1); // Delete uploaded Files
 
 		$langs->load("other");
 		setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
@@ -454,7 +454,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 						if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 							$mesg .= '<br>Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 						} else {
-							$mesg .= '<br>Unkown Error, please refers to your administrator';
+							$mesg .= '<br>Unknown Error, please refer to your administrator';
 						}
 					}
 					$mesg .= '</div>';
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index b247c1c2cc5..3d3e24db88b 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -61,7 +61,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 			//see #21072: Update a public note with a "document model not found" is not really a problem : the PDF is not created/updated
-			//but the note is saved, so just add a notification will be enought
+			//but the note is saved, so just add a notification will be enough
 			$resultGenDoc = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($resultGenDoc < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 07b7aaf904a..2593b668bb0 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -159,7 +159,7 @@ if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_
 	            	jQuery(document).ready(function () {
 	            		jQuery(".classfortooltip").tooltip({
 							show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-							hide: { delay: 50 }, 	/* If I enable effect:\'toggle\' here, a bug appears: the tooltip is shown when collpasing a new dir if it was shown before */
+							hide: { delay: 50 }, 	/* If I enable effect:\'toggle\' here, a bug appears: the tooltip is shown when collapsing a new dir if it was shown before */
 							tooltipClass: "mytooltip",
 							content: function () {
 	              				return $(this).prop(\'title\');		/* To force to get title as is */
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 3a56d1df6d3..4408e327e2b 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -99,7 +99,7 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 	/*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
 	if (!empty($_SESSION['auto_check_events_not_before']))
 	{
-		// We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
+		// We start scan from the not before so if two tabs were opened at different moments and we close one (so the js timer),
 		// then we are not losing periods
 		$starttime = $_SESSION['auto_check_events_not_before'];
 		// Protection to avoid too long sessions
@@ -137,7 +137,7 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			// Message must be formated and translated to be used with javascript directly
+			// Message must be formatted and translated to be used with javascript directly
 			$event = array();
 			$event['type'] = 'agenda';
 			$event['id_reminder'] = $obj->id_reminder;
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index ae7c0cd6dc4..1bc87d06145 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -18,7 +18,7 @@
 /**
  *       \file       htdocs/core/ajax/objectonoff.php
  *       \brief      File to set status for an object. Called when ajax_object_onoff() is used.
- *       			 This Ajax service is oftenly called when option MAIN_DIRECT_STATUS_UPDATE is set.
+ *       			 This Ajax service is often called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
 if (!defined('NOTOKENRENEWAL')) {
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 49afbcc0953..996f7be806d 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -162,7 +162,7 @@ if ($action == "importSignature") {
 						$param['online_sign_name'] = $online_sign_name;
 						$param['pathtoimage'] = $upload_dir . $filename;
 
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -319,7 +319,7 @@ if ($action == "importSignature") {
 						$param['online_sign_name'] = $online_sign_name;
 						$param['pathtoimage'] = $upload_dir . $filename;
 
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -432,7 +432,7 @@ if ($action == "importSignature") {
 						$param['online_sign_name'] = $online_sign_name;
 						$param['pathtoimage'] = $upload_dir . $filename;
 
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -548,7 +548,7 @@ if ($action == "importSignature") {
 							//$pdf->Open();
 							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
 
-							$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 96700b261da..fefd2e736ed 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -51,7 +51,7 @@ $hash_algo = GETPOST('hash_algo', 'alpha');
 
 
 // Security check
-// None. Beeing connected is enough.
+// None. Being connected is enough.
 
 
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 6e7bba1e5de..ba7725d06aa 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -44,7 +44,7 @@ if (!isset($usedbyinclude) || empty($usedbyinclude)) {
 	$res = @include '../../main.inc.php';
 
 	// Security check
-	// None. Beeing connected is enough.
+	// None. Being connected is enough.
 
 	top_httphead('application/json');
 
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 0c744adfa4a..8fdde13d467 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/core/boxes/box_actions.php
  *	\ingroup    actions
- *	\brief      Module to build boxe for events
+ *	\brief      Module to build box for events
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
diff --git a/htdocs/core/boxes/box_actions_future.php b/htdocs/core/boxes/box_actions_future.php
index ef94e988782..6a202bd9f2b 100644
--- a/htdocs/core/boxes/box_actions_future.php
+++ b/htdocs/core/boxes/box_actions_future.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/core/boxes/box_actions_future.php
  *	\ingroup    actions
- *	\brief      Module to build boxe for events
+ *	\brief      Module to build box for events
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 9540cc86ad7..698cd6504a2 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -156,8 +156,8 @@ class box_external_rss extends ModeleBoxes
 				$title = mb_convert_encoding($title, 'ISO-8859-1');
 			}
 
-			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
-			$title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
+			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Manage issue of quotes improperly (de)coded in utf-8
+			$title = preg_replace("/^\s+/", "", $title); // Remove leading whitespace
 			$this->info_box_contents["$href"] = "$title";
 
 			$tooltip = $title;
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 73e6a1c7522..7971a47eed2 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -186,6 +186,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$data = array('');
 				$customlabels = array();
 				$total = 0;
+				$maxamount = 0;
 				foreach ($listofstatus as $status) {
 					$customlabel = '';
 					$labelStatus = '';
@@ -198,8 +199,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 							$labelStatus = $listofopplabel[$status];
 						}
 						$amount = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
+						$customlabel = $amount."€";
+
 						$data[] = $amount;
-						$customlabel = $amount;
 						$liststatus[] = $labelStatus;
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
@@ -207,9 +209,21 @@ class box_funnel_of_prospection extends ModeleBoxes
 							$stringtoprint .= '<td class="nowraponall right amount"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
 							$stringtoprint .= "</tr>\n";
 						}
+						$customlabels[] = $customlabel;
+						if ($maxamount < $amount) {
+							$maxamount = $amount;
+						}
 					}
-					$customlabels[] = $customlabel;
 				}
+
+				// Permit to have a bar if value inferior to a certain value
+				$valuetoaddtomindata = $maxamount / 100;
+				foreach ($data as $key => $value) {
+					if ($value != "") {
+						$data[$key] = $valuetoaddtomindata + $value;
+					}
+				}
+
 				$dataseries[] = $data;
 				if ($conf->use_javascript_ajax) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
diff --git a/htdocs/core/boxes/box_last_knowledgerecord.php b/htdocs/core/boxes/box_last_knowledgerecord.php
index 7f9f67c71d5..f54a7787f6b 100644
--- a/htdocs/core/boxes/box_last_knowledgerecord.php
+++ b/htdocs/core/boxes/box_last_knowledgerecord.php
@@ -46,7 +46,7 @@ class box_last_knowledgerecord extends ModeleBoxes
 	public $boxlabel;
 
 	/**
-	 * @var array box dependancies
+	 * @var array box dependencies
 	 */
 	public $depends = array("knowledgemanagement");
 
diff --git a/htdocs/core/boxes/box_last_modified_knowledgerecord.php b/htdocs/core/boxes/box_last_modified_knowledgerecord.php
index c0095043343..baf376bcbe7 100644
--- a/htdocs/core/boxes/box_last_modified_knowledgerecord.php
+++ b/htdocs/core/boxes/box_last_modified_knowledgerecord.php
@@ -46,7 +46,7 @@ class box_last_modified_knowledgerecord extends ModeleBoxes
 	public $boxlabel;
 
 	/**
-	 * @var array box dependancies
+	 * @var array box dependencies
 	 */
 	public $depends = array("knowledgemanagement");
 
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index a2e0f3bdcae..95377278a45 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -83,7 +83,7 @@ class box_project extends ModeleBoxes
 			$companystatic = new Societe($this->db);
 
 			$socid = 0;
-			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
diff --git a/htdocs/core/boxes/box_project_opportunities.php b/htdocs/core/boxes/box_project_opportunities.php
index 9ba1d5a61d9..aedb173421d 100644
--- a/htdocs/core/boxes/box_project_opportunities.php
+++ b/htdocs/core/boxes/box_project_opportunities.php
@@ -80,7 +80,7 @@ class box_project_opportunities extends ModeleBoxes
 			$companystatic = new Societe($this->db);
 
 			$socid = 0;
-			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index d917e64657c..ff020b312d6 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -88,7 +88,7 @@ class box_validated_projects extends ModeleBoxes
 			$projectstatic = new Project($this->db);
 
 			$socid = 0;
-			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 66ab4de6070..e99f4660a30 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -31,7 +31,7 @@
  *
  * Boxes parent class
  */
-class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
+class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" boxes
 {
 	/**
 	 * @var DoliDB Database handler
@@ -207,7 +207,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$MAXLENGTHBOX = 60; // Mettre 0 pour pas de limite
+		$MAXLENGTHBOX = 60; // When set to 0: no length limit
 
 		$cachetime = 900; // 900 : 15mn
 		$cachedir = DOL_DATA_ROOT.'/boxes/temp';
@@ -273,7 +273,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 					//$out.= '<td class="nocellnopadd boxclose right nowraponall">';
 					$out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
 					$out .= $sublink;
-					// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
+					// The image must have the class 'boxhandle' because it's value used in DOM draggable objects to define the area used to catch the full object
 					$out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
 					$out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
 					$label = $head['text'];
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 43b700b7dd2..030af2d2e41 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -261,7 +261,7 @@ class CMailFile
 			if (getDolGlobalString('MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS')) {	// Off by default
 				// Search into the body for <img tags of links in medias files to replace them with an embedded file
 				// Note because media links are public, this should be useless, except avoid blocking images with email browser.
-				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
+				// This converts an embed file with src="/viewimage.php?modulepart... into a cid link
 				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 				if ($findimg<0) {
@@ -382,7 +382,7 @@ class CMailFile
 
 		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." addr_bcc=$addr_bcc, replyto=$replyto", LOG_DEBUG);
 
-		// We set all data according to choosed sending method.
+		// We set all data according to chose sending method.
 		// We also set a value for ->msgid
 		if ($this->sendmode == 'mail') {
 			// Use mail php function (default PHP method)
@@ -421,7 +421,7 @@ class CMailFile
 
 			// We now define $this->headers and $this->message
 			$this->headers = $smtp_headers.$mime_headers;
-			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
+			// Clean the header to avoid that it terminates with a CR character.
 			// This avoid also empty lines at end that can be interpreted as mail injection by email servers.
 			$this->headers = preg_replace("/([\r\n]+)$/i", "", $this->headers);
 
@@ -774,7 +774,7 @@ class CMailFile
 				}
 			}
 
-			// Action according to choosed sending method
+			// Action according to chose sending method
 			if ($this->sendmode == 'mail') {
 				// Use mail php function (default PHP method)
 				// ------------------------------------------
@@ -826,7 +826,7 @@ class CMailFile
 					}
 
 					if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM')) {
-						$additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
+						$additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additional params
 					}
 
 					$linuxlike = 1;
@@ -1357,7 +1357,7 @@ class CMailFile
 
 
 	/**
-	 * Correct an uncomplete html string
+	 * Correct an incomplete html string
 	 *
 	 * @param	string	$msg	String
 	 * @return	string			Completed string
@@ -1800,7 +1800,7 @@ class CMailFile
 	/**
 	 * Search images into html message and init array this->images_encoded if found
 	 *
-	 * @param	string	$images_dir		Location of physical images files. For example $dolibarr_main_data_root.'/medias'
+	 * @param	string	$images_dir		Path to store physical images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
 	 */
 	private function findHtmlImages($images_dir)
@@ -1888,7 +1888,7 @@ class CMailFile
 	 * Seearch images with data:image format into html message.
 	 * If we find some, we create it on disk.
 	 *
-	 * @param	string	$images_dir		Location of where to store physicaly images files. For example $dolibarr_main_data_root.'/medias'
+	 * @param	string	$images_dir		Location of where to store physically images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
 	 */
 	private function findHtmlImagesIsSrcData($images_dir)
@@ -1919,7 +1919,7 @@ class CMailFile
 
 		if (!empty($matches) && !empty($matches[1])) {
 			if (empty($images_dir)) {
-				// No temp directory provided, so we are not able to support convertion of data:image into physical images.
+				// No temp directory provided, so we are not able to support conversion of data:image into physical images.
 				$this->error = 'NoTempDirProvidedInCMailConstructorSoCantConvertDataImgOnDisk';
 				return -1;
 			}
@@ -1992,7 +1992,7 @@ class CMailFile
 
 		$arrayaddress = explode(',', $address);
 
-		// Boucle sur chaque composant de l'adresse
+		// Boucle sur chaque composant de l'address
 		$i = 0;
 		foreach ($arrayaddress as $val) {
 			$regs = array();
@@ -2061,7 +2061,7 @@ class CMailFile
 
 		$arrayaddress = explode(',', $address);
 
-		// Boucle sur chaque composant de l'adresse
+		// Boucle sur chaque composant de l'address
 		foreach ($arrayaddress as $val) {
 			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs)) {
 				$name  = trim($regs[1]);
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index a60d5db9f52..ae94b01a505 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -87,7 +87,7 @@ class CSMSFile
 	{
 		global $conf;
 
-		// On definit fin de ligne
+		// Define the line ending (TODO: Why not use PHP_EOL?)
 		$this->eol = "\n";
 		if (preg_match('/^win/i', PHP_OS)) {
 			$this->eol = "\r\n";
@@ -96,7 +96,7 @@ class CSMSFile
 			$this->eol = "\r";
 		}
 
-		// If ending method not defined
+		// If SMS sending method not defined
 		if (!getDolGlobalString('MAIN_SMS_SENDMODE')) {
 			$this->error = 'No SMS Engine defined';
 			throw new Exception('No SMS Engine defined');
@@ -105,7 +105,7 @@ class CSMSFile
 		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".getDolGlobalString('MAIN_SMS_SENDMODE')." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".strlen($msg), LOG_DEBUG);
 		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
-		// Action according to choosed sending method
+		// Action according to chosen sending method
 		$this->addr_from = $from;
 		$this->addr_to = $to;
 		$this->deferred = $deferred;
@@ -118,16 +118,16 @@ class CSMSFile
 
 
 	/**
-	 * Send sms that was prepared by constructor
+	 * Send SMS that was prepared by constructor
 	 *
-	 * @return    boolean     True if sms sent, false otherwise
+	 * @return    boolean     True if SMS sent, false otherwise
 	 */
 	public function sendfile()
 	{
 		global $conf;
 
 		$errorlevel = error_reporting();
-		error_reporting($errorlevel ^ E_WARNING); // Desactive warnings
+		error_reporting($errorlevel ^ E_WARNING); // Disable warnings
 
 		$res = false;
 
@@ -141,7 +141,7 @@ class CSMSFile
 		}
 
 		if (!getDolGlobalString('MAIN_DISABLE_ALL_SMS')) {
-			// Action according to the choosed sending method
+			// Action according to the chose sending method
 			if (getDolGlobalString('MAIN_SMS_SENDMODE')) {
 				$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');	// $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
 				$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode);	// $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index f3f98c753ed..0a065041efe 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -43,7 +43,7 @@ class Ccountry extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -272,7 +272,7 @@ class Ccountry extends CommonDict
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 029552a9432..f488ab75937 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -59,7 +59,7 @@ class CGenericDic extends CommonDict
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -71,12 +71,11 @@ class CGenericDic extends CommonDict
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -294,12 +293,11 @@ class CGenericDic extends CommonDict
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -370,12 +368,11 @@ class CGenericDic extends CommonDict
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
diff --git a/htdocs/core/class/commondict.class.php b/htdocs/core/class/commondict.class.php
index 57ba7dec3ce..976dcac7e2a 100644
--- a/htdocs/core/class/commondict.class.php
+++ b/htdocs/core/class/commondict.class.php
@@ -28,7 +28,7 @@
 abstract class CommonDict
 {
 	/**
-	 * @var DoliDb		Database handler (result of a new DoliDB)
+	 * @var DoliDB		Database handler (result of a new DoliDB)
 	 */
 	public $db;
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index a33f3fc1b2d..aa7ae9144ae 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -71,7 +71,7 @@ abstract class CommonDocGenerator
 	public $update_main_doc_field;
 
 	/**
-	 * @var string	The name of constant to use to scan ODT files (Exemple: 'COMMANDE_ADDON_PDF_ODT_PATH')
+	 * @var string	The name of constant to use to scan ODT files (Example: 'COMMANDE_ADDON_PDF_ODT_PATH')
 	 */
 	public $scandir;
 
@@ -877,7 +877,7 @@ abstract class CommonDocGenerator
 			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
 		}
 
-		// Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment
+		// Add info from $object->xxx where xxx has been loaded by fetch_origin() of shipment
 		if (!empty($object->commande) && is_object($object->commande)) {
 			$array_shipment['order_ref'] = $object->commande->ref;
 			$array_shipment['order_ref_customer'] = $object->commande->ref_customer;
@@ -1087,7 +1087,7 @@ abstract class CommonDocGenerator
 		// Sorting
 		uasort($this->cols, array($this, 'columnSort'));
 
-		// Positionning
+		// Positioning
 		$curX = $this->page_largeur - $this->marge_droite; // start from right
 
 		// Array width
@@ -1231,7 +1231,7 @@ abstract class CommonDocGenerator
 	 *  print standard column content
 	 *
 	 *  @param	TCPDF		$pdf    		pdf object
-	 *  @param	float		$curY    		curent Y position
+	 *  @param	float		$curY    		current Y position
 	 *  @param	string		$colKey    		the column key
 	 *  @param	string		$columnText   	column text
 	 *  @return	int							Return integer <0 if KO, >= if OK
@@ -1254,9 +1254,9 @@ abstract class CommonDocGenerator
 			if (empty($columnText)) {
 				return 0;
 			}
-			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
+			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set current position
 			$colDef = $this->cols[$colKey];
-			// save curent cell padding
+			// save current cell padding
 			$curentCellPaddinds = $pdf->getCellPaddings();
 			// set cell padding with column content definition
 			$pdf->setCellPaddings(isset($colDef['content']['padding'][3]) ? $colDef['content']['padding'][3] : 0, isset($colDef['content']['padding'][0]) ? $colDef['content']['padding'][0] : 0, isset($colDef['content']['padding'][1]) ? $colDef['content']['padding'][1] : 0, isset($colDef['content']['padding'][2]) ? $colDef['content']['padding'][2] : 0);
@@ -1274,7 +1274,7 @@ abstract class CommonDocGenerator
 	 *  print description column content
 	 *
 	 *  @param	TCPDF		$pdf    		pdf object
-	 *  @param	float		$curY    		curent Y position
+	 *  @param	float		$curY    		current Y position
 	 *  @param	string		$colKey    		the column key
 	 *  @param  object      $object 		CommonObject
 	 *  @param  int         $i  			the $object->lines array key
@@ -1288,7 +1288,7 @@ abstract class CommonDocGenerator
 	{
 		// load desc col params
 		$colDef = $this->cols[$colKey];
-		// save curent cell padding
+		// save current cell padding
 		$curentCellPaddinds = $pdf->getCellPaddings();
 		// set cell padding with column content definition
 		$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
@@ -1383,7 +1383,7 @@ abstract class CommonDocGenerator
 	 *
 	 *  @param	object		$object    		line of common object
 	 *  @param 	Translate 	$outputlangs    Output language
-	 *  @param 	array 		$params    		array of additionals parameters
+	 *  @param 	array 		$params    		array of additional parameters
 	 *  @return	string  					Html string
 	 */
 	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
@@ -1394,7 +1394,7 @@ abstract class CommonDocGenerator
 			return "";
 		}
 
-		// Load extrafields if not allready done
+		// Load extrafields if not already done
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}
@@ -1463,7 +1463,7 @@ abstract class CommonDocGenerator
 				$field->label = $outputlangs->transnoentities($label);
 				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];
 
-				// dont display if empty
+				// don't display if empty
 				if ($disableOnEmpty && empty($field->content)) {
 					continue;
 				}
@@ -1612,7 +1612,7 @@ abstract class CommonDocGenerator
 				}
 
 				if (empty($hidetop)) {
-					// save curent cell padding
+					// save current cell padding
 					$curentCellPaddinds = $pdf->getCellPaddings();
 
 					// Add space for lines (more if we need to show a second alternative language)
@@ -1684,7 +1684,7 @@ abstract class CommonDocGenerator
 
 		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]) && array_key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
-				// Dont display separator yet even is set to be displayed (not compatible yet)
+				// Don't display separator yet even is set to be displayed (not compatible yet)
 				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
 					continue;
 				}
@@ -1701,7 +1701,7 @@ abstract class CommonDocGenerator
 
 				if (!$enabled) {
 					continue;
-				} // don't wast resourses if we don't need them...
+				} // don't waste resources if we don't need them...
 
 				// Load language if required
 				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {
@@ -1776,7 +1776,7 @@ abstract class CommonDocGenerator
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index 305e9bcd01c..3b1d820e58b 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -48,7 +48,7 @@ trait CommonIncoterm
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Return incoterms informations
+	 *    Return incoterms information
 	 *    TODO Use a cache for label get
 	 *
 	 *    @return	string	incoterms info
@@ -76,7 +76,7 @@ trait CommonIncoterm
 	}
 
 	/**
-	 *    Return incoterms informations for pdf display
+	 *    Return incoterms information for pdf display
 	 *
 	 *    @return	string|boolean			Incoterms info or false
 	 */
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 83f38d2a70f..ec6444e9f67 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -196,7 +196,7 @@ abstract class CommonInvoice extends CommonObject
 	 * If paid partially, $this->close_code can be:
 	 * - CLOSECODE_DISCOUNTVAT
 	 * - CLOSECODE_BADDEBT
-	 * If paid completelly, this->close_code will be null
+	 * If paid completely, this->close_code will be null
 	 */
 	const STATUS_CLOSED = 2;
 
@@ -765,7 +765,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  Return label of object status
 	 *
 	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
 	 *  @return     string			        Label of status
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -780,7 +780,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param    	int  	$paye          	Status field paye
 	 *	@param      int		$status        	Id status
 	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
-	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
+	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, -1 otherwise)
 	 *	@param		int		$type			Type invoice. If -1, we use $this->type
 	 *	@return     string        			Label of status
 	 */
@@ -905,7 +905,7 @@ abstract class CommonInvoice extends CommonObject
 		}
 		$this->db->free($resqltemp);
 
-		/* Definition de la date limite */
+		/* Definition de la date limit */
 
 		// 0 : adding the number of days
 		if ($cdr_type == 0) {
@@ -1230,7 +1230,7 @@ abstract class CommonInvoice extends CommonObject
 								$result = $this->db->query($sql);
 								if ($result < 0) {
 									$error++;
-									$this->errors[] = "Error on updateing fk_prelevement_bons to ".$bon->id;
+									$this->errors[] = "Error on updating fk_prelevement_bons to ".$bon->id;
 								}
 							}
 							*/
@@ -1333,7 +1333,7 @@ abstract class CommonInvoice extends CommonObject
 										$stripecard = null;
 										if ($companypaymentmode->type == 'ban') {
 											// Check into societe_rib if a payment mode for Stripe and ban payment exists
-											// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
+											// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retrieved with ->sepaStripe
 											// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
 											$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
 										} else {
@@ -1436,7 +1436,7 @@ abstract class CommonInvoice extends CommonObject
 
 												$postactionmessages[] = 'Success to request '.$type.' (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
 
-												// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
+												// Save a stripe payment was done in real life so later we will be able to force a commit on recorded payments
 												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
 												$this->stripechargedone++;
 
@@ -1758,7 +1758,7 @@ abstract class CommonInvoice extends CommonObject
 			$s .= "\n";
 		}
 		if ($bankaccount->id > 0 && getDolGlobalString('PDF_SWISS_QRCODE_USE_OWNER_OF_ACCOUNT_AS_CREDITOR')) {
-			// If a bank account is prodived and we ask to use it as creditor, we use the bank address
+			// If a bank account is provided and we ask to use it as creditor, we use the bank address
 			// TODO In a future, we may always use this address, and if name/address/zip/town/country differs from $mysoc, we can use the address of $mysoc into the final seller field ?
 			$s .= "S\n";
 			$s .= dol_trunc($bankaccount->proprio, 70, 'right', 'UTF-8', 1)."\n";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dc1b14b3813..75fd4a5e47a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -52,7 +52,7 @@ abstract class CommonObject
 	public $module;
 
 	/**
-	 * @var DoliDb		Database handler (result of a new DoliDB)
+	 * @var DoliDB		Database handler (result of a new DoliDB)
 	 */
 	public $db;
 
@@ -2926,12 +2926,11 @@ abstract class CommonObject
 	 *  Change the shipping method
 	 *
 	 *  @param      int     $shipping_method_id     Id of shipping method
-	 *  @param      bool    $notrigger              false=launch triggers after, true=disable triggers
+	 *  @param      int    	$notrigger              0=launch triggers after, 1=disable triggers
 	 *  @param      User	$userused               Object user
-	 *
-	 *  @return     int              1 if OK, 0 if KO
+	 *  @return     int              				1 if OK, 0 if KO
 	 */
-	public function setShippingMethod($shipping_method_id, $notrigger = false, $userused = null)
+	public function setShippingMethod($shipping_method_id, $notrigger = 0, $userused = null)
 	{
 		global $user;
 
@@ -3051,11 +3050,11 @@ abstract class CommonObject
 	 *  Change the bank account
 	 *
 	 *  @param		int		$fk_account		Id of bank account
-	 *  @param      bool    $notrigger      false=launch triggers after, true=disable triggers
+	 *  @param      int    	$notrigger      0=launch triggers after, 1=disable triggers
 	 *  @param      User	$userused		Object user
-	 *  @return		int				1 if OK, 0 if KO
+	 *  @return		int						1 if OK, 0 if KO
 	 */
-	public function setBankAccount($fk_account, $notrigger = false, $userused = null)
+	public function setBankAccount($fk_account, $notrigger = 0, $userused = null)
 	{
 		global $user;
 
@@ -6479,7 +6478,7 @@ abstract class CommonObject
 								if (is_object($this->oldcopy)) {	// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 									//var_dump('iii'.$algo.' '.$this->oldcopy->array_options[$key].' -> '.$this->array_options[$key]);
 									if (isset($this->oldcopy->array_options[$key]) && $this->array_options[$key] == $this->oldcopy->array_options[$key]) {
-										// If old value encrypted in database is same than submited new value, it means we don't change it, so we don't update.
+										// If old value encrypted in database is same than submitted new value, it means we don't change it, so we don't update.
 										if ($algo == 'dolcrypt') {	// dolibarr reversible encryption
 											if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {
 												$new_array_options[$key] = dolEncrypt($this->array_options[$key]);	// warning, must be called when on the master
@@ -6903,7 +6902,7 @@ abstract class CommonObject
 							//var_dump($key.' '.$this->array_options["options_".$key].' '.$algo);
 							if (is_object($this->oldcopy)) {		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 								//var_dump($this->oldcopy->array_options["options_".$key]); var_dump($this->array_options["options_".$key]);
-								if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) {	// If old value encrypted in database is same than submited new value, it means we don't change it, so we don't update.
+								if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) {	// If old value encrypted in database is same than submitted new value, it means we don't change it, so we don't update.
 									if ($algo == 'dolcrypt') {	// dolibarr reversible encryption
 										if (!preg_match('/^dolcrypt:/', $this->array_options["options_".$key])) {
 											$new_array_options["options_".$key] = dolEncrypt($this->array_options["options_".$key]);	// warning, must be called when on the master
@@ -9617,10 +9616,10 @@ abstract class CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function createCommon(User $user, $notrigger = false)
+	public function createCommon(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -9911,10 +9910,10 @@ abstract class CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      	User that modifies
-	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function updateCommon(User $user, $notrigger = false)
+	public function updateCommon(User $user, $notrigger = 0)
 	{
 		dol_syslog(get_class($this)."::updateCommon update", LOG_DEBUG);
 
@@ -10013,11 +10012,11 @@ abstract class CommonObject
 	 * Delete object in database
 	 *
 	 * @param 	User 	$user       			User that deletes
-	 * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers
+	 * @param 	int 	$notrigger  			0=launch triggers after, 1=disable triggers
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
 	 * @return 	int             				Return integer <0 if KO, 0=Nothing done because object has child, >0 if OK
 	 */
-	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
+	public function deleteCommon(User $user, $notrigger = 0, $forcechilddeletion = 0)
 	{
 		dol_syslog(get_class($this)."::deleteCommon delete", LOG_DEBUG);
 
@@ -10225,13 +10224,11 @@ abstract class CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLineCommon(User $user, $idline, $notrigger = false)
+	public function deleteLineCommon(User $user, $idline, $notrigger = 0)
 	{
-		global $conf;
-
 		$error = 0;
 
 		$tmpforobjectclass = get_class($this);
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 9f53c4ada61..5efb3fadb2c 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -195,7 +195,7 @@ abstract class CommonObjectLine extends CommonObject
 	}
 
 	/**
-	 * Empty function to prevent errors on call of this function must be overload if usefull
+	 * Empty function to prevent errors on call of this function must be overload if useful
 	 *
 	 * @param string $sortorder Sort Order
 	 * @param string $sortfield Sort field
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 7bf9bd0222c..fc625e49b57 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -34,11 +34,11 @@
 // 1.1  : +	: Added unit in the constructor
 //	  + : Now Positions start @ (1,1).. then the first image @top-left of a page is (1,1)
 //	  + : Added in the description of a label :
-//		font-size	: defaut char size (can be changed by calling Set_Char_Size(xx);
+//		font-size	: default char size (can be changed by calling Set_Char_Size(xx);
 //		paper-size	: Size of the paper for this sheet (thanx to Al Canton)
 //		metric		: type of unit used in this description
 //				  You can define your label properties in inches by setting metric to 'in'
-//				  and printing in millimiter by setting unit to 'mm' in constructor.
+//				  and printing in millimeter by setting unit to 'mm' in constructor.
 //	  Added some labels :
 //	        5160, 5161, 5162, 5163,5164 : thanx to Al Canton : acanton@adams-blake.com
 //		8600 						: thanx to Kunal Walia : kunal@u.washington.edu
@@ -93,7 +93,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	protected $_Height = 0;
 	// Hauteur des caracteres
 	protected $_Char_Size = 10;
-	// Hauteur par defaut d'une ligne
+	// Hauteur par default d'une ligne
 	protected $_Line_Height = 10;
 	// Type of metric.. Will help to calculate good values
 	protected $_Metric = 'mm';
@@ -122,9 +122,9 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Function to build PDF on disk, then output on HTTP strem.
+	 *  Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+	 *  @param	array		$arrayofrecords  	Array of record information (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
 	 *  @param  Translate	$outputlangs     	Lang object for output language
 	 *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$outputdir			Output directory for pdf file
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 7022de50ba1..2b518adbc53 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -50,7 +50,7 @@ class CProductNature extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/class/cregion.class.php b/htdocs/core/class/cregion.class.php
index eb919c08791..ba0e966ba05 100644
--- a/htdocs/core/class/cregion.class.php
+++ b/htdocs/core/class/cregion.class.php
@@ -51,7 +51,7 @@ class Cregion extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -294,7 +294,7 @@ class Cregion extends CommonDict
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 2dc406fe6a1..0ed00e3e847 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -53,7 +53,7 @@ class Cstate extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -266,7 +266,7 @@ class Cstate extends CommonDict
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 0e22b450a39..b1d88898338 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -41,7 +41,7 @@ class Ctypent extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 86435564e26..2b1a8cc26f1 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -51,7 +51,7 @@ class Ctyperesource extends CommonDict
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -62,11 +62,10 @@ class Ctyperesource extends CommonDict
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -259,12 +258,11 @@ class Ctyperesource extends CommonDict
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -326,12 +324,11 @@ class Ctyperesource extends CommonDict
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index e09a6ce88fb..cd16e4edeac 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -51,7 +51,7 @@ class CUnits extends CommonDict
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -460,7 +460,7 @@ class CUnits extends CommonDict
 			// TODO : add base col into unit dictionary table
 			$unit = $this->db->fetch_object($sql);
 			if ($unit) {
-				// TODO : if base exists in unit dictionary table, remove this convertion exception and update convertion infos in database.
+				// TODO : if base exists in unit dictionary table, remove this conversion exception and update conversion infos in database.
 				// Example time hour currently scale 3600 will become scale 2 base 60
 				if ($unit->unit_type == 'time') {
 					return (float) $unit->scale;
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 059f9a2f393..55f590f91ab 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -70,7 +70,7 @@ class DefaultValues extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -137,7 +137,7 @@ class DefaultValues extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -175,10 +175,10 @@ class DefaultValues extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -322,10 +322,10 @@ class DefaultValues extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -333,11 +333,11 @@ class DefaultValues extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 4d3f15b8d1c..6f8157ca22c 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -294,7 +294,7 @@ class DiscountAbsolute extends CommonObject
 
 
 	/**
-	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
+	 *  Delete object in database. If fk_facture_source is defined, we delete all family with same fk_facture_source. If not, only with id is removed
 	 *
 	 *  @param      User    $user       Object of user asking to delete
 	 *  @return     int                 Return integer <0 if KO, >0 if OK
@@ -354,9 +354,9 @@ class DiscountAbsolute extends CommonObject
 		// Delete but only if not used
 		$sql = "DELETE FROM ".$this->db->prefix()."societe_remise_except ";
 		if ($this->fk_facture_source) {
-			$sql .= " WHERE fk_facture_source = ".((int) $this->fk_facture_source); // Delete all lines of same serie
+			$sql .= " WHERE fk_facture_source = ".((int) $this->fk_facture_source); // Delete all lines of same series
 		} elseif ($this->fk_invoice_supplier_source) {
-			$sql .= " WHERE fk_invoice_supplier_source = ".((int) $this->fk_invoice_supplier_source); // Delete all lines of same serie
+			$sql .= " WHERE fk_invoice_supplier_source = ".((int) $this->fk_invoice_supplier_source); // Delete all lines of same series
 		} else {
 			$sql .= " WHERE rowid = ".((int) $this->id); // Delete only line
 		}
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 9f4f844e9de..80856441d2d 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -201,7 +201,7 @@ class DolGeoIP
 	}
 
 	/**
-	 * Return verion of data file
+	 * Return version of data file
 	 *
 	 * @return  string      Version of datafile
 	 */
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 606ad2719af..66898fb0ec3 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -76,7 +76,7 @@ class DolGraph
 	public $showpointvalue = 1;
 	public $showpercent = 0;
 	public $combine = 0; // 0.05 if you want to combine records < 5% into "other"
-	public $graph; // Objet Graph (Artichow, Phplot...)
+	public $graph; // Object Graph (Artichow, Phplot...)
 	/**
 	 * @var boolean 					Mirrors graph values
 	 */
@@ -350,7 +350,7 @@ class DolGraph
 	/**
 	 * Set type
 	 *
-	 * @param 	array	$type		Array with type for each serie. Example: array('type1', 'type2', ...) where type can be:
+	 * @param 	array	$type		Array with type for each series. Example: array('type1', 'type2', ...) where type can be:
 	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horizontalbars'...
 	 * @return	void
 	 */
@@ -534,7 +534,7 @@ class DolGraph
 	/**
 	 * Show pointvalue or not
 	 *
-	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value, 2=Show values for each serie on same point
+	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value, 2=Show values for each series on same point
 	 * @return	void
 	 */
 	public function setShowPointValue($showpointvalue)
@@ -633,7 +633,7 @@ class DolGraph
 		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		foreach ($this->data as $x) {	// Loop on each x
-			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
+			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each series
 				if (is_null($max)) {
 					$max = $x[$i + 1];		// $i+1 because the index 0 is the legend
 				} elseif ($max < $x[$i + 1]) {
@@ -663,7 +663,7 @@ class DolGraph
 		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		foreach ($this->data as $x) {	// Loop on each x
-			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
+			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each series
 				if (is_null($min)) {
 					$min = $x[$i + 1];		// $i+1 because the index 0 is the legend
 				} elseif ($min > $x[$i + 1]) {
@@ -801,10 +801,10 @@ class DolGraph
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
 		$i = $firstlot;
-		$serie = array();
-		while ($i < $nblot) {	// Loop on each serie
-			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i] = "var d" . $i . " = [];\n";
+		$series = array();
+		while ($i < $nblot) {	// Loop on each series
+			$values = array(); // Array with horizontal y values (specific values of a series) for each abscisse x
+			$series[$i] = "var d" . $i . " = [];\n";
 
 			// Fill array $values
 			$x = 0;
@@ -817,13 +817,13 @@ class DolGraph
 			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 				foreach ($values as $x => $y) {
 					if (isset($y)) {
-						$serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
+						$series[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
 					}
 				}
 			} else {
 				foreach ($values as $x => $y) {
 					if (isset($y)) {
-						$serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
+						$series[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
 					}
 				}
 			}
@@ -857,8 +857,8 @@ class DolGraph
 			$this->stringtoshow .= '<!-- No series of data -->' . "\n";
 		} else {
 			while ($i < $nblot) {
-				$this->stringtoshow .= '<!-- Serie ' . $i . ' -->' . "\n";
-				$this->stringtoshow .= $serie[$i] . "\n";
+				$this->stringtoshow .= '<!-- Series ' . $i . ' -->' . "\n";
+				$this->stringtoshow .= $series[$i] . "\n";
 				$i++;
 			}
 		}
@@ -1093,14 +1093,14 @@ class DolGraph
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
-		$serie = array();
+		$series = array();
 		$arrayofgroupslegend = array();
 		//var_dump($this->data);
 
 		$i = $firstlot;
-		while ($i < $nblot) {	// Loop on each serie
-			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x (with x=0,1,2,...)
-			$serie[$i] = "";
+		while ($i < $nblot) {	// Loop on each series
+			$values = array(); // Array with horizontal y values (specific values of a series) for each abscisse x (with x=0,1,2,...)
+			$series[$i] = "";
 
 			// Fill array $values
 			$x = 0;
@@ -1128,9 +1128,9 @@ class DolGraph
 			$j = 0;
 			foreach ($values as $x => $y) {
 				if (isset($y)) {
-					$serie[$i] .= ($j > 0 ? ", " : "") . $y;
+					$series[$i] .= ($j > 0 ? ", " : "") . $y;
 				} else {
-					$serie[$i] .= ($j > 0 ? ", " : "") . 'null';
+					$series[$i] .= ($j > 0 ? ", " : "") . 'null';
 				}
 				$j++;
 			}
@@ -1138,7 +1138,7 @@ class DolGraph
 			$values = null; // Free mem
 			$i++;
 		}
-		//var_dump($serie);
+		//var_dump($series);
 		//var_dump($arrayofgroupslegend);
 
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
@@ -1173,7 +1173,7 @@ class DolGraph
 		} else {
 			while ($i < $nblot) {
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
-				//$this->stringtoshow .= $serie[$i]."\n";
+				//$this->stringtoshow .= $series[$i]."\n";
 				$i++;
 			}
 		}
@@ -1218,11 +1218,11 @@ class DolGraph
 				$this->stringtoshow .= 'rotation: -Math.PI,' . "\n";
 			}
 			$this->stringtoshow .= 'elements: { arc: {' . "\n";
-			// Color of earch arc
+			// Color of each arc
 			$this->stringtoshow .= 'backgroundColor: [';
 			$i = 0;
 			$foundnegativecolor = 0;
-			foreach ($legends as $val) {	// Loop on each serie
+			foreach ($legends as $val) {	// Loop on each series
 				if ($i > 0) {
 					$this->stringtoshow .= ', ' . "\n";
 				}
@@ -1245,7 +1245,7 @@ class DolGraph
 			if ($foundnegativecolor) {
 				$this->stringtoshow .= 'borderColor: [';
 				$i = 0;
-				foreach ($legends as $val) {	// Loop on each serie
+				foreach ($legends as $val) {	// Loop on each series
 					if ($i > 0) {
 						$this->stringtoshow .= ', ' . "\n";
 					}
@@ -1277,7 +1277,7 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val) {	// Loop on each serie
+			foreach ($legends as $val) {	// Loop on each series
 				if ($i > 0) {
 					$this->stringtoshow .= ', ';
 				}
@@ -1289,7 +1289,7 @@ class DolGraph
 					datasets: [';
 			$i = 0;
 			$i = 0;
-			while ($i < $nblot) {	// Loop on each serie
+			while ($i < $nblot) {	// Loop on each series
 				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
 
 				if ($i > 0) {
@@ -1298,7 +1298,7 @@ class DolGraph
 				$this->stringtoshow .= '{' . "\n";
 				//$this->stringtoshow .= 'borderColor: \''.$color.'\', ';
 				//$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
-				$this->stringtoshow .= '  data: [' . $serie[$i] . ']';
+				$this->stringtoshow .= '  data: [' . $series[$i] . ']';
 				$this->stringtoshow .= '}' . "\n";
 				$i++;
 			}
@@ -1342,7 +1342,25 @@ class DolGraph
 			if (empty($showlegend)) {
 				$this->stringtoshow .= 'legend: { display: false }, '."\n";
 			} else {
-				$this->stringtoshow .= 'legend: { maxWidth: '.round(intVal($this->width) / 2).', labels: { boxWidth: 15 }, position: \'' . (($showlegend && $showlegend == 2) ? 'right' : 'top') . '\' },'."\n";
+				$this->stringtoshow .= 'legend: { maxWidth: '.round(intval($this->width) / 2).', labels: { boxWidth: 15 }, position: \'' . (($showlegend && $showlegend == 2) ? 'right' : 'top') . '\' },'."\n";
+			}
+			if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) {
+				$this->stringtoshow .= 'tooltip: { mode: \'nearest\',
+					callbacks: {';
+				if (is_array($this->tooltipsTitles)) {
+					$this->stringtoshow .='
+							title: function(tooltipItem, data) {
+								var tooltipsTitle ='.json_encode($this->tooltipsTitles).'
+								return tooltipsTitle[tooltipItem[0].datasetIndex];
+							},';
+				}
+				if (is_array($this->tooltipsLabels)) {
+					$this->stringtoshow .= 'label: function(tooltipItem, data) {
+								var tooltipslabels ='.json_encode($this->tooltipsLabels).'
+								return tooltipslabels[tooltipItem.datasetIndex]
+							}';
+				}
+				$this->stringtoshow .='}},';
 			}
 			$this->stringtoshow .= "}, \n";
 
@@ -1396,7 +1414,7 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val) {	// Loop on each serie
+			foreach ($legends as $val) {	// Loop on each series
 				if ($i > 0) {
 					$this->stringtoshow .= ', ';
 				}
@@ -1414,7 +1432,7 @@ class DolGraph
 			$i = 0;
 			$iinstack = 0;
 			$oldstacknum = -1;
-			while ($i < $nblot) {	// Loop on each serie
+			while ($i < $nblot) {	// Loop on each series
 				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
@@ -1441,10 +1459,10 @@ class DolGraph
 					if ($iinstack) {
 						// Change color with offset of $iinstack
 						//var_dump($newcolor);
-						if ($iinstack % 2) {	// We increase agressiveness of reference color for color 2, 4, 6, ...
+						if ($iinstack % 2) {	// We increase aggressiveness of reference color for color 2, 4, 6, ...
 							$ratio = min(95, 10 + 10 * $iinstack); // step of 20
 							$brightnessratio = min(90, 5 + 5 * $iinstack); // step of 10
-						} else {				// We decrease agressiveness of reference color for color 3, 5, 7, ..
+						} else {				// We decrease aggressiveness of reference color for color 3, 5, 7, ..
 							$ratio = max(-100, -15 * $iinstack + 10); // step of -20
 							$brightnessratio = min(90, 10 * $iinstack); // step of 20
 						}
@@ -1503,7 +1521,7 @@ class DolGraph
 				}
 				$this->stringtoshow .= 'data: [';
 
-				$this->stringtoshow .= $this->mirrorGraphValues ? '[-' . $serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
+				$this->stringtoshow .= $this->mirrorGraphValues ? '[-' . $series[$i] . ',' . $series[$i] . ']' : $series[$i];
 				$this->stringtoshow .= ']';
 				$this->stringtoshow .= '}' . "\n";
 
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 9e347343982..231698ee186 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -75,7 +75,7 @@ class EmailSenderProfile extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -138,7 +138,7 @@ class EmailSenderProfile extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -158,10 +158,10 @@ class EmailSenderProfile extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -251,10 +251,10 @@ class EmailSenderProfile extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -262,17 +262,17 @@ class EmailSenderProfile extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@return	string								String with URL
@@ -342,7 +342,7 @@ class EmailSenderProfile extends CommonObject
 	}
 
 	/**
-	 *  Charge les informations d'ordre info dans l'objet commande
+	 *  Charge les information d'ordre info dans l'objet commande
 	 *
 	 *  @param  int     $id       Id of order
 	 *  @return	void
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index bd3c7d05055..42c3cf2890d 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -30,7 +30,7 @@
  * which are stored in the object. Try it, it's fun!
  *
  * METHODS
- * $m->evalute($expr)
+ * $m->evaluate($expr)
  * Evaluates the expression and returns the result. If an error occurs,
  * prints a warning and returns false. If $expr is a function assignment,
  * returns true on success.
@@ -263,7 +263,7 @@ class EvalMath
 				return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
 																		// ===============
 			} elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
-				if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
+				if ($ex) { // are we expecting an operator but have a number/variable/function/opening parenthesis?
 					$op = '*';
 					$index--; // it's an implicit multiplication
 				}
@@ -347,7 +347,7 @@ class EvalMath
 			} elseif (in_array($op, $ops) and !$expecting_op) {
 				return $this->trigger(8, "unexpected operator '$op'", $op);
 			} else { // I don't even want to know what you did to get here
-				return $this->trigger(9, "an unexpected error occured");
+				return $this->trigger(9, "an unexpected error occurred");
 			}
 			if ($index == strlen($expr)) {
 				if (in_array($op, $ops)) { // did we end with an operator? bad.
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5d28ea7501e..afedee6759f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -290,7 +290,7 @@ class ExtraFields
 	 *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
-	 *  @param	string			$list			Visibily
+	 *  @param	string			$list			Visibility
 	 *  @param	string			$help			Help on tooltip
 	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string          $computed       Computed value
@@ -464,7 +464,7 @@ class ExtraFields
 				$sql .= " FROM ".$this->db->prefix()."extrafields";
 				$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";
 				$sql .= " AND name = '".$this->db->escape($attrname)."'";
-				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
+				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaining in other entities before deleting field in table
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
@@ -663,7 +663,7 @@ class ExtraFields
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
-	 *  @param	string	$list				Visiblity
+	 *  @param	string	$list				Visibility
 	 *  @param	string	$help				Help on tooltip.
 	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string  $computed           Computed value
@@ -736,7 +736,7 @@ class ExtraFields
 			}
 
 			if ($entity === '' || $entity != '0') {
-				// We dont want on all entities, we delete all and current
+				// We don't want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".$this->db->prefix()."extrafields";
 				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
@@ -824,7 +824,7 @@ class ExtraFields
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Load the array of extrafields defintion $this->attributes
+	 * 	Load the array of extrafields definition $this->attributes
 	 *
 	 * 	@param	string		$elementtype		Type of element ('all' = all or $object->table_element like 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is status of cache.
@@ -933,7 +933,7 @@ class ExtraFields
 	 * @param  string        $keyprefix      		Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string        $morecss        		More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int           $objectid       		Current object id
-	 * @param  string        $extrafieldsobjectkey	The key to use to store retreived data (commonly $object->table_element)
+	 * @param  string        $extrafieldsobjectkey	The key to use to store retrieved data (commonly $object->table_element)
 	 * @param  int	         $mode                  1=Used for search filters
 	 * @return string
 	 */
@@ -1440,28 +1440,28 @@ class ExtraFields
 							// Pattern for word=$ID$
 							$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 
-							// Removing space arount =, ( and )
+							// Removing spaces around =, ( and )
 							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 
 							$nbPreg = 1;
 							// While we have parenthesis
 							while ($nbPreg != 0) {
-								// Init des compteurs
+								// Initialise counters
 								$nbPregRepl = $nbPregSel = 0;
-								// On retire toutes les parenthèses sans = avant
+								// Remove all parenthesis not preceded with '=' sign
 								$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
-								// On retire les espaces autour des = et parenthèses
+								// Remove all escape characters around '=' and parenthesis
 								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-								// On retire toutes les parenthèses avec = avant
+								// Remove all parentheses preceded with '='
 								$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
-								// On retire les espaces autour des = et parenthèses
+								// On retire les escapes autour des = et parenthèses
 								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 
-								// Calcul du compteur général pour la boucle
+								// UPdate the totals counter for the loop
 								$nbPreg = $nbPregRepl + $nbPregSel;
 							}
 
-							// Si l'on a un AND ou un OR, avant ou après
+							// In case there is AND ou OR, before or after
 							$matchCondition = array();
 							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 							while (!empty($matchCondition[0])) {
@@ -1481,7 +1481,7 @@ class ExtraFields
 									}
 								}
 
-								// Si l'on a un AND ou un OR, avant ou après
+								// In case there is AND ou OR, before or after
 								preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 							}
 						} else {
@@ -1583,8 +1583,8 @@ class ExtraFields
 		} elseif ($type == 'link') {
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			/* Removed.
-			The selectForForms is called with parameter $objectfield defined, so tha app can retreive the filter inside the ajax component instead of being provided as parameters. The
-			filter was use to pass SQL requests leading to serious SQL injection problem. This should not be possible. Also the call of the ajax was broken by some WAF.
+			The selectForForms is called with parameter $objectfield defined, so that the app can retrieve the filter inside the ajax component instead of being provided as parameters. The
+			filter was used to pass SQL requests leading to serious SQL injection problems. This should not be possible. Also the call of the ajax was broken by some WAF.
 			if (strpos($param_list[0], '$ID$') !== false && !empty($objectid)) {
 				$param_list[0] = str_replace('$ID$', $objectid, $param_list[0]);
 			}*/
@@ -1595,7 +1595,7 @@ class ExtraFields
 			$element = $extrafieldsobjectkey;		// $extrafieldsobjectkey comes from $object->table_element but we need $object->element
 			if ($element == 'socpeople') {
 				$element = 'contact';
-			} else if ( $element == 'projet' ) {
+			} elseif ( $element == 'projet' ) {
 				$element = 'project';
 			}
 
@@ -1627,7 +1627,7 @@ class ExtraFields
 	 * @param   string	$value          		Value to show
 	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
 	 * @param	string	$extrafieldsobjectkey	Required (for example $object->table_element).
-	 * @return	string							Formated value
+	 * @return	string							Formatted value
 	 */
 	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
 	{
@@ -1938,7 +1938,7 @@ class ExtraFields
 			$out = '';
 
 			// Only if something to display (perf)
-			if ($value) {		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
+			if ($value) {		// If we have -1 here, pb is into insert, not into output (fix insert instead of changing code here to compensate)
 				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
@@ -1980,7 +1980,7 @@ class ExtraFields
 	 *
 	 * @param   string	$key            		Key of attribute
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
-	 * @return	string							Formated value
+	 * @return	string							Formatted value
 	 */
 	public function getAlignFlag($key, $extrafieldsobjectkey = '')
 	{
@@ -2050,7 +2050,7 @@ class ExtraFields
 		}
 		$disabledcookiewrite = 0;
 		if ($mode == 'create') {
-			// On create mode, force separator group to not be collapsable
+			// On create mode, force separator group to not be collapsible
 			$extrafield_collapse_display_value = 1;
 			$expand_display = true;	// We force group to be shown expanded
 			$disabledcookiewrite = 1; // We keep status of group unchanged into the cookie
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index b5e05ca04e2..9d3af41b6b7 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -129,7 +129,7 @@ class ExtraLanguages
 	 * @param  string  $key            			Key of attribute
 	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
 	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @param  string  $moreparam      			To add more parametes on html input tag
+	 * @param  string  $moreparam      			To add more parameters on html input tag
 	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
@@ -163,7 +163,7 @@ class ExtraLanguages
 	 * @param   string	$value          		Value to show
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), function uses the new method to get extrafields data
 	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @return	string							Formated value
+	 * @return	string							Formatted value
 	 */
 	public function showOutputField($key, $value, $extrafieldsobjectkey, $moreparam = '')
 	{
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index d0cd306d2f2..53379f3323f 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -63,8 +63,8 @@ class FileUpload
 		//print 'fileupload.class.php: element='.$element.' pathname='.$pathname.' filename='.$filename.' dir_output='.$dir_output."\n";
 
 		if (empty($dir_output)) {
-			setEventMessage('The element '.$element.' is not supported for uploading file. dir_output is unknow.', 'errors');
-			throw new Exception('The element '.$element.' is not supported for uploading file. dir_output is unknow.');
+			setEventMessage('The element '.$element.' is not supported for uploading file. dir_output is unknown.', 'errors');
+			throw new Exception('The element '.$element.' is not supported for uploading file. dir_output is unknown.');
 		}
 
 		// If pathname and filename are null then we can still upload files if we have specified upload_dir on $options
@@ -283,7 +283,7 @@ class FileUpload
 	/**
 	 * Make validation on an uploaded file
 	 *
-	 * @param 	string	$uploaded_file		Uploade file
+	 * @param 	string	$uploaded_file		Upload file
 	 * @param 	object	$file				File
 	 * @param 	string	$error				Error
 	 * @param	string	$index				Index
@@ -398,7 +398,7 @@ class FileUpload
 	 * handleFileUpload.
 	 * Validate data, move the uploaded file then create the thumbs if this is an image.
 	 *
-	 * @param 	string		$uploaded_file		Uploade file
+	 * @param 	string		$uploaded_file		Upload file
 	 * @param 	string		$name				Name
 	 * @param 	int			$size				Size
 	 * @param 	string		$type				Type
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 6fd2fbd8249..17670047896 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -69,10 +69,10 @@ class HookManager
 
 
 	/**
-	 *	Init array $this->hooks with instantiated action controlers.
+	 *	Init array $this->hooks with instantiated action controllers.
 	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
 	 *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
-	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
+	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controller
 	 *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
 	 *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
 	 *
@@ -127,7 +127,7 @@ class HookManager
 				}
 			}
 		}
-		// Log the init of hook but only for hooks thare are declared to be managed
+		// Log the init of hook but only for hooks there are declared to be managed
 		if (count($arraytolog) > 0) {
 			dol_syslog(get_class($this)."::initHooks Loading hooks: ".join(', ', $arraytolog), LOG_DEBUG);
 		}
@@ -150,7 +150,7 @@ class HookManager
 	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
 	 *  @return		int						For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
 	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0 if we want to keep standard actions, >0 uf we want to stop/replace standard actions (at least one > 0 and replacement will be done), <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
+	 *                                      All types can also return some values into an array ->results that will be merged into this->resArray for caller.
 	 *                                      $this->error or this->errors are also defined by class called by this function if error.
 	 */
 	public function executeHooks($method, $parameters = array(), &$object = null, &$action = '')
@@ -168,7 +168,7 @@ class HookManager
 
 		// Define type of hook ('output' or 'addreplace').
 		$hooktype = 'addreplace';
-		// TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.
+		// TODO Remove hooks with type 'output' (example createFrom). All hooks must be converted into 'addreplace' hooks.
 		if (in_array($method, array(
 			'createFrom',
 			'dashboardAccountancy',
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 90b17804022..09d9cd4a3b9 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -228,7 +228,7 @@ class FormAccounting extends Form
 	 *	Return list of accounting category.
 	 * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
 	 *
-	 *	@param	string	$selected       Preselected type
+	 *	@param	int		$selected       Preselected type
 	 *	@param  string	$htmlname       Name of field in form
 	 * 	@param	int		$useempty		Set to 1 if we want an empty value
 	 * 	@param	int		$maxlen			Max length of text in combo box
@@ -236,7 +236,7 @@ class FormAccounting extends Form
 	 *  @param  int     $allcountries   All countries
 	 * 	@return	string					HTML component with the select
 	 */
-	public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
+	public function select_accounting_category($selected = 0, $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
 	{
 		// phpcs:enable
 		global $langs, $mysoc;
@@ -459,7 +459,7 @@ class FormAccounting extends Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return list of auxilary accounts. Cumulate list from customers, suppliers and users.
+	 * Return list of auxiliary accounts. Cumulate list from customers, suppliers and users.
 	 *
 	 * @param string   		$selectid       Preselected pcg_type
 	 * @param string   		$htmlname       Name of field in html form
@@ -559,7 +559,7 @@ class FormAccounting extends Form
 	 * @param string 	$selected 		Preselected value
 	 * @param string 	$htmlname 		Name of HTML select object
 	 * @param int 		$useempty 		Affiche valeur vide dans liste
-	 * @param string 	$output_format 	(html/opton (for option html only)/array (to return options arrays
+	 * @param string 	$output_format 	(html/option (for option html only)/array (to return options arrays
 	 * @return string|array				HTML select component or array of select options
 	 */
 	public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 7989f5a2502..5f78ac336ce 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -253,7 +253,7 @@ class FormActions
 					// Ref
 					print '<td class="nowraponall">'.$actioncomm->getNomUrl(1, -1).'</td>';
 
-					// Onwer
+					// Owner
 					print '<td class="nowraponall tdoverflowmax125">';
 					if (!empty($actioncomm->userownerid)) {
 						if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid])) {
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 47834959db5..125bb04a30e 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -62,7 +62,7 @@ class FormAdmin
 	 *  @param      int				$showwarning    Show a warning if language is not complete
 	 *  @param		int				$disabled		Disable edit of select
 	 *  @param		string			$morecss		Add more css styles
-	 *  @param      int         	$showcode       1=Add language code into label at begining, 2=Add language code into label at end
+	 *  @param      int         	$showcode       1=Add language code into label at beginning, 2=Add language code into label at end
 	 *  @param		int				$forcecombo		Force to use combo box (so no ajax beautify effect)
 	 *  @param		int				$multiselect	Make the combo a multiselect
 	 *  @param		array			$onlykeys		Array of language keys to restrict list with the following keys (opposite of $filter). Example array('fr', 'es', ...)
@@ -224,7 +224,7 @@ class FormAdmin
 
 								$filelib = preg_replace('/\.php$/i', '', $file);
 								$prefix = '';
-								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+								// 0=Recommended, 1=Experimental, 2=Development, 3=Other
 								if (preg_match('/^eldy/i', $file)) {
 									$prefix = '0';
 								} elseif (preg_match('/^smartphone/i', $file)) {
@@ -487,7 +487,7 @@ class FormAdmin
 
 
 	/**
-	 * Function to shwo the combo select to chose a type of field (varchar, int, email, ...)
+	 * Function to show the combo select to chose a type of field (varchar, int, email, ...)
 	 *
 	 * @param	string	$htmlname				Name of HTML select component
 	 * @param	string	$type					Type preselected
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index e8dd0e9daa9..6d58b9a6198 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -20,7 +20,7 @@
 
 /**
  *      \file       htdocs/core/class/html.formbarcode.class.php
- *      \brief      Fichier de la classe des fonctions predefinie de composants html
+ *      \brief      Fichier de la class des functions predefinie de composants html
  */
 
 
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index fb09ff65486..6ad18d5034d 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -85,7 +85,7 @@ class FormCategory extends Form
 
 	/**
 	 *    Prints a select form for products categories
-	 *    @param    string	$selected          	Id category pre-selection
+	 *    @param    int 	$selected          	Id category pre-selection
 	 *    @param    string	$htmlname          	Name of HTML field
 	 *    @param    int		$showempty         	Add an empty field
 	 *    @return	int|null
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index ed1c6e97980..81f01f73815 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -280,7 +280,7 @@ class FormCompany extends Form
 
 		$out = '';
 
-		// Serch departements/cantons/province active d'une region et pays actif
+		// Search departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
 		$sql .= " " . $this->db->prefix() . "c_departements as d, " . $this->db->prefix() . "c_regions as r," . $this->db->prefix() . "c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
@@ -325,7 +325,7 @@ class FormCompany extends Form
 							$out .= '<option value="' . $obj->rowid . '">';
 						}
 
-						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+						// Si traduction existe, on l'utilise, sinon on prend le libelle par default
 						if (
 							getDolGlobalString('MAIN_SHOW_STATE_CODE') &&
 							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')
@@ -396,7 +396,7 @@ class FormCompany extends Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *   Retourne la liste deroulante des regions actives dont le pays est actif
+	 *   Retourne la liste deroulante des regions actives don't le pays est actif
 	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
 	 *   un code donnee mais dans ce cas, le champ pays et lang differe).
 	 *   Ainsi les liens avec les regions se font sur une region independemment de son name.
@@ -489,7 +489,7 @@ class FormCompany extends Form
 					} else {
 						$out .= '<option value="' . $obj->code . '">';
 					}
-					// If translation exists, we use it, otherwise, we use tha had coded label
+					// If translation exists, we use it, otherwise, we use the hard coded label
 					$out .= ($langs->trans("Civility" . $obj->code) != "Civility" . $obj->code ? $langs->trans("Civility" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
 					$out .= '</option>';
 					$i++;
@@ -514,11 +514,11 @@ class FormCompany extends Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
+	 *    Return the list of all juridical entity types for all countries or a specific country.
+	 *    A country separator is included in case the list for all countries is returned.
 	 *
-	 *    @param	string		$selected        	Code forme juridique a pre-selectionne
-	 *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
+	 *    @param	string		$selected        	Preselected code for juridical type
+	 *    @param    mixed		$country_codeid		0=All countries, else the code of the country to display
 	 *    @param    string		$filter          	Add a SQL filter on list
 	 *    @return	void
 	 *    @deprecated Use print xxx->select_juridicalstatus instead
@@ -532,8 +532,8 @@ class FormCompany extends Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
+	 *    Return the list of all juridical entity types for all countries or a specific country.
+	 *    A country separator is included in case the list for all countries is returned.
 	 *
 	 *    @param	string		$selected        	Preselected code of juridical type
 	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
@@ -550,7 +550,7 @@ class FormCompany extends Form
 
 		$out = '';
 
-		// On recherche les formes juridiques actives des pays actifs
+		// Lookup the active juridical types for the active countries
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
 		$sql .= " FROM " . $this->db->prefix() . "c_forme_juridique as f, " . $this->db->prefix() . "c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
@@ -853,7 +853,7 @@ class FormCompany extends Form
 	 * showContactRoles on view and edit mode
 	 *
 	 * @param 	string 		$htmlname 	Html component name and id
-	 * @param 	Contact 	$contact 	Contact Obejct
+	 * @param 	Contact 	$contact 	Contact Object
 	 * @param 	string 		$rendermode view, edit
 	 * @param 	array		$selected 	$key=>$val $val is selected Roles for input mode
 	 * @param	string		$morecss	More css
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index f71f1736a33..fc869901f01 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -63,7 +63,7 @@ class FormContract
 	 *  @param	string	$morecss	More CSS
 	 *	@return int         		Nbr of contract if OK, <0 if KO
 	 */
-	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')
+	public function select_contract($socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')
 	{
 		// phpcs:enable
 		global $user, $conf, $langs;
@@ -190,7 +190,7 @@ class FormContract
 	 *  @param	int		$noouput	1=Return the output instead of display
 	 *  @return string|void         html string
 	 */
-	public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)
+	public function formSelectContract($page, $socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)
 	{
 		global $langs;
 
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 609458ce839..a4484a49dd6 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -19,7 +19,7 @@
 
 /**
  *      \file       htdocs/core/class/html.formcron.class.php
- *      \brief      Fichier de la classe des fonctions predefinie de composants html cron
+ *      \brief      Fichier de la class des functions predefinie de composants html cron
  */
 
 
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index bcb80a780dd..a94e076a3ba 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -50,8 +50,8 @@ class FormExpenseReport
 
 
 	/**
-	 *    Retourne la liste deroulante des differents etats d'une note de frais.
-	 *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
+	 *    Return the combobox for the different statuses of an expense report
+	 *    The list values are the ids for the table c_expensereport_statuts
 	 *
 	 *    @param    int     $selected       preselect status
 	 *    @param    string  $htmlname       Name of HTML select
@@ -59,7 +59,7 @@ class FormExpenseReport
 	 *    @param    int     $useshortlabel  Use short labels
 	 *    @return   string                  HTML select with status
 	 */
-	public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
+	public function selectExpensereportStatus($selected = 0, $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
 	{
 		global $langs;
 
@@ -74,7 +74,7 @@ class FormExpenseReport
 			$arrayoflabels = $tmpep->labelStatusShort;
 		}
 		foreach ($arrayoflabels as $key => $val) {
-			if ($selected != '' && $selected == $key) {
+			if (!empty($selected) && $selected == $key) {
 				$html .= '<option value="'.$key.'" selected>';
 			} else {
 				$html .=  '<option value="'.$key.'">';
@@ -97,7 +97,7 @@ class FormExpenseReport
 	 *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
 	 *  @return     string                  Select html
 	 */
-	public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
+	public function selectTypeExpenseReport($selected = 0, $htmlname = 'type', $showempty = 0, $active = 1)
 	{
 		// phpcs:enable
 		global $langs, $user;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a3b912415bf..5ca638470c4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -43,7 +43,7 @@ class FormFile
 	public $error;
 
 	public $numoffiles;
-	public $infofiles; // Used to return informations by function getDocumentsLink
+	public $infofiles; // Used to return information by function getDocumentsLink
 
 
 	/**
@@ -1183,7 +1183,7 @@ class FormFile
 	 *  @param   string 		$sortorder          Sort order ('ASC' or 'DESC')
 	 *  @param   int    		$disablemove        1=Disable move button, 0=Position move is possible.
 	 *  @param	 int			$addfilterfields	Add the line with filters
-	 *  @param	 int			$disablecrop		Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1)
+	 *  @param	 int			$disablecrop		Disable crop feature on images (-1 = auto, prefer to set it explicitly to 0 or 1)
 	 *  @param	 string			$moreattrondiv		More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"'
 	 * 	@return	 int								Return integer <0 if KO, nb of files shown if OK
 	 *  @see list_of_autoecmfiles()
@@ -1213,7 +1213,7 @@ class FormFile
 				$relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 			}
 		}
-		// For backward compatiblity, we detect file stored into an old path
+		// For backward compatibility, we detect file stored into an old path
 		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && isset($filearray[0]) && $filearray[0]['level1name'] == 'photos') {
 			$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
 		}
@@ -1248,7 +1248,7 @@ class FormFile
 			return $reshook;
 		} else {
 			if (!is_object($form)) {
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The component may be included into ajax page that does not include the Form class
 				$form = new Form($this->db);
 			}
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 9735e5d4571..b8af51e21ef 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -26,13 +26,13 @@
 /**
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
- *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
+ *       \brief      Fichier de la class permettant la generation du formulaire html d'envoi de mail unitaire
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
- *      Classe permettant la generation du formulaire html d'envoi de mail unitaire
+ *      Class permettant la generation du formulaire html d'envoi de mail unitaire
  *      Usage: $formail = new FormMail($db)
  *             $formmail->proprietes=1 ou chaine ou tableau de valeurs
  *             $formmail->show_form() affiche le formulaire
@@ -708,7 +708,7 @@ class FormMail extends Form
 				$out .= $langs->trans("MailToUsers");
 				$out .= '</td><td>';
 
-				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 				$tmparray = $this->withtouser;
 				foreach ($tmparray as $key => $val) {
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
@@ -757,7 +757,7 @@ class FormMail extends Form
 				$out .= $langs->trans("MailToCCUsers");
 				$out .= '</td><td>';
 
-				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 				$tmparray = $this->withtoccuser;
 				foreach ($tmparray as $key => $val) {
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
@@ -792,7 +792,7 @@ class FormMail extends Form
 
 			// Ask delivery receipt
 			if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {
-				$out .= $this->getHtmlForDeliveryReceipt();
+				$out .= $this->getHtmlForDeliveryreceipt();
 			}
 
 			// Topic
@@ -1123,7 +1123,7 @@ class FormMail extends Form
 
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
@@ -1176,7 +1176,7 @@ class FormMail extends Form
 
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
@@ -1223,7 +1223,7 @@ class FormMail extends Form
 
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 688f55aa0cb..fab8416ff2e 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -18,12 +18,12 @@
 /**
  *	\file       htdocs/core/class/html.formmargin.class.php
  *  \ingroup    core
- *	\brief      Fichier de la classe des fonctions predefinie de composants html autre
+ *	\brief      Fichier de la class des functions predefinie de composants html autre
  */
 
 
 /**
- *	Classe permettant la generation de composants html autre
+ *	Class permettant la generation de composants html autre
  *	Only common components are here.
  */
 class FormMargin
@@ -98,7 +98,7 @@ class FormMargin
 			}
 
 			$pv = $line->total_ht;
-			// We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+			// We chose to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa_ht = (($pv < 0 || ($pv == 0 && in_array($object->element, array('facture', 'facture_fourn')) && $object->type == $object::TYPE_CREDIT_NOTE)) ? -$line->pa_ht : $line->pa_ht);
 			if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {	// Special case for old situation mode
 				if (($object->element == 'facture' && $object->type == $object::TYPE_SITUATION)
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index ef4d8d68be7..82d80ba3336 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 class FormOrder extends Form
 {
 	/**
-	 *  Return combo list of differents status of a orders
+	 *  Return combo list of different statuses of orders
 	 *
 	 *  @param	string	$selected   Preselected value
 	 *  @param	int		$short		Use short labels
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 21a7a67dc3f..b8f788d70ff 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -28,12 +28,12 @@
 /**
  *	\file       htdocs/core/class/html.formother.class.php
  *  \ingroup    core
- *	\brief      Fichier de la classe des fonctions predefinie de composants html autre
+ *	\brief      Fichier de la class des functions predefinie de composants html autre
  */
 
 
 /**
- *	Classe permettant la generation de composants html autre
+ *	Class permettant la generation de composants html autre
  *	Only common components are here.
  */
 class FormOther
@@ -523,7 +523,7 @@ class FormOther
 			$sql_usr .= " AND u.fk_soc = ".((int) $user->socid);
 		}
 
-		//Add hook to filter on user (for exemple on usergroup define in custom modules)
+		//Add hook to filter on user (for example on usergroup define in custom modules)
 		if (!empty($reshook)) {
 			$sql_usr .= $hookmanager->resArray[0];
 		}
@@ -546,7 +546,7 @@ class FormOther
 
 			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc = ".((int) $user->socid);
 
-			//Add hook to filter on user (for exemple on usergroup define in custom modules)
+			//Add hook to filter on user (for example on usergroup define in custom modules)
 			if (!empty($reshook)) {
 				$sql_usr .= $hookmanager->resArray[1];
 			}
@@ -1006,16 +1006,16 @@ class FormOther
 
 		$color = substr($color, 1, 6);
 
-		$rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
-		$vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
-		$bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
+		$red = hexdec(substr($color, 0, 2));    // Red channel conversion
+		$green  = hexdec(substr($color, 2, 2)); // Green channel conversion
+		$blue  = hexdec(substr($color, 4, 2));  // Blue channel conversion
 
-		$couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
-		//print $rouge.$vert.$bleu;
-		imagefill($image, 0, 0, $couleur); //on remplit l'image
-		// On cree la couleur et on l'attribue a une variable pour ne pas la perdre
-		ImagePng($image, $file); //renvoie une image sous format png
-		ImageDestroy($image);
+		$couleur = imagecolorallocate($image, $red, $green, $blue);
+		//print $red.$green.$blue;
+		imagefill($image, 0, 0, $couleur); // Fill the image
+		// Create the colr and store it in a variable to maintain it
+		imagepng($image, $file); // Returns an image in PNG format
+		imagedestroy($image);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1216,7 +1216,7 @@ class FormOther
 		$confuserzone = 'MAIN_BOXES_'.$areacode;
 
 		// $boxactivated will be array of boxes enabled into global setup
-		// $boxidactivatedforuser will be array of boxes choosed by user
+		// $boxidactivatedforuser will be array of boxes chose by user
 
 		$selectboxlist = '';
 		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ? null : $user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 77f0395041d..6e3f37d824c 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -760,7 +760,7 @@ class FormProjets extends Form
 	}
 
 	/**
-	 *  Return combo list of differents status of a orders
+	 *  Return combo list of different statuses of orders
 	 *
 	 *  @param	string	$selected   Preselected value
 	 *  @param	int		$short		Use short labels
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index ef3312df0f3..3142b991aae 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -50,7 +50,7 @@ class FormPropal
 	}
 
 	/**
-	 *    Return combo list of differents status of a proposal
+	 *    Return combo list of different statuses of a proposal
 	 *    Values are id of table c_propalst
 	 *
 	 *    @param	string	$selected   	Preselected value
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 8f4c23ea5d7..16f301493f4 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -82,6 +82,7 @@ class FormSetup
 	 */
 	public $errors = array();
 
+
 	/**
 	 * Constructor
 	 *
@@ -343,7 +344,7 @@ class FormSetup
 
 
 	/**
-	 * Method used to test  module builder convertion to this form usage
+	 * Method used to test  module builder conversion to this form usage
 	 *
 	 * @param 	array 	$params 	an array of arrays of params from old modulBuilder params
 	 * @return 	boolean
@@ -362,7 +363,7 @@ class FormSetup
 
 	/**
 	 * From old
-	 * Method was used to test  module builder convertion to this form usage.
+	 * Method was used to test  module builder conversion to this form usage.
 	 *
 	 * @param 	string 	$confKey 	the conf name to store
 	 * @param 	array 	$params 	an array of params from old modulBuilder params
@@ -375,7 +376,7 @@ class FormSetup
 		}
 
 		/*
-		 * Exemple from old module builder setup page
+		 * Example from old module builder setup page
 		 * 	// 'MYMODULE_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>1),
 			// 'MYMODULE_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
 			//'MYMODULE_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
@@ -387,7 +388,7 @@ class FormSetup
 		 */
 
 		$item = new FormSetupItem($confKey);
-		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developper to use object oriented usage
+		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developer to use object oriented usage
 		/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
 
 		if (!empty($params['enabled'])) {
@@ -405,7 +406,7 @@ class FormSetup
 
 	/**
 	 * Used to export param array for /core/actions_setmoduleoptions.inc.php template
-	 * Method exists only for manage setup convertion
+	 * Method exists only for manage setup conversion
 	 *
 	 * @return array $arrayofparameters for /core/actions_setmoduleoptions.inc.php
 	 */
@@ -684,7 +685,7 @@ class FormSetupItem
 	}
 
 	/**
-	 * reload conf value from databases is an aliase of loadValueFromConf
+	 * reload conf value from databases is an alias of loadValueFromConf
 	 *
 	 * @deprecated
 	 * @return bool
@@ -1055,7 +1056,7 @@ class FormSetupItem
 	 * to be sure we can manage evolution easily
 	 *
 	 * @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
-	 * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup convertion
+	 * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup conversion
 	 * @return bool
 	 */
 	public function setTypeFromTypeString($type)
@@ -1148,7 +1149,7 @@ class FormSetupItem
 			if ($result < 0) {
 				$this->setErrors($c->errors);
 			}
-			$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+			$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
 			$toprint = array();
 			foreach ($ways as $way) {
 				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 69ff394fa8d..01662f85d8a 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -20,13 +20,13 @@
 /**
  *       \file       htdocs/core/class/html.formsms.class.php
  *       \ingroup    core
- *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
+ *       \brief      Fichier de la class permettant la generation du formulaire html d'envoi de mail unitaire
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
- *      Classe permettant la generation du formulaire d'envoi de Sms
+ *      Class permettant la generation du formulaire d'envoi de Sms
  *      Usage: $formsms = new FormSms($db)
  *             $formsms->proprietes=1 ou chaine ou tableau de valeurs
  *             $formsms->show_form() affiche le formulaire
@@ -105,7 +105,7 @@ class FormSms
 	 *	Show the form to input an sms.
 	 *
 	 *	@param	string	$morecss Class on first column td
-	 *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
+	 *  @param int $showform Show form tags and submit button (recommended is to use with value 0)
 	 *	@return	void
 	 */
 	public function show_form($morecss = 'titlefield', $showform = 1)
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 972458dd5c8..0d4c358e3ec 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1055,10 +1055,10 @@ class FormTicket
 							if (empty($tabscript[$groupcodefather])) {
 								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").val() == "'.dol_escape_js($groupcodefather).'"){
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
-									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
+									console.log("We show child tickets of '.$groupcodefather.' group ticket")
 								}else{
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").hide()
-									console.log("We hide childs tickets of '.$groupcodefather.' group ticket")
+									console.log("We hide child tickets of '.$groupcodefather.' group ticket")
 								}';
 							}
 						}
@@ -1335,8 +1335,8 @@ class FormTicket
 		//var_dump($keytoavoidconflict);
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 			if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
-				foreach ($this->param['fileinit'] as $file) {
-					$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+				foreach ($this->param['fileinit'] as $path) {
+					$formmail->add_attached_files($path, basename($path), dol_mimetype($path));
 				}
 			}
 		}
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 33797b7b821..700fc8600ee 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -20,7 +20,7 @@
 /**
  *   \file		    htdocs/core/class/interfaces.class.php
  *   \ingroup		core
- *   \brief			Fichier de la classe de gestion des triggers
+ *   \brief			Fichier de la class de gestion des triggers
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
@@ -59,10 +59,10 @@ class Interfaces
 	 *   This function call all qualified triggers.
 	 *
 	 *   @param		string		$action     Trigger event code
-	 *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.
-	 *   @param     User		$user       Objet user
-	 *   @param     Translate	$langs      Objet lang
-	 *   @param     Conf		$conf       Objet conf
+	 *   @param     object		$object     Object concerned. Some context information may also be provided into array property object->context.
+	 *   @param     User		$user       Object user
+	 *   @param     Translate	$langs      Object lang
+	 *   @param     Conf		$conf       Object conf
 	 *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
 	 */
 	public function run_triggers($action, $object, $user, $langs, $conf)
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index d7b774d3a40..6362783f6ce 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -84,28 +84,28 @@ class Ldap
 
 	/**
 	 * User administrateur Ldap
-	 * Active Directory ne supporte pas les connexions anonymes
+	 * Active Directory does not allow anonymous connections
 	 */
 	public $searchUser;
 	/**
-	 * Mot de passe de l'administrateur
-	 * Active Directory ne supporte pas les connexions anonymes
+	 * Administraot Password
+	 * Active Directory does not allow anonymous connections
 	 */
 	public $searchPassword;
 	/**
-	 *  DN des utilisateurs
+	 * Users DN
 	 */
 	public $people;
 	/**
-	 * DN des groupes
+	 * Groups DN
 	 */
 	public $groups;
 	/**
-	 * Code erreur retourne par le serveur Ldap
+	 * @var string|null Error code provided by the LDAP server
 	 */
 	public $ldapErrorCode;
 	/**
-	 * Message texte de l'erreur
+	 * @var string|null Error text message
 	 */
 	public $ldapErrorText;
 
@@ -326,7 +326,7 @@ class Ldap
 						dol_syslog(get_class($this)."::connect_bind this->connection is ok", LOG_DEBUG);
 					}
 
-					// Upgrade connexion to TLS, if requested by the configuration
+					// Upgrade connection to TLS, if requested by the configuration
 					if (getDolGlobalString('LDAP_SERVER_USE_TLS')) {
 						// For test/debug
 						//ldap_set_option($this->connection, LDAP_OPT_DEBUG_LEVEL, 7);
@@ -554,7 +554,7 @@ class Ldap
 		$result = @ldap_add($this->connection, $dn, $info);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::add successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->ldapErrorCode = @ldap_errno($this->connection);
@@ -612,7 +612,7 @@ class Ldap
 		$result = @ldap_modify($this->connection, $dn, $info);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::modify successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->error = @ldap_error($this->connection);
@@ -628,7 +628,7 @@ class Ldap
 	 *	@param	string		$dn				Old DN entry key (uid=qqq,ou=xxx,dc=aaa,dc=bbb) (before update)
 	 *	@param	string		$newrdn			New RDN entry key (uid=qqq)
 	 *	@param	string		$newparent		New parent (ou=xxx,dc=aaa,dc=bbb)
-	 *	@param	User		$user			Objet user that modify
+	 *	@param	User		$user			Object user that modify
 	 *	@param	bool		$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
@@ -655,7 +655,7 @@ class Ldap
 		$result = @ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::rename successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->error = @ldap_error($this->connection);
@@ -870,7 +870,7 @@ class Ldap
 	 *
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
+	 *	@param	User		$user		Object user that create
 	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function addAttribute($dn, $info, $user)
@@ -901,7 +901,7 @@ class Ldap
 		$result = @ldap_mod_add($this->connection, $dn, $info);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::add_attribute successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->error = @ldap_error($this->connection);
@@ -916,7 +916,7 @@ class Ldap
 	 *
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
+	 *	@param	User		$user		Object user that create
 	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function updateAttribute($dn, $info, $user)
@@ -947,7 +947,7 @@ class Ldap
 		$result = @ldap_mod_replace($this->connection, $dn, $info);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::updateAttribute successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->error = @ldap_error($this->connection);
@@ -962,7 +962,7 @@ class Ldap
 	 *
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
+	 *	@param	User		$user		Object user that create
 	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteAttribute($dn, $info, $user)
@@ -993,7 +993,7 @@ class Ldap
 		$result = @ldap_mod_del($this->connection, $dn, $info);
 
 		if ($result) {
-			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
+			dol_syslog(get_class($this)."::deleteAttribute successful", LOG_DEBUG);
 			return 1;
 		} else {
 			$this->error = @ldap_error($this->connection);
@@ -1114,7 +1114,7 @@ class Ldap
 			} elseif (((string) $activefilter == 'member') && $this->filter) {
 				$filter = '('.$this->filtermember.')';
 			} else {
-				// If this->filter/this->filtergroup is empty, make fiter on * (all)
+				// If this->filter/this->filtergroup is empty, make filter on * (all)
 				$filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'=*)';
 			}
 		} else {						// Use a filter forged using the $search value
@@ -1270,8 +1270,8 @@ class Ldap
 	 * 	Fonction de recherche avec filtre
 	 *	this->connection doit etre defini donc la methode bind ou bindauth doit avoir deja ete appelee
 	 *	Ne pas utiliser pour recherche d'une liste donnee de proprietes
-	 *	car conflit majuscule-minuscule. A n'utiliser que pour les pages
-	 *	'Fiche LDAP' qui affiche champ lisibles par defaut.
+	 *	car conflict majuscule-minuscule. A n'utiliser que pour les pages
+	 *	'Fiche LDAP' qui affiche champ lisibles par default.
 	 *
 	 * 	@param	string		$checkDn		DN de recherche (Ex: ou=users,cn=my-domain,cn=com)
 	 * 	@param 	string		$filter			Search filter (ex: (sn=nom_personne) )
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 8ad73725935..bd265349c3f 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -274,7 +274,7 @@ class Link extends CommonObject
 	/**
 	 *  Return nb of links
 	 *
-	 *  @param  DoliDb  $dbs		Database handler
+	 *  @param  DoliDB  $dbs		Database handler
 	 *  @param  string  $objecttype Type of the associated object in dolibarr
 	 *  @param  int     $objectid   Id of the associated object in dolibarr
 	 *  @return int                 Nb of links, -1 if error
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 3fe0d59ad89..0b908997d15 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -19,7 +19,7 @@
 /**
  *  \file       htdocs/core/class/menu.class.php
  *  \ingroup    core
- *  \brief      Fichier de la classe de gestion du menu gauche
+ *  \brief      Fichier de la class de gestion du menu gauche
  */
 
 
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 08d110637cd..b0a7768d919 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -572,7 +572,7 @@ class Menubase
 		// We initialize newmenu with first already found menu entries
 		$this->newmenu = $newmenu;
 
-		// Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)
+		// Now complete $this->newmenu->list to add entries found into $tabMenu that are children of mainmenu=$menutopid, using the fk_menu link that is int (old method)
 		$this->recur($tabMenu, $menutopid, 1);
 
 		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
@@ -631,7 +631,7 @@ class Menubase
 	 *  @param	string	$myleftmenu     Value for left that defined leftmenu
 	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
 	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
-	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)
+	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be already filled)
 	 *  @return int     		        >0 if OK, <0 if KO
 	 */
 	public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index b96e0fdd2dc..1fee391154c 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -599,7 +599,7 @@ class RssParser
 
 			array_unshift($this->stack, $el);
 		} elseif ($this->_format == 'atom' && $el == 'link') {
-			// Atom support many links per containging element.
+			// Atom support many links per containing element.
 			// Magpie treats link elements of type rel='alternate'
 			// as being equivalent to RSS's simple link element.
 			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate') {
@@ -664,7 +664,7 @@ class RssParser
 			$this->inchannel = false;
 		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
-			// note:  i don't think this is actually neccessary
+			// note:  i don't think this is actually necessary
 			if ($this->stack[0] == $el) {
 				$this->append_content("</$el>");
 			} else {
@@ -819,7 +819,7 @@ class RssParser
  * @param string $ent
  * @param string|false $base
  * @param string $sysID
- * @param string[false $pubID
+ * @param string|false $pubID
  * @return bool
 function extEntHandler($parser, $ent, $base, $sysID, $pubID)  {
 	print 'extEntHandler ran';
@@ -836,7 +836,7 @@ function extEntHandler($parser, $ent, $base, $sysID, $pubID)  {
  */
 function xml2php($xml)
 {
-	$fils = 0;
+	$threads = 0;
 	$tab = false;
 	$array = array();
 	foreach ($xml->children() as $key => $value) {
@@ -863,11 +863,11 @@ function xml2php($xml)
 			$array[$key] = $child;
 		}
 
-		$fils++;
+		$threads++;
 	}
 
 
-	if ($fils == 0) {
+	if ($threads == 0) {
 		return (string) $xml;
 	}
 
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 5291d3d9e02..17578875897 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -87,7 +87,7 @@ class SMTPs
 
 	/**
 	 * Who will the Message be sent to; TO, CC, BCC
-	 * Multi-diminsional array containg addresses the message will
+	 * Multi-diminsional array containing addresses the message will
 	 * be sent TO, CC or BCC
 	 */
 	private $_msgRecipients = null;
@@ -169,7 +169,7 @@ class SMTPs
 	private $_smtpsTransEncode = '7bit';
 
 	/**
-	 * Boundary String for MIME seperation
+	 * Boundary String for MIME separation
 	 */
 	private $_smtpsBoundary = null;
 
@@ -185,7 +185,7 @@ class SMTPs
 
 	/**
 	 * Determines the method inwhich the message are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server - default
+	 * - 'sockets' [0] - connect via network to SMTP server - default
 	 * - 'pipe     [1] - use UNIX path to EXE
 	 * - 'phpmail  [2] - use the PHP built-in mail function
 	 * NOTE: Only 'sockets' is implemented
@@ -194,7 +194,7 @@ class SMTPs
 
 	/**
 	 * If '$_transportType' is set to '1', then this variable is used
-	 * to define the UNIX file system path to the sendmail execuable
+	 * to define the UNIX file system path to the sendmail executable
 	 */
 	private $_mailPath = '/usr/lib/sendmail';
 
@@ -375,14 +375,14 @@ class SMTPs
 	}
 
 	/**
-	 * build RECIPIENT List, all addresses who will recieve this message
+	 * build RECIPIENT List, all addresses who will receive this message
 	 *
 	 * @return void
 	 */
 	public function buildRCPTlist()
 	{
 		// Pull TO list
-		$_aryToList = $this->getTO();
+		$_aryToList = $this->getTo();
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -399,7 +399,7 @@ class SMTPs
 
 		// We have to make sure the HOST given is valid
 		// This is done here because '@fsockopen' will not give me this
-		// information if it failes to connect because it can't find the HOST
+		// information if it fails to connect because it can't find the HOST
 		$host = $this->getHost();
 		$usetls = preg_match('@tls://@i', $host);
 
@@ -476,8 +476,8 @@ class SMTPs
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		// Send the RFC2554 specified EHLO.
-		// This improvment as provided by 'SirSir' to
-		// accomodate both SMTP AND ESMTP capable servers
+		// This improvement as provided by 'SirSir' to
+		// accommodate both SMTP AND ESMTP capable servers
 		$host = $this->getHost();
 		$usetls = preg_match('@tls://@i', $host);
 
@@ -825,11 +825,11 @@ class SMTPs
 
 	/**
 	 * Determines the method inwhich the messages are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'sockets' [0] - connect via network to SMTP server
 	 * - 'pipe     [1] - use UNIX path to EXE
 	 * - 'phpmail  [2] - use the PHP built-in mail function
 	 *
-	 * @param int $_type  Interger value representing Mail Transport Type
+	 * @param int $_type  Integer value representing Mail Transport Type
 	 * @return void
 	 */
 	public function setTransportType($_type = 0)
@@ -841,7 +841,7 @@ class SMTPs
 
 	/**
 	 * Return the method inwhich the message is to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'sockets' [0] - connect via network to SMTP server
 	 * - 'pipe     [1] - use UNIX path to EXE
 	 * - 'phpmail  [2] - use the PHP built-in mail function
 	 *
@@ -853,9 +853,9 @@ class SMTPs
 	}
 
 	/**
-	 * Path to the sendmail execuable
+	 * Path to the sendmail executable
 	 *
-	 * @param string $_path Path to the sendmail execuable
+	 * @param string $_path Path to the sendmail executable
 	 * @return boolean
 	 *
 	 */
@@ -1009,7 +1009,7 @@ class SMTPs
 
 	/**
 	 * Content-Transfer-Encoding, Defaulted to '7bit'
-	 * This can be changed for 2byte characers sets
+	 * This can be changed for 2byte characters sets
 	 * Known Encode Types
 	 *  - 7bit               Simple 7-bit ASCII
 	 *  - 8bit               8-bit coding with line termination characters
@@ -1041,7 +1041,7 @@ class SMTPs
 
 	/**
 	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
-	 * This can be changed for 2byte characers sets
+	 * This can be changed for 2byte characters sets
 	 * Known Encode Types
 	 *  - [0] 7bit               Simple 7-bit ASCII
 	 *  - [1] 8bit               8-bit coding with line termination characters
@@ -1141,7 +1141,7 @@ class SMTPs
 
 	/**
 	 * Inserts given addresses into structured format.
-	 * This method takes a list of given addresses, via an array or a COMMA delimted string, and inserts them into a highly
+	 * This method takes a list of given addresses, via an array or a COMMA delimited string, and inserts them into a highly
 	 * structured array. This array is designed to remove duplicate addresses and to sort them by Domain.
 	 *
 	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
@@ -1173,7 +1173,7 @@ class SMTPs
 				// Strip off the end '>'
 				$_strAddr = str_replace('>', '', $_strAddr);
 
-				// Seperate "Real Name" from eMail address
+				// Separate "Real Name" from eMail address
 				$_tmpaddr = null;
 				$_tmpaddr = explode('<', $_strAddr);
 
@@ -1184,7 +1184,7 @@ class SMTPs
 					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
 				} else {
 					// We only have an eMail address
-					// Strip off the beggining '<'
+					// Strip off the beginning '<'
 					$_strAddr = str_replace('<', '', $_strAddr);
 
 					$_tmpHost = explode('@', $_strAddr);
@@ -1207,7 +1207,7 @@ class SMTPs
 	 * - "Real Name" is optional
 	 * - if "Real Name" does not exist, the angle brackets are optional
 	 * This will split an email address into 4 or 5 parts.
-	 * - $_aryEmail[org]  = orignal string
+	 * - $_aryEmail[org]  = original string
 	 * - $_aryEmail[real] = "real name" - if there is one
 	 * - $_aryEmail[addr] = address part "username@domain.tld"
 	 * - $_aryEmail[host] = "domain.tld"
@@ -1219,7 +1219,7 @@ class SMTPs
 	private function _strip_email($_strAddr)
 	{
 		// phpcs:enable
-		// Keep the orginal
+		// Keep the original
 		$_aryEmail['org'] = $_strAddr;
 
 		// Set entire string to Lower Case
@@ -1228,7 +1228,7 @@ class SMTPs
 		// Drop "stuff' off the end
 		$_strAddr = trim($_strAddr, ' ">');
 
-		// Seperate "Real Name" from eMail address, if we have one
+		// Separate "Real Name" from eMail address, if we have one
 		$_tmpAry = explode('<', $_strAddr);
 
 		// Do we have a "Real name"
@@ -1258,7 +1258,7 @@ class SMTPs
 	/**
 	 * Returns an array of bares addresses for use with 'RCPT TO:'
 	 * This is a "build as you go" method. Each time this method is called
-	 * the underlaying array is destroyed and reconstructed.
+	 * the underlying array is destroyed and reconstructed.
 	 *
 	 * @return 		array		Returns an array of bares addresses
 	 */
@@ -1416,7 +1416,7 @@ class SMTPs
 	}
 
 	/**
-	 * Constructes and returns message header
+	 * Constructs and returns message header
 	 *
 	 * @return string Complete message header
 	 */
@@ -1425,7 +1425,7 @@ class SMTPs
 		global $conf;
 
 		$_header = 'From: '.$this->getFrom('org')."\r\n"
-		. 'To: '.$this->getTO()."\r\n";
+		. 'To: '.$this->getTo()."\r\n";
 
 		if ($this->getCC()) {
 			$_header .= 'Cc: '.$this->getCC()."\r\n";
@@ -1825,7 +1825,7 @@ class SMTPs
 	/**
 	 * Set flag which determines whether to calculate message MD5 checksum.
 	 *
-	 * @param 	string 	$_flag		Message Priority
+	 * @param 	boolean 	$_flag		MD5flag
 	 * @return 	void
 	 */
 	public function setMD5flag($_flag = false)
@@ -1836,7 +1836,7 @@ class SMTPs
 	/**
 	 * Gets flag which determines whether to calculate message MD5 checksum.
 	 *
-	 * @return 	boolean 				Message Priority
+	 * @return 	boolean 				MD5flag
 	 */
 	public function getMD5flag()
 	{
@@ -2073,11 +2073,11 @@ class SMTPs
  *  - added '$_smtpMD5' as a class property
  *  - added 'setMD5flag()' to set above property
  *  - added 'getMD5flag()' to retrieve above property
- *  - 'setAttachment()' will add an MD5 checksum to attachements if above property is set
+ *  - 'setAttachment()' will add an MD5 checksum to attachments if above property is set
  *  - 'setBodyContent()' will add an MD5 checksum to message parts if above property is set
  *  - 'getBodyContent()' will insert the MD5 checksum for messages and attachments if above property is set
- *  - removed leading dashes from message boundry
- *  - added propery "Close message boundry" tomessage block
+ *  - removed leading dashes from message boundary
+ *  - added property "Close message boundary" tomessage block
  *  - corrected some comments in various places
  *  - removed some incorrect comments in others
  *
@@ -2102,8 +2102,8 @@ class SMTPs
  * - remove potentially illegal characters from boundary
  *
  * Revision 1.10  2005/08/19 20:39:32  jswalter
- *  - added _server_connect()' as a seperate method to handle server connectivity.
- *  - added '_server_authenticate()' as a seperate method to handle server authentication.
+ *  - added _server_connect()' as a separate method to handle server connectivity.
+ *  - added '_server_authenticate()' as a separate method to handle server authentication.
  *  - 'sendMsg()' now uses the new methods to handle server communication.
  *  - modified 'server_parse()' and 'socket_send_str()' to give error codes and messages.
  *
@@ -2123,7 +2123,7 @@ class SMTPs
  *
  * Revision 1.8  2005/06/24 21:00:20  jswalter
  *   - corrected comments
- *   - corrected the defualt value for 'setPriority()'
+ *   - corrected the default value for 'setPriority()'
  *   - modified 'setAttachement()' to process multiple attachments correctly
  *   - modified 'getBodyContent()' to handle multiple attachments
  * Bug 310
@@ -2156,7 +2156,7 @@ class SMTPs
  *  - modified 'setBodyContent()' to store data in a sub-array for better
  *    parsing within the 'getBodyContent()' method
  *  - modified 'getBodyContent()' to process contents array better.
- *    Also modified to handle attachements.
+ *    Also modified to handle attachments.
  *  - added 'setAttachement()' so files and other data can be attached
  *    to messages
  *  - added '_setErr()' and 'getErrors()' as an attempt to begin an error
@@ -2176,7 +2176,7 @@ class SMTPs
  *  - added getSensitivity() method to use new Sensitivity array
  *  - created seters and getter for Priority with new Prioity value array property
  *  - changed config file include from 'include_once'
- *  - modified getHeader() to ustilize new Message Sensitivity and Priorty properties
+ *  - modified getHeader() to ustilize new Message Sensitivity and Priority properties
  *
  * Revision 1.5  2005/03/14 22:25:27  walter
  *  - added references
@@ -2186,13 +2186,13 @@ class SMTPs
  *  - 'sendMsg()' now uses Object properties and methods to build message
  *  - 'setConfig()' to load external file
  *  - 'setForm()' will "strip" the email address out of "address" string
- *  - modifed 'getFrom()' to handle "striping" the email address
+ *  - modified 'getFrom()' to handle "striping" the email address
  *  - '_buildArrayList()' creates a multi-dimensional array of addresses
  *    by domain, TO, CC & BCC and then by User Name.
  *  - '_strip_email()' pulls email address out of "full Address" string'
  *  - 'get_RCPT_list()' pulls out "bare" emaill address form address array
  *  - 'getHeader()' builds message Header from Object properties
- *  - 'getBodyContent()' builds full messsage body, even multi-part
+ *  - 'getBodyContent()' builds full message body, even multi-part
  *
  * Revision 1.4  2005/03/02 20:53:35  walter
  *  - core Setters & Getters defined
@@ -2209,6 +2209,6 @@ class SMTPs
  *
  * Revision 1.1  2005/03/01 19:22:49  walter
  *  - initial commit
- *  - basic shell with some commets
+ *  - basic shell with some comments
  *
  */
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 801ce765a8c..1a590c51588 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -178,7 +178,7 @@ abstract class Stats
 
 	/**
 	 * Return amount of elements by month for several years.
-	 * Criterias used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
+	 * Criteria used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
 	 * The caller of class can add more filters into sql request by adding criteris into the $stats->where property just after
 	 * calling constructor.
 	 *
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 901e1f0de91..fdc8f939903 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -93,7 +93,7 @@ class TimeSpent extends CommonObject
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -156,7 +156,7 @@ class TimeSpent extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -200,10 +200,10 @@ class TimeSpent extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -403,10 +403,10 @@ class TimeSpent extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -414,11 +414,11 @@ class TimeSpent extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -429,10 +429,10 @@ class TimeSpent extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -460,7 +460,7 @@ class TimeSpent extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -673,7 +673,7 @@ class TimeSpent extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -994,7 +994,7 @@ class TimeSpent extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index c5ce86c4e8c..03c2fc7f59d 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -20,7 +20,7 @@
 /**
  *   	\file       htdocs/core/class/translate.class.php
  *      \ingroup    core
- *		\brief      File for Tanslate class
+ *		\brief      File for Translate class
  */
 
 
@@ -197,7 +197,7 @@ class Translate
 	 *												then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang
 	 *  @param	integer	$alt         				0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)
 	 * 	@param	int		$stopafterdirection			Stop when the DIRECTION tag is found (optimize speed)
-	 * 	@param	int		$forcelangdir				To force a different lang directory
+	 * 	@param	string	$forcelangdir				To force a different lang directory
 	 *  @param  int     $loadfromfileonly   		1=Do not load overwritten translation from file or old conf.
 	 *  @param  int     $forceloadifalreadynotfound	Force attempt to reload lang file if it was previously not found
 	 *	@return	int									Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK
@@ -571,7 +571,7 @@ class Translate
 	 * Return translated value of key for special keys ("Currency...", "Civility...", ...).
 	 * Search in lang file, then into database. Key must be any complete entry into lang file: CurrencyEUR, ...
 	 * If not found, return key.
-	 * The string return is not formated (translated with transnoentitiesnoconv).
+	 * The string return is not formatted (translated with transnoentitiesnoconv).
 	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey->getLabelFromKey), if you modify this function,
 	 * check that getLabelFromKey is never called with the same value than $key.
 	 *
@@ -776,7 +776,7 @@ class Translate
 
 
 	/**
-	 *  Retourne la version traduite du texte passe en parametre complete du code pays
+	 *  Retourne la version traduite du texte passe en parameter complete du code pays
 	 *
 	 *  @param	string	$str            string root to translate
 	 *  @param  string	$countrycode    country code (FR, ...)
@@ -899,7 +899,7 @@ class Translate
 	 *  Return if a filename $filename exists for current language (or alternate language)
 	 *
 	 *  @param	string	$filename       Language filename to search
-	 *  @param  integer	$searchalt      Search also alernate language file
+	 *  @param  integer	$searchalt      Search also alternate language file
 	 *  @return boolean         		true if exists and readable
 	 */
 	public function file_exists($filename, $searchalt = 0)
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 3d0cc1ae52c..ec3c4d15505 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2022	Anthony Berton		<anthony.berton@bb2a.fr>
+ * Copyright (C) 2023	William Mead		<william.mead@manchenumerique.fr>
  *
  * 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
@@ -215,7 +216,7 @@ class Utils
 	 *  @param  string      $file              'auto' or filename to build
 	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
 	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec' - need size of dump in memory, but low memory method is used if GETPOST('lowmemorydump') is set, 2=Use the 'popen' method (low memory method)
-	 *  @param	int			$lowmemorydump	   1=Use the low memory method. If $lowmemorydump is set, it means we want to make the compression using an external pipe instead retreiving the content of the dump in PHP memory array $output_arr and then print it into the PHP pipe open with xopen().
+	 *  @param	int			$lowmemorydump	   1=Use the low memory method. If $lowmemorydump is set, it means we want to make the compression using an external pipe instead retrieving the content of the dump in PHP memory array $output_arr and then print it into the PHP pipe open with xopen().
 	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
 	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0, $lowmemorydump = 0)
@@ -294,7 +295,7 @@ class Utils
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
-			// Parameteres execution
+			// Parameters execution
 			$command = $cmddump;
 			$command = preg_replace('/(\$|%)/', '', $command); // We removed chars that can be used to inject vars that contains space inside path of command without seeing there is a space to bypass the escapeshellarg.
 			if (preg_match("/\s/", $command)) {
@@ -542,7 +543,7 @@ class Utils
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
 					@rename($outputfile, $outputerror);
-					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
+					// Si safe_mode on et command hors du parameter exec, on a un fichier out vide donc errormsg vide
 					if (!$errormsg) {
 						$langs->load("errors");
 						$errormsg = $langs->trans("ErrorFailedToRunExternalCommand");
@@ -600,7 +601,7 @@ class Utils
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
-			// Parameteres execution
+			// Parameters execution
 			$command = $cmddump;
 			$command = preg_replace('/(\$|%)/', '', $command); // We removed chars that can be used to inject vars that contains space inside path of command without seeing there is a space to bypass the escapeshellarg.
 			if (preg_match("/\s/", $command)) {
@@ -685,7 +686,7 @@ class Utils
 	 * @param 	string	$outputfile			A path for an output file (used only when method is 2). For example: $conf->admin->dir_temp.'/out.tmp';
 	 * @param	int		$execmethod			0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 * @param	string	$redirectionfile	If defined, a redirection of output to this file is added.
-	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter needs you alreay have sanitized the $command parameter. If not, it will lead to security vulnerability.
+	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter needs you already have sanitized the $command parameter. If not, it will lead to security vulnerability.
 	 * 										This parameter is provided for backward compatibility with external modules. Always use 0 in core.
 	 * @param	string	$redirectionfileerr	If defined, a redirection of error is added to this file instead of to channel 1.
 	 * @return	array						array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
@@ -1172,7 +1173,7 @@ class Utils
 			$resqldrop = $db->query('SHOW CREATE TABLE '.$table);
 			$row2 = $db->fetch_row($resqldrop);
 			if (empty($row2[1])) {
-				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
+				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empty string when it should not.\n");
 			} else {
 				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
@@ -1268,7 +1269,7 @@ class Utils
 	 *	@param 	string	$message             Message
 	 *	@param 	string	$filename		     List of files to attach (full path of filename on file system)
 	 * 	@param 	string	$filter			     Filter file send
-	 * 	@param 	string	$sizelimit			 Limit size to send file
+	 * 	@param 	int 	$sizelimit			 Limit size to send file
 	 *  @return	int						     0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
 	public function sendBackup($sendto = '', $from = '', $subject = '', $message = '', $filename = '', $filter = '', $sizelimit = 100000000)
@@ -1404,7 +1405,7 @@ class Utils
 		}
 
 		$cron_job = new Cronjob($db);
-		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1);	// Fetch jobs that are currently running
+		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, [], 1);	// Fetch jobs that are currently running
 
 		// Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)
 		foreach ($cron_job->lines as $job_line) {
diff --git a/htdocs/core/class/utils_diff.class.php b/htdocs/core/class/utils_diff.class.php
index 2925bffc3b6..e9ce4838a08 100644
--- a/htdocs/core/class/utils_diff.class.php
+++ b/htdocs/core/class/utils_diff.class.php
@@ -31,7 +31,7 @@ class Diff
 	 *
 	 * @param	string	$string1            First string
 	 * @param	string	$string2            Second string
-	 * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
 	 * @return	array						Array of diff
 	 */
 	public static function compare($string1, $string2, $compareCharacters = false)
@@ -150,7 +150,7 @@ class Diff
 	}
 
 	/**
-	 * Returns the partial diff for the specificed sequences, in reverse order.
+	 * Returns the partial diff for the specified sequences, in reverse order.
 	 * The parameters are:
 	 *
 	 * @param	string	$table     	the table returned by the computeTable function
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index 50d290f7517..02ed867a5d8 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -28,7 +28,7 @@
 class Validate
 {
 	/**
-	 * @var DoliDb		Database handler (result of a new DoliDB)
+	 * @var DoliDB		Database handler (result of a new DoliDB)
 	 */
 	public $db;
 
@@ -94,10 +94,10 @@ class Validate
 	 * Check for e-mail validity
 	 *
 	 * @param 	string 	$email 		e-mail address to validate
-	 * @param 	int   	$maxLength 	string max length
+	 * @param 	int   	$maxLength 	string max length (not used)
 	 * @return 	boolean 			Validity is ok or not
 	 */
-	public function isEmail($email, $maxLength = false)
+	public function isEmail($email, $maxLength = 0)
 	{
 		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 			$this->error = $this->outputLang->trans('RequireValidEmail');
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index e2694520577..345ad056c4e 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -83,7 +83,7 @@ function dol_quoted_printable_encode($input, $line_max = 76)
 
 
 /**
- *	Class to buld vCard files
+ *	Class to build vCard files
  */
 class vCard
 {
@@ -139,7 +139,7 @@ class vCard
 	}
 
 	/**
-	 *	mise en forme du nom formate
+	 *	mise en forme du nom format
 	 *
 	 *	@param	string	$name			Name
 	 *	@return	void
@@ -150,7 +150,7 @@ class vCard
 	}
 
 	/**
-	 *	mise en forme du nom complet
+	 *	mise en forme du nom complete
 	 *
 	 *	@param	string	$family			Family name
 	 *	@param	string	$first			First name
@@ -396,7 +396,7 @@ class vCard
 
 		$this->setProdId('Dolibarr '.DOL_VERSION);
 
-		$this->setUid('DOLIBARR-USERID-'.dol_trunc(md5('vcard'.$dolibarr_main_instance_unique_id), 8, 'right', 'UTF-8', 1).'-'.$object->id);
+		$this->setUID('DOLIBARR-USERID-'.dol_trunc(md5('vcard'.$dolibarr_main_instance_unique_id), 8, 'right', 'UTF-8', 1).'-'.$object->id);
 		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
 		$this->setFormattedName($object->getFullName($langs, 1));
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index ff288424d37..a67597fcaea 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -300,7 +300,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX.$tabletouse." as ".$tablealiastouse;
 		}
 
-		// Add a where here keeping only the citeria on $tabletouse
+		// Add a where here keeping only the criteria on $tabletouse
 		// TODO
 		/*$sqlfilters = ... GETPOST('search_component_params_hidden', 'alphanohtml');
 		if ($sqlfilters) {
@@ -642,7 +642,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	// Init the list of tables added. We include by default always the main table.
 	$listoftablesalreadyadded = array($object->table_element => $object->table_element);
 
-	// Add LEFT JOIN for all parent tables mentionned into the Xaxis
+	// Add LEFT JOIN for all parent tables mentioned into the Xaxis
 	//var_dump($arrayofxaxis); var_dump($search_xaxis);
 	foreach ($search_xaxis as $key => $val) {
 		if (!empty($arrayofxaxis[$val])) {
@@ -669,7 +669,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 		}
 	}
 
-	// Add LEFT JOIN for all parent tables mentionned into the Group by
+	// Add LEFT JOIN for all parent tables mentioned into the Group by
 	//var_dump($arrayofgroupby); var_dump($search_groupby);
 	foreach ($search_groupby as $key => $val) {
 		if (!empty($arrayofgroupby[$val])) {
@@ -696,7 +696,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 		}
 	}
 
-	// Add LEFT JOIN for all parent tables mentionned into the Yaxis
+	// Add LEFT JOIN for all parent tables mentioned into the Yaxis
 	//var_dump($arrayofgroupby); var_dump($search_groupby);
 	foreach ($search_measures as $key => $val) {
 		if (!empty($arrayofmesures[$val])) {
@@ -1011,11 +1011,11 @@ $db->close();
  * @param 	mixed		$object			Any object
  * @param	string		$tablealias		Alias of table
  * @param	string		$labelofobject	Label of object
- * @param	array		$arrayofmesures	Array of mesures already filled
+ * @param	array		$arrayofmesures	Array of measures already filled
  * @param	int			$level 			Level
  * @param	int			$count			Count
  * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
- * @return 	array						Array of mesures
+ * @return 	array						Array of measures
  */
 function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesures, $level = 0, &$count = 0, &$tablepath = '')
 {
@@ -1032,7 +1032,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	}
 
 	if ($level == 0) {
-		// Add the count of record only for the main/first level object. Parents are necessarly unique for each record.
+		// Add the count of record only for the main/first level object. Parents are necessarily unique for each record.
 		$arrayofmesures[$tablealias.'.count'] = array(
 			'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': Count',
 			'labelnohtml' => $labelofobject.': Count',
@@ -1047,7 +1047,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	// Add main fields of object
 	foreach ($object->fields as $key => $val) {
 		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
-			$position = (empty($val['position']) ? 0 : intVal($val['position']));
+			$position = (empty($val['position']) ? 0 : intval($val['position']));
 			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
 				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
@@ -1200,7 +1200,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 				continue;
 			}
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofxaxis[$tablealias.'.'.$key.'-year'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
@@ -1223,7 +1223,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 					'tablefromt' => $tablepath
 				);
 			} else {
-				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofxaxis[$tablealias.'.'.$key] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
@@ -1246,7 +1246,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 			}
 
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intVal($extrafields->attributes[$object->table_element]['pos'][$key]));
+				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
 				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
@@ -1362,7 +1362,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 				continue;
 			}
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
@@ -1385,7 +1385,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 					'tablefromt' => $tablepath
 				);
 			} else {
-				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
@@ -1408,7 +1408,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			}
 
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intVal($extrafields->attributes[$object->table_element]['pos'][$key]));
+				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 1a7454e92ca..e1bc75888e6 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -65,7 +65,7 @@ interface Database
 	 * Start transaction
 	 *
 	 * @param	string	$textinlog		Add a small text into log. '' by default.
-	 * @return  int      				1 if transaction successfuly opened or already opened, 0 if error
+	 * @return  int      				1 if transaction successfully opened or already opened, 0 if error
 	 */
 	public function begin($textinlog = '');
 
@@ -228,7 +228,7 @@ interface Database
 	 *    Canceling a transaction and returning to old values
 	 *
 	 * @param	string $log Add more log to default log line
-	 * @return  int                1 if cancelation ok or transaction not open, 0 if error
+	 * @return  int                1 if cancellation ok or transaction not open, 0 if error
 	 */
 	public function rollback($log = '');
 
@@ -245,7 +245,7 @@ interface Database
 	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0);
 
 	/**
-	 *    Connexion to server
+	 *    Connection to server
 	 *
 	 * @param   string $host database server host
 	 * @param   string $login login
@@ -317,7 +317,7 @@ interface Database
 	/**
 	 * Return generic error code of last operation.
 	 *
-	 * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 * @return    string        Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	public function errno();
 
@@ -446,7 +446,7 @@ interface Database
 	 * 19700101020000 -> 7200 whaterver is TZ if gmt=1
 	 *
 	 * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
+	 * @param	bool			$gm			1=Input information are GMT values, otherwise local to server TZ
 	 * @return	int|string					Date TMS or ''
 	 */
 	public function jdate($string, $gm = false);
@@ -488,9 +488,9 @@ interface Database
 	public function free($resultset = null);
 
 	/**
-	 * Close database connexion
+	 * Close database connection
 	 *
-	 * @return  boolean     					True if disconnect successfull, false otherwise
+	 * @return  boolean     					True if disconnect successful, false otherwise
 	 * @see     connect()
 	 */
 	public function close();
@@ -504,9 +504,9 @@ interface Database
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return connexion ID
+	 * Return connection ID
 	 *
-	 * @return  string      Id connexion
+	 * @return  string      Id connection
 	 */
 	public function DDLGetConnectId();
 	// phpcs:enable
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index a6469cf6939..7d28007ec81 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -89,8 +89,8 @@ abstract class DoliDB implements Database
 	 *	Format a SQL IF
 	 *
 	 *	@param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
-	 *	@param	string	$resok          resultat si test egal
-	 *	@param	string	$resko          resultat si test non egal
+	 *	@param	string	$resok          resultat si test equal
+	 *	@param	string	$resko          resultat si test non equal
 	 *	@return	string          		SQL string
 	 */
 	public function ifsql($test, $resok, $resko)
@@ -114,18 +114,18 @@ abstract class DoliDB implements Database
 	/**
 	 *	Format a SQL REGEXP
 	 *
-	 *	@param	string	$subject        string tested
+	 *	@param	string	$subject        Field name to test
 	 *	@param	string  $pattern        SQL pattern to match
-	 *	@param	int		$sqlstring      whether or not the string being tested is an SQL expression
+	 *	@param	int		$sqlstring      0=the string being tested is a hard coded string, 1=the string is a field
 	 *	@return	string          		SQL string
 	 */
 	public function regexpsql($subject, $pattern, $sqlstring = 0)
 	{
 		if ($sqlstring) {
-			return "(". $subject ." REGEXP '" . $pattern . "')";
+			return "(". $subject ." REGEXP '" . $this->escape($pattern) . "')";
 		}
 
-		return "('". $subject ."' REGEXP '" . $pattern . "')";
+		return "('". $this->escape($subject) ."' REGEXP '" . $this->escape($pattern) . "')";
 	}
 
 
@@ -134,7 +134,7 @@ abstract class DoliDB implements Database
 	 *   Function to use to build INSERT, UPDATE or WHERE predica
 	 *
 	 *   @param	    int		$param      Date TMS to convert
-	 *	 @param		mixed	$gm			'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
+	 *	 @param		mixed	$gm			'gmt'=Input information are GMT values, 'tzserver'=Local to server TZ
 	 *   @return	string      		Date in a string YYYY-MM-DD HH:MM:SS
 	 */
 	public function idate($param, $gm = 'tzserver')
@@ -171,7 +171,7 @@ abstract class DoliDB implements Database
 	 * Start transaction
 	 *
 	 * @param	string	$textinlog		Add a small text into log. '' by default.
-	 * @return	int         			1 if transaction successfuly opened or already opened, 0 if error
+	 * @return	int         			1 if transaction successfully opened or already opened, 0 if error
 	 */
 	public function begin($textinlog = '')
 	{
@@ -218,7 +218,7 @@ abstract class DoliDB implements Database
 	 *	Cancel a transaction and go back to initial data values
 	 *
 	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
+	 * 	@return	resource|int         		1 if cancellation is ok or transaction not open, 0 if error
 	 */
 	public function rollback($log = '')
 	{
@@ -281,7 +281,7 @@ abstract class DoliDB implements Database
 	 * Define sort criteria of request
 	 *
 	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
-	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC'. Note: If the quantity fo sortorder values is lower than sortfield, we used the last value for missing values.
+	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC'. Note: If the quantity for sortorder values is lower than sortfield, we used the last value for missing values.
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
 	public function order($sortfield = '', $sortorder = '')
@@ -338,7 +338,7 @@ abstract class DoliDB implements Database
 	 * 	19700101020000 -> 7200 whaterver is server TZ if $gm='gmt'
 	 *
 	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 *	@param	mixed				$gm			'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
+	 *	@param	mixed				$gm			'gmt'=Input information are GMT values, 'tzserver'=Local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
 	public function jdate($string, $gm = 'tzserver')
@@ -366,7 +366,7 @@ abstract class DoliDB implements Database
 	/**
 	 * Return first result from query as object
 	 * Note : This method executes a given SQL query and retrieves the first row of results as an object. It should only be used with SELECT queries
-	 * Dont add LIMIT to your query, it will be added by this method
+	 * Don't add LIMIT to your query, it will be added by this method
 	 *
 	 * @param 	string 				$sql 	The sql query string
 	 * @return 	bool|int|object    			False on failure, 0 on empty, object on success
@@ -391,7 +391,7 @@ abstract class DoliDB implements Database
 	/**
 	 * Return all results from query as an array of objects
 	 * Note : This method executes a given SQL query and retrieves all row of results as an array of objects. It should only be used with SELECT queries
-	 * be carefull with this method use it only with some limit of results to avoid performences loss.
+	 * be careful with this method use it only with some limit of results to avoid performances loss.
 	 *
 	 * @param 	string 		$sql 		The sql query string
 	 * @return 	bool|array				Result
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index cb7d98b04ab..fae891e07ec 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -47,7 +47,7 @@ class DoliDBMysqli extends DoliDB
 
 	/**
 	 *	Constructor.
-	 *	This create an opened connexion to a database server and eventually to a database
+	 *	This create an opened connection to a database server and eventually to a database
 	 *
 	 *	@param      string	$type		Type of database (mysql, pgsql...). Not used.
 	 *	@param	    string	$host		Address of database server
@@ -91,7 +91,7 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		// Try server connection
-		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+		// We do not try to connect to database, only to server. Connect to database is done later in constructor
 		$this->db = $this->connect($host, $user, $pass, '', $port);
 
 		if ($this->db && empty($this->db->connect_errno)) {
@@ -284,9 +284,9 @@ class DoliDBMysqli extends DoliDB
 
 
 	/**
-	 *  Close database connexion
+	 *  Close database connection
 	 *
-	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @return     bool     True if disconnect successful, false otherwise
 	 *  @see        connect()
 	 */
 	public function close()
@@ -338,7 +338,7 @@ class DoliDBMysqli extends DoliDB
 
 		try {
 			if (!$this->database_name) {
-				// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+				// SQL query not needing a database connection (example: CREATE DATABASE)
 				$ret = $this->db->query($query, $result_mode);
 			} else {
 				$ret = $this->db->query($query, $result_mode);
@@ -378,7 +378,7 @@ class DoliDBMysqli extends DoliDB
 	public function fetch_object($resultset)
 	{
 		// phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		// If the resultset was not provided, we get the last one for this connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -396,7 +396,7 @@ class DoliDBMysqli extends DoliDB
 	public function fetch_array($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -413,14 +413,14 @@ class DoliDBMysqli extends DoliDB
 	public function fetch_row($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_bool($resultset)) {
 			if (!is_object($resultset)) {
 				$resultset = $this->_results;
 			}
 			return $resultset->fetch_row();
 		} else {
-			// si le curseur est un booleen on retourne la valeur 0
+			// si le curseur est un boolean on retourne la valeur 0
 			return 0;
 		}
 	}
@@ -436,7 +436,7 @@ class DoliDBMysqli extends DoliDB
 	public function num_rows($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -454,7 +454,7 @@ class DoliDBMysqli extends DoliDB
 	public function affected_rows($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -465,14 +465,14 @@ class DoliDBMysqli extends DoliDB
 
 
 	/**
-	 *	Libere le dernier resultset utilise sur cette connexion
+	 *	Libere le dernier resultset utilise sur cette connection
 	 *
 	 *	@param  mysqli_result	$resultset	Curseur de la requete voulue
 	 *	@return	void
 	 */
 	public function free($resultset = null)
 	{
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -507,12 +507,12 @@ class DoliDBMysqli extends DoliDB
 	/**
 	 *	Return generic error code of last operation.
 	 *
-	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 *	@return	string		Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	public function errno()
 	{
 		if (!$this->connected) {
-			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			// Si il y a eu echec de connection, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		} else {
 			// Constants to convert a MySql error code to a generic Dolibarr error code
@@ -564,7 +564,7 @@ class DoliDBMysqli extends DoliDB
 	public function error()
 	{
 		if (!$this->connected) {
-			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
+			// Si il y a eu echec de connection, $this->db n'est pas valide pour mysqli_error.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
 		} else {
 			return $this->db->error;
@@ -648,9 +648,9 @@ class DoliDBMysqli extends DoliDB
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return connexion ID
+	 * Return connection ID
 	 *
-	 * @return	        string      Id connexion
+	 * @return	        string      Id connection
 	 */
 	public function DDLGetConnectId()
 	{
@@ -706,7 +706,7 @@ class DoliDBMysqli extends DoliDB
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '')
@@ -738,7 +738,7 @@ class DoliDBMysqli extends DoliDB
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTablesFull($database, $table = '')
@@ -770,7 +770,7 @@ class DoliDBMysqli extends DoliDB
 	 *	List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
-	 *	@return	array				Tableau des informations des champs de la table
+	 *	@return	array				Tableau des information des champs de la table
 	 */
 	public function DDLInfoTable($table)
 	{
@@ -923,8 +923,8 @@ class DoliDBMysqli extends DoliDB
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
-	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
-	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
+	 *	@param	string	$field_desc 		Associative table with description of field to insert [parameter name][parameter value]
+	 *	@param	string	$field_position 	Optional e.g.: "after some_field"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
@@ -1037,8 +1037,8 @@ class DoliDBMysqli extends DoliDB
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
 	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip server or '%'
-	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
-	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
+	 *	@param	string	$dolibarr_main_db_user 		Nom new user
+	 *	@param	string	$dolibarr_main_db_pass 		Password for the new user
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									Return integer <0 if KO, >=0 if OK
 	 */
@@ -1258,7 +1258,7 @@ class mysqliDoli extends mysqli
 {
 	/**
 	 *	Constructor.
-	 *	This create an opened connexion to a database server and eventually to a database
+	 *	This create an opened connection to a database server and eventually to a database
 	 *
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Name of database user
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 566cccf332a..d2b832a0dc6 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -25,13 +25,13 @@
 
 /**
  *	\file       htdocs/core/db/pgsql.class.php
- *	\brief      Fichier de la classe permettant de gerer une base pgsql
+ *	\brief      Fichier de la class permettant de gerer une base pgsql
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 
 /**
- *	Class to drive a Postgresql database for Dolibarr
+ *	Class to drive a PostgreSQL database for Dolibarr
  */
 class DoliDBPgsql extends DoliDB
 {
@@ -51,11 +51,11 @@ class DoliDBPgsql extends DoliDB
 	const VERSIONMIN = '9.0.0'; // Version min database
 
 	/**
-	 * @var boolean $unescapeslashquot  			Set this to 1 when calling SQL queries, to say that SQL is not standard but already escaped for Mysql. Used by Postgresql driver
+	 * @var boolean $unescapeslashquot  			Set this to 1 when calling SQL queries, to say that SQL is not standard but already escaped for Mysql. Used by PostgreSQL driver
 	 */
 	public $unescapeslashquot = false;
 	/**
-	 * @var boolean $standard_conforming_string		Set this to true if postgres accept only standard encoding of sting using '' and not \'
+	 * @var boolean $standard_conforming_string		Set this to true if postgres accept only standard encoding of string using '' and not \'
 	 */
 	public $standard_conforming_strings = false;
 
@@ -67,12 +67,12 @@ class DoliDBPgsql extends DoliDB
 
 	/**
 	 *	Constructor.
-	 *	This create an opened connexion to a database server and eventually to a database
+	 *	This create an opened connection to a database server and eventually to a database
 	 *
 	 *	@param      string	$type		Type of database (mysql, pgsql...). Not used.
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Nom de l'utilisateur autorise
-	 *	@param	    string	$pass		Mot de passe
+	 *	@param	    string	$pass		Password
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
 	 */
@@ -112,7 +112,7 @@ class DoliDBPgsql extends DoliDB
 			return;
 		}
 
-		// Essai connexion serveur
+		// Essai connection serveur
 		//print "$host, $user, $pass, $name, $port";
 		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
@@ -127,7 +127,7 @@ class DoliDBPgsql extends DoliDB
 			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error.'. Failed to connect to host='.$host.' port='.$port.' user='.$user, LOG_ERR);
 		}
 
-		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
+		// If server connection serveur ok and DB connection is requested, try to connect to DB
 		if ($this->connected && $name) {
 			if ($this->select_db($name)) {
 				$this->database_selected = true;
@@ -241,7 +241,7 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/^float/i', 'numeric', $line);
 				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
-				//Check tms timestamp field case (in Mysql this field is defautled to now and
+				//Check tms timestamp field case (in Mysql this field is defaulted to now and
 				// on update defaulted by now
 				$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
@@ -320,11 +320,11 @@ class DoliDBPgsql extends DoliDB
 				}
 			}
 
-			// To have postgresql case sensitive
+			// To have PostgreSQL case sensitive
 			$count_like = 0;
 			$line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
 			if (getDolGlobalString('PSQL_USE_UNACCENT') && $count_like > 0) {
-				// @see https://docs.postgresql.fr/11/unaccent.html : 'unaccent()' function must be installed before
+				// @see https://docs.PostgreSQL.fr/11/unaccent.html : 'unaccent()' function must be installed before
 				$line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
 			}
 
@@ -361,7 +361,7 @@ class DoliDBPgsql extends DoliDB
 			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4, \\5', $line);
 			//print $line."\n";
 
-			// Replace espacing \' by ''.
+			// Replace spacing ' with ''.
 			// By default we do not (should be already done by db->escape function if required
 			// except for sql insert in data file that are mysql escaped so we removed them to
 			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
@@ -378,8 +378,8 @@ class DoliDBPgsql extends DoliDB
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Select a database
-	 *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
-	 *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
+	 *  PostgreSQL does not have an equivalent for `mysql_select_db`
+	 *  Only compare if the chosen DB is the one active on the connection
 	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    bool				true if OK, false if KO
@@ -395,7 +395,7 @@ class DoliDBPgsql extends DoliDB
 	}
 
 	/**
-	 *	Connexion to server
+	 *	Connection to server
 	 *
 	 *	@param	    string		$host		Database server host
 	 *	@param	    string		$login		Login
@@ -485,9 +485,9 @@ class DoliDBPgsql extends DoliDB
 	}
 
 	/**
-	 *  Close database connexion
+	 *  Close database connection
 	 *
-	 *  @return     boolean     True if disconnect successfull, false otherwise
+	 *  @return     boolean     True if disconnect successful, false otherwise
 	 *  @see        connect()
 	 */
 	public function close()
@@ -517,7 +517,7 @@ class DoliDBPgsql extends DoliDB
 
 		$query = trim($query);
 
-		// Convert MySQL syntax to PostgresSQL syntax
+		// Convert MySQL syntax to PostgreSQL syntax
 		$query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
@@ -593,7 +593,7 @@ class DoliDBPgsql extends DoliDB
 	public function fetch_object($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -610,7 +610,7 @@ class DoliDBPgsql extends DoliDB
 	public function fetch_array($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -627,7 +627,7 @@ class DoliDBPgsql extends DoliDB
 	public function fetch_row($resultset)
 	{
 		// phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -645,7 +645,7 @@ class DoliDBPgsql extends DoliDB
 	public function num_rows($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -663,7 +663,7 @@ class DoliDBPgsql extends DoliDB
 	public function affected_rows($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -674,14 +674,14 @@ class DoliDBPgsql extends DoliDB
 
 
 	/**
-	 * Libere le dernier resultset utilise sur cette connexion
+	 * Libere le dernier resultset utilise sur cette connection
 	 *
 	 * @param	resource	$resultset  Result set of request
 	 * @return	void
 	 */
 	public function free($resultset = null)
 	{
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -741,10 +741,10 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 *  Format a SQL IF
 	 *
-	 *  @param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
-	 *  @param	string	$resok          resultat si test egal
-	 *  @param	string	$resko          resultat si test non egal
-	 *  @return	string          		chaine formate SQL
+	 *  @param	string	$test           Test expression (example: 'cd.statut=0', 'field IS NULL')
+	 *  @param	string	$resok          Result to generate when test is True
+	 *  @param	string	$resko          Result to generate when test is False
+	 *  @return	string          		chaine format SQL
 	 */
 	public function ifsql($test, $resok, $resko)
 	{
@@ -754,30 +754,30 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 *	Format a SQL REGEXP
 	 *
-	 *	@param	string	$subject        string tested
+	 *	@param	string	$subject        Field name to test
 	 *	@param	string  $pattern        SQL pattern to match
-	 *	@param	int		$sqlstring      whether or not the string being tested is an SQL expression
+	 *	@param	int		$sqlstring      0=the string being tested is a hard coded string, 1=the string is a field
 	 *	@return	string          		SQL string
 	 */
 	public function regexpsql($subject, $pattern, $sqlstring = 0)
 	{
 		if ($sqlstring) {
-			return "(". $subject ." ~ '" . $pattern . "')";
+			return "(". $subject ." ~ '" . $this->escape($pattern) . "')";
 		}
 
-		return "('". $subject ."' ~ '" . $pattern . "')";
+		return "('". $this->escape($subject) ."' ~ '" . $this->escape($pattern) . "')";
 	}
 
 
 	/**
 	 * Renvoie le code erreur generique de l'operation precedente.
 	 *
-	 * @return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 * @return	string		Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	public function errno()
 	{
 		if (!$this->connected) {
-			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			// Si il y a eu echec de connection, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		} else {
 			// Constants to convert error code to a generic Dolibarr error code
@@ -847,7 +847,7 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 * Get last ID after an insert INSERT
 	 *
-	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec PostgreSQL
 	 * @param	string	$fieldid	Field name
 	 * @return  string     			Id of row
 	 */
@@ -911,9 +911,9 @@ class DoliDBPgsql extends DoliDB
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return connexion ID
+	 * Return connection ID
 	 *
-	 * @return	        string      Id connexion
+	 * @return	        string      Id connection
 	 */
 	public function DDLGetConnectId()
 	{
@@ -1016,7 +1016,7 @@ class DoliDBPgsql extends DoliDB
 	 *	List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
-	 *	@return	array				Tableau des informations des champs de la table
+	 *	@return	array				Tableau des information des champs de la table
 	 *
 	 */
 	public function DDLInfoTable($table)
@@ -1205,7 +1205,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
-	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
+	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parameter][valeur du parameter]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index c6eeb736325..0faa455d23c 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -51,12 +51,12 @@ class DoliDBSqlite3 extends DoliDB
 
 	/**
 	 *  Constructor.
-	 *  This create an opened connexion to a database server and eventually to a database
+	 *  This create an opened connection to a database server and eventually to a database
 	 *
 	 *  @param      string	$type		Type of database (mysql, pgsql...). Not used.
 	 *  @param	    string	$host		Address of database server
 	 *  @param	    string	$user		Nom de l'utilisateur autorise
-	 *  @param	    string	$pass		Mot de passe
+	 *  @param	    string	$pass		Password
 	 *  @param	    string	$name		Nom de la database
 	 *  @param	    int		$port		Port of database server
 	 */
@@ -98,8 +98,8 @@ class DoliDBSqlite3 extends DoliDB
 			return;
 		}*/
 
-		// Essai connexion serveur
-		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+		// Essai connection serveur
+		// We do not try to connect to database, only to server. Connect to database is done later in constructor
 		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
 		if ($this->db) {
@@ -307,7 +307,7 @@ class DoliDBSqlite3 extends DoliDB
 
 
 	/**
-	 *	Connexion to server
+	 *	Connection to server
 	 *
 	 *	@param	    string	$host		database server host
 	 *	@param	    string	$login		login
@@ -368,9 +368,9 @@ class DoliDBSqlite3 extends DoliDB
 
 
 	/**
-	 *  Close database connexion
+	 *  Close database connection
 	 *
-	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @return     bool     True if disconnect successful, false otherwise
 	 *  @see        connect()
 	 */
 	public function close()
@@ -411,8 +411,8 @@ class DoliDBSqlite3 extends DoliDB
 		$reg = array();
 		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
 			// Ajout d'une clef étrangère à la table
-			// procédure de remplacement de la table pour ajouter la contrainte
-			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// procédure de replacement de la table pour ajouter la contrainte
+			// Example : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
 			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
 			$foreignFields = $reg[5];
 			$foreignTable = $reg[4];
@@ -467,7 +467,7 @@ class DoliDBSqlite3 extends DoliDB
 			}
 		}
 
-		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+		// Ordre SQL ne necessitant pas de connection a une base (example: CREATE DATABASE)
 		try {
 			//$ret = $this->db->exec($query);
 			$ret = $this->db->query($query); // $ret is a Sqlite3Result
@@ -515,7 +515,7 @@ class DoliDBSqlite3 extends DoliDB
 	public function fetch_object($resultset)
 	{
 		// phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -538,7 +538,7 @@ class DoliDBSqlite3 extends DoliDB
 	public function fetch_array($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -557,14 +557,14 @@ class DoliDBSqlite3 extends DoliDB
 	public function fetch_row($resultset)
 	{
 		// phpcs:enable
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_bool($resultset)) {
 			if (!is_object($resultset)) {
 				$resultset = $this->_results;
 			}
 			return $resultset->fetchArray(SQLITE3_NUM);
 		} else {
-			// si le curseur est un booleen on retourne la valeur 0
+			// si le curseur est un boolean on retourne la valeur 0
 			return false;
 		}
 	}
@@ -582,7 +582,7 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		// FIXME: SQLite3Result does not have a queryString member
 
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -605,7 +605,7 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		// FIXME: SQLite3Result does not have a queryString member
 
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -626,7 +626,7 @@ class DoliDBSqlite3 extends DoliDB
 	 */
 	public function free($resultset = null)
 	{
-		// If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connection
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
@@ -661,12 +661,12 @@ class DoliDBSqlite3 extends DoliDB
 	/**
 	 *	Renvoie le code erreur generique de l'operation precedente.
 	 *
-	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 *	@return	string		Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	public function errno()
 	{
 		if (!$this->connected) {
-			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			// Si il y a eu echec de connection, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		} else {
 			// Constants to convert error code to a generic Dolibarr error code
@@ -735,7 +735,7 @@ class DoliDBSqlite3 extends DoliDB
 	public function error()
 	{
 		if (!$this->connected) {
-			// Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
+			// Si il y a eu echec de connection, $this->db n'est pas valide pour sqlite_error.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
 		} else {
 			return $this->error;
@@ -819,9 +819,9 @@ class DoliDBSqlite3 extends DoliDB
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return connexion ID
+	 * Return connection ID
 	 *
-	 * @return	        string      Id connexion
+	 * @return	        string      Id connection
 	 */
 	public function DDLGetConnectId()
 	{
@@ -931,7 +931,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *  List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
-	 *	@return	array				Tableau des informations des champs de la table
+	 *	@return	array				Tableau des information des champs de la table
 	 *	TODO modify for sqlite
 	 */
 	public function DDLInfoTable($table)
@@ -1075,10 +1075,10 @@ class DoliDBSqlite3 extends DoliDB
 	/**
 	 *	Create a new field into table
 	 *
-	 *	@param	string	$table 				Name of table
-	 *	@param	string	$field_name 		Name of field to add
-	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
-	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
+	 *	@param	string	$table 				Table name
+	 *	@param	string	$field_name 		Field name to add
+	 *	@param	string	$field_desc 		Associative table with description of field to insert [parameter name][parameter value]
+	 *	@param	string	$field_position 	Optional e.g.: "after some_field"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
@@ -1171,7 +1171,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
 	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
-	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
+	 *	@param	string	$dolibarr_main_db_pass 		Password user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									Return integer <0 if KO, >=0 if OK
 	 */
@@ -1366,12 +1366,14 @@ class DoliDBSqlite3 extends DoliDB
 	}
 
 	/**
-	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-	 * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
-	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 * Add a custom function in the database engine (STORED PROCEDURE)
+	 * Notes:
+	 *   - The custom function is prefixed with 'db'
+	 *   - The function must be static and public.
+	 *   - The number of arguments is automatically determined when arg_count is < 0
 	 *
-	 * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
-	 * @param	int		$arg_count		Arg count
+	 * @param 	string 	$name 			Function name to define in Sqlite
+	 * @param	int		$arg_count		Arguments count
 	 * @return	void
 	 */
 	private function addCustomFunction($name, $arg_count = -1)
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
index ec02afa8817..ca9a01bc37d 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -579,7 +579,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 
 	// Check if the parent exists, or create it.
 	if (!empty($sParent) && !file_exists($sParent)) {
-		//prevents agains infinite loop when we can't create root folder
+		//prevents against infinite loop when we can't create root folder
 		if (!is_null($lastFolder) && $lastFolder === $sParent) {
 			return "Can't create $folderPath directory";
 		}
@@ -678,7 +678,7 @@ function Server_MapPath($path)
  * Is Allowed Extension
  *
  * @param   string $sExtension      File extension
- * @param   string $resourceType    ressource type
+ * @param   string $resourceType    resource type
  * @return  boolean                 true or false
  */
 function IsAllowedExt($sExtension, $resourceType)
@@ -702,7 +702,7 @@ function IsAllowedExt($sExtension, $resourceType)
 /**
  * Is Allowed Type
  *
- * @param   string $resourceType    ressource type
+ * @param   string $resourceType    resource type
  * @return  boolean                 true or false
  */
 function IsAllowedType($resourceType)
@@ -933,7 +933,7 @@ function ConvertToXmlAttribute($value)
 }
 
 /**
- * Check whether given extension is in html etensions list
+ * Check whether given extension is in html extensions list
  *
  * @param 	string 		$ext				Extension
  * @param 	array 		$formExtensions		Array of extensions
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index 9e12ca36728..080e331b048 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -47,7 +47,7 @@ function DoResponse()
 		return;
 	}
 
-	// Get the main request informaiton.
+	// Get the main request information.
 	$sCommand = $_GET['Command'];
 	$sResourceType = $_GET['Type'];
 	$sCurrentFolder = GetCurrentFolder();
diff --git a/htdocs/core/js/dst.js b/htdocs/core/js/dst.js
index 7276e37755c..f3b348f798a 100644
--- a/htdocs/core/js/dst.js
+++ b/htdocs/core/js/dst.js
@@ -25,9 +25,11 @@
 
 $(document).ready(function () {
 
-    var timezone = jstz.determine();
-	console.log("Timezone detected for user: "+timezone.name());
-	
+    //var timezone = jstz.determine(); // old method using jstimezonedetect library
+	//console.log("Timezone detected for user: "+timezone.name());
+	var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+	console.log("Timezone detected by Intl for user: "+timezone);
+
     // Detect and save TZ and DST
 	var rightNow = new Date();
 	var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
@@ -49,8 +51,8 @@ $(document).ready(function () {
 	var dst_first=DisplayDstSwitchDates('first');
 	var dst_second=DisplayDstSwitchDates('second');
 	//alert(dst);
+    $('#tz_string').val(timezone);										// returns TZ string
 	$('#tz').val(std_time_offset);   				  					// returns TZ
-    $('#tz_string').val(timezone.name());		// returns TZ string
 	$('#dst_observed').val(dst);   				  						// returns if DST is observed on summer
 	$('#dst_first').val(dst_first);   									// returns DST first switch in year
 	$('#dst_second').val(dst_second);   								// returns DST second switch in year
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index a53835e1137..f051990b13e 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -232,7 +232,7 @@ if ($conf->browser->layout != 'phone') {
 print "\n/* JS CODE TO ENABLE reposition management (does not work if a redirect is done after action of submission) */\n";
 print '
 	jQuery(document).ready(function() {
-				/* If page_y set, we set scollbar with it */
+				/* If page_y set, we set scrollbar with it */
 				page_y=getParameterByName(\'page_y\', 0);				/* search in GET parameter */
 				if (page_y == 0) page_y = jQuery("#page_y").text();		/* search in POST parameter that is filed at bottom of page */
 				if (page_y > 0)
diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php
index 700f8872654..d7ca7bea933 100644
--- a/htdocs/core/js/lib_gravatar.js.php
+++ b/htdocs/core/js/lib_gravatar.js.php
@@ -67,7 +67,7 @@ function get_avatar_from_service(service, userid, size) {
 	// implemented services: google profiles, facebook, gravatar, twitter, tumblr, default fallback
 	// for google   use get_avatar_from_service('google', profile-name or user-id , size-in-px )
 	// for facebook use get_avatar_from_service('facebook', vanity url or user-id , size-in-px or size-as-word )
-	// for gravatar use get_avatar_from_service('gravatar', md5 hash email@adress, size-in-px )
+	// for gravatar use get_avatar_from_service('gravatar', md5 hash email@address, size-in-px )
 	// for twitter  use get_avatar_from_service('twitter', username, size-in-px or size-as-word )
 	// for tumblr   use get_avatar_from_service('tumblr', blog-url, size-in-px )
 	// everything else will go to the fallback
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 360efa0b5c8..190bef849e9 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -269,7 +269,7 @@ function formatDate(date,format)
 {
 	// alert('formatDate date='+date+' format='+format);
 
-	// Force parametres en chaine
+	// Force parameters en chaine
 	format=format+"";
 
 	var result="";
@@ -337,7 +337,7 @@ function getDateFromFormat(val,format)
 {
 	// alert('getDateFromFormat val='+val+' format='+format);
 
-	// Force parametres en chaine
+	// Force parameters en chaine
 	val=val+"";
 	format=format+"";
 
@@ -561,14 +561,14 @@ function hideMessage(fieldId,message) {
  *
  * @param	string	url			Url (warning: as any url called in ajax mode, the url called here must not renew the token)
  * @param	string	code		Code
- * @param	string	intput		Array of complementary actions to do if success
+ * @param	string	input		Array of complementary actions to do if success
  * @param	int		entity		Entity
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
  * @param   int     userid      User id
  * @param	int		value       Value to set
  * @param   string  token       Token
- * @retun   boolean
+ * @return   boolean
  */
 function setConstant(url, code, input, entity, strict, forcereload, userid, token, value) {
 	var saved_url = url; /* avoid undefined url */
@@ -668,7 +668,7 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
  *
  * @param	{string}	url			Url (warning: as any url called in ajax mode, the url called here must not renew the token)
  * @param	{string}	code		Code
- * @param	{string}	intput		Array of complementary actions to do if success
+ * @param	{string}	input		Array of complementary actions to do if success
  * @param	{int}		entity		Entity
  * @param	{int}		strict		Strict
  * @param   {int}     forcereload Force reload
@@ -765,7 +765,7 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
  * @param	string	action		Action
  * @param	string	url			Url
  * @param	string	code		Code
- * @param	string	intput		Array of complementary actions to do if success
+ * @param	string	input		Array of complementary actions to do if success
  * @param	string	box			Box
  * @param	int		entity		Entity
  * @param	int		yesButton	yesButton
@@ -884,7 +884,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 								}
 							});
 							if ( !valid ) {
-								// remove invalid value, as it didnt match anything
+								// remove invalid value, as it didn't match anything
 								$( this ).val( "" );
 								select.val( "" );
 								input.data("ui-autocomplete").term = "";
@@ -1265,7 +1265,7 @@ function price2numjs(amount) {
 	amount = amount.replace(thousand, '');        // Replace of thousand before replace of dec to avoid pb if thousand is .
 	amount = amount.replace(dec, '.');
 
-	//console.log("amount before="+amount+" rouding="+rounding)
+	//console.log("amount before="+amount+" rounding="+rounding)
 	var res = Math.round10(amount, - rounding);
 	// Other solution is
 	// var res = dolroundjs(amount, rounding)
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 2f8192a29fe..3a980043d37 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -212,7 +212,7 @@ function check_events() {
 
 		result = 1;
 	} else {
-		console.log("Cancel check_events() with dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page+". Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
+		console.log("Cancel check_events() with dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page+". Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manually or web site is not https).");
 
 		result = 2;	// We return a positive so the repeated check will done even if authroization is not yet allowed may be after this check)
 	}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 529e53a13cd..3afbc7bd247 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -162,7 +162,7 @@ function versiondolibarrarray()
  *  @param		int			$nocommentremoval			Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
  *  @param		int			$offsetforchartofaccount	Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value
  *  @param		int			$colspan					2=Add a colspan=2 on td
- *  @param		int			$onlysqltoimportwebsite		Only sql resquests used to import a website template are allowed
+ *  @param		int			$onlysqltoimportwebsite		Only sql requests used to import a website template are allowed
  *  @param		string		$database					Database (replace __DATABASE__ with this value)
  * 	@return		int										Return integer <=0 if KO, >0 if OK
  */
@@ -880,7 +880,7 @@ function modulehelp_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	// FIX for compatibity habitual tabs
+	// FIX for compatibility habitual tabs
 	$object->id = $object->numero;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$object->id.'&mode=desc';
@@ -1217,7 +1217,7 @@ function activateModule($value, $withdeps = 1, $noconfverification = 0)
 			}
 
 			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith)) {
-				// Desactivation des modules qui entrent en conflit
+				// Deactivation des modules qui entrent en conflict
 				$num = count($objMod->conflictwith);
 				for ($i = 0; $i < $num; $i++) {
 					foreach ($modulesdir as $dir) {
@@ -1326,7 +1326,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 {
 	global $db, $modules, $conf, $langs;
 
-	dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
+	dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionary tables", LOG_DEBUG, 1);
 
 	// Search modules
 	$modulesdir = dolGetModulesDirs();
@@ -1377,10 +1377,13 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 								}
 							}
 
+							// phpcs:disable
 							// Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
-							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {
-								$objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							// Note: "diction"."naries" to prevent codespell from detecting a spelling error. 
+							if (empty($objMod->dictionaries) && !empty($objMod->{"dicton"."naries"})) {
+								$objMod->dictionaries = $objMod->{"diction"."naries"}; // For backward compatibility
 							}
+							// phpcs:enable
 
 							if (!empty($objMod->dictionaries)) {
 								//var_dump($objMod->dictionaries['tabname']);
@@ -1668,7 +1671,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 	$form = new Form($db);
 
 	if (empty($strictw3c)) {
-		dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
+		dol_syslog("Warning: Function 'form_constantes' was called with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
 	}
 	if (!empty($strictw3c) && $strictw3c == 1) {
 		print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -2001,7 +2004,7 @@ function phpinfo_array()
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	    		    head array with tabs
  */
@@ -2040,7 +2043,7 @@ function company_admin_prepare_head()
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	    		    head array with tabs
  */
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 01f64f98c16..1ed670a12bb 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -37,7 +37,7 @@
  * @param 	int				$showbirthday	Show birthday
  * @param 	string			$filtera		Filter on create by user
  * @param 	string			$filtert		Filter on assigned to user
- * @param 	string			$filterd		Filter of done by user
+ * @param 	string			$filtered		Filter of done by user
  * @param 	int				$pid			Product id
  * @param 	int				$socid			Third party id
  * @param	string			$action			Action string
@@ -48,8 +48,26 @@
  * @param	int   			$resourceid	    Preselected value of resource for filter on resource
  * @return	void
  */
-function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals = array(), $actioncode = '', $usergroupid = '', $excludetype = '', $resourceid = 0)
-{
+function print_actions_filter(
+	$form,
+	$canedit,
+	$status,
+	$year,
+	$month,
+	$day,
+	$showbirthday,
+	$filtera,
+	$filtert,
+	$filtered,
+	$pid,
+	$socid,
+	$action,
+	$showextcals = array(),
+	$actioncode = '',
+	$usergroupid = 0,
+	$excludetype = '',
+	$resourceid = 0
+) {
 	global $user, $langs, $db, $hookmanager;
 	global $massaction;
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index af150fb1bce..f78c59b7b41 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -72,7 +72,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 					var autoselect = '.((int) $autoselect).';
 					var options = '.json_encode($ajaxoptions).'; /* Option of actions to do after keyup, or after select */
 
-					/* Remove selected id as soon as we type or delete a char (it means old selection is wrong). Use keyup/down instead of change to avoid loosing the product id. This is needed only for select of predefined product */
+					/* Remove selected id as soon as we type or delete a char (it means old selection is wrong). Use keyup/down instead of change to avoid losing the product id. This is needed only for select of predefined product */
 					$("input#search_'.$htmlnamejquery.'").keydown(function(e) {
 						if (e.keyCode != 9)		/* If not "Tab" key */
 						{
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 3e8604c7599..75788627cec 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -24,7 +24,7 @@
 /**
  * \file       htdocs/core/lib/bank.lib.php
  * \ingroup    bank
- * \brief      Ensemble de fonctions de base pour le module banque
+ * \brief      Ensemble de functions de base pour le module banque
  */
 
 
@@ -273,11 +273,11 @@ function various_payment_prepare_head($object)
 }
 
 /**
- *      Check SWIFT informations for a bank account
+ *      Check SWIFT information for a bank account
  *
  *      @param  Account     $account    A bank account (used to get BIC/SWIFT)
  *      @param	string		$swift		Swift value (used to get BIC/SWIFT, param $account non used if provided)
- *      @return boolean                 True if informations are valid, false otherwise
+ *      @return boolean                 True if information are valid, false otherwise
  */
 function checkSwiftForAccount(Account $account = null, $swift = null)
 {
@@ -294,11 +294,11 @@ function checkSwiftForAccount(Account $account = null, $swift = null)
 }
 
 /**
- *      Check IBAN number informations for a bank account.
+ *      Check IBAN number information for a bank account.
  *
  *      @param  Account     $account    	A bank account
  *      @param	string		$ibantocheck	Bank account number (used to get BAN, $account not used if provided)
- *      @return boolean                 	True if informations are valid, false otherwise
+ *      @return boolean                 	True if information are valid, false otherwise
  */
 function checkIbanForAccount(Account $account = null, $ibantocheck = null)
 {
@@ -338,10 +338,10 @@ function getIbanHumanReadable(Account $account)
 }
 
 /**
- * 		Check account number informations for a bank account
+ * 		Check account number information for a bank account
  *
  * 		@param	Account		$account    A bank account
- * 		@return boolean           		True if informations are valid, false otherwise
+ * 		@return boolean           		True if information are valid, false otherwise
  */
 function checkBanForAccount($account)
 {
@@ -361,13 +361,13 @@ function checkBanForAccount($account)
 
 	if ($country_code == 'FR') { // France rules
 		$coef = array(62, 34, 3);
-		// Concatenation des differents codes.
+		// Concatenate the code parts
 		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
-		// On remplace les eventuelles lettres par des chiffres.
+		// On replace les eventuelles lettres par des chiffres.
 		//$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
 		$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
-		// Separation du rib en 3 groupes de 7 + 1 groupe de 2.
-		// Multiplication de chaque groupe par les coef du tableau
+		// Separation du rib en 3 groups de 7 + 1 group de 2.
+		// Multiplication de chaque group par les coef du tableau
 
 		for ($i = 0, $s = 0; $i < 3; $i++) {
 			$code = substr($rib, 7 * $i, 7);
@@ -395,9 +395,9 @@ function checkBanForAccount($account)
 	}
 	if ($country_code == 'AU') {  // Australian
 		if (strlen($account->code_banque) > 7) {
-			return false; // Sould be 6 but can be 123-456
+			return false; // Should be 6 but can be 123-456
 		} elseif (strlen($account->code_banque) < 6) {
-			return false; // Sould be 6
+			return false; // Should be 6
 		} else {
 			return true;
 		}
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index d6c721d8ccb..2455c630320 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -457,9 +457,9 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 	}
 	$im = imagecreate($total_x, $total_y);
 	/* create two images */
-	$col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
-	$col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
-	$col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+	$col_bg = imagecolorallocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+	$col_bar = imagecolorallocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+	$col_text = imagecolorallocate($im, $text_color[0], $text_color[1], $text_color[2]);
 	$height = round($total_y - ($scale * 10));
 	$height2 = round($total_y - $space['bottom']);
 
@@ -504,7 +504,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 		header("Content-Type: image/gif; name=\"barcode.gif\"");
 		imagegif($im);
 	} elseif (!empty($filebarcode)) {
-		// To wxrite into  afile onto disk
+		// To write into  a file onto disk
 		imagepng($im, $filebarcode);
 	} else {
 		header("Content-Type: image/png; name=\"barcode.png\"");
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index 7f75adedec6..2bc74923e52 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -18,7 +18,7 @@
 
 /**
  *	\file       htdocs/core/lib/categories.lib.php
- *	\brief      Ensemble de fonctions de base pour le module categorie
+ *	\brief      Ensemble de functions de base pour le module categorie
  *	\ingroup    categorie
  */
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index ac64addd641..baf7817a2af 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -29,7 +29,7 @@
 
 /**
  *	\file       htdocs/core/lib/company.lib.php
- *	\brief      Ensemble de fonctions de base pour le module societe
+ *	\brief      Ensemble de functions de base pour le module societe
  *	\ingroup    societe
  */
 
@@ -463,7 +463,7 @@ function societe_prepare_head2($object)
 
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
@@ -691,7 +691,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
 
 	$outputlangs->load("dict");
 
-	// If there is a translation, we can send immediatly the label
+	// If there is a translation, we can send immediately the label
 	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso) {
 		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
 	}
@@ -1098,7 +1098,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		}
 	}
 
-	// Initialize array of search criterias
+	// Initialize array of search criteria
 	$search = array();
 	foreach ($arrayfields as $key => $val) {
 		$queryName = 'search_'.substr($key, 2);
@@ -1156,7 +1156,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print "\n".'<table class="tagtable liste">'."\n";
 
 	$param = "socid=".urlencode($object->id);
@@ -1872,7 +1872,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					$result = $contactaction->fetchResources();
 					if ($result < 0) {
 						dol_print_error($db);
-						setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
+						setEventMessage("company.lib::show_actions_done Error fetch resource", 'errors');
 					}
 
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index d8d74f4056e..c4285d10bda 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -21,7 +21,7 @@
 
 /**
  *	    \file       htdocs/core/lib/contact.lib.php
- *		\brief      Ensemble de fonctions de base pour les contacts
+ *		\brief      Ensemble de functions de base pour les contacts
  */
 
 /**
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index edc4c0fa8a4..6b94903e3fc 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -20,7 +20,7 @@
 
 /**
  * \file       htdocs/core/lib/contract.lib.php
- * \brief      Ensemble de fonctions de base pour le module contrat
+ * \brief      Ensemble de functions de base pour le module contrat
  */
 
 /**
@@ -139,7 +139,7 @@ function contract_prepare_head(Contrat $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index be7a7c5996b..df3383dab6c 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -233,7 +233,7 @@ function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0)
  *                                          - 'year': only year part);
  *      @param      int		$lengthOfDay    Length of day (default 86400 seconds for 1 day, 28800 for 8 hour)
  *      @param      int		$lengthOfWeek   Length of week (default 7)
- *    	@return     string		 		 	Formated text of duration
+ *    	@return     string		 		 	Formatted text of duration
  * 	                                		Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
  *      @see convertTime2Seconds()
  */
@@ -368,7 +368,7 @@ function convertDurationtoHour($duration_value, $duration_unit)
  * @param      int|string	$year_date			Year date
  * @param	   int      	$excludefirstand	Exclude first and
  * @param	   mixed		$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
- * 												Note: In database, dates are always fot the server TZ.
+ * 												Note: In database, dates are always for the server TZ.
  * @return     string		$sqldate			String with SQL filter
  */
 function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0, $gm = false)
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 275b69aea2b..f0ac7aef03d 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -21,7 +21,7 @@
 
 /**
  *	    \file       htdocs/core/lib/doleditor.lib.php
- *		\brief      Ensemble de fonctions de base pour la gestion des utilisaterus et groupes
+ *		\brief      Ensemble de functions de base pour la gestion des utilisaterus et groups
  */
 
 /**
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index da3836460e4..cfb3bacff68 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -19,7 +19,7 @@
 
 /**
  * \file       htdocs/core/lib/ecm.lib.php
- * \brief      Ensemble de fonctions de base pour le module ecm
+ * \brief      Ensemble de functions de base pour le module ecm
  * \ingroup    ecm
  */
 
@@ -171,7 +171,7 @@ function ecm_prepare_head_fm($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array               head array with tabs
  */
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index 76f060d627f..f431a292704 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -67,7 +67,7 @@ function expedition_prepare_head(Expedition $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	    		    head array with tabs
  */
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index 0bd84fc02f3..be79e4ecb03 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -124,7 +124,7 @@ function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 53d3e944e69..2045003d1c0 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -23,7 +23,7 @@
 
 /**
  *	\file       htdocs/core/lib/fichinter.lib.php
- *	\brief      Ensemble de fonctions de base pour le module fichinter
+ *	\brief      Ensemble de functions de base pour le module fichinter
  *	\ingroup    fichinter
  */
 
@@ -162,7 +162,7 @@ function fichinter_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 29b956c9d7a..060cb3f836f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -29,7 +29,7 @@
 
 /**
  * Make a basename working with all page code (default PHP basenamed fails with cyrillic).
- * We supose dir separator for input is '/'.
+ * We suppose dir separator for input is '/'.
  *
  * @param	string	$pathfile	String to find basename.
  * @return	string				Basename of input
@@ -306,7 +306,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 
 /**
  * Complete $filearray with data from database.
- * This will call doldir_list_indatabase to complate filearray.
+ * This will call doldir_list_indatabase to complete filearray.
  *
  * @param	array	$filearray			Array of files obtained using dol_dir_list
  * @param	string	$relativedir		Relative dir from DOL_DATA_ROOT
@@ -859,7 +859,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
 	if (!$destexists) {
-		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
+		// We must set mask just before creating dir, because it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec = octdec($newmask);
 		if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
@@ -1084,7 +1084,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 		}
 
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
-		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
+		// to allow mask usage for dir, we should introduce a new param "isdir" to 1 to complete newmask like this
 		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
 		dolChmod($newpathofdestfile, $newmask);
 	}
@@ -2067,7 +2067,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 }
 
 /**
- *  Delete files into database index using search criterias.
+ *  Delete files into database index using search criteria.
  *
  *  @param      string	$dir			Directory name (full real path without ending /)
  *  @param		string	$file			File name
@@ -2143,7 +2143,7 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 			$ret = $image->readImage($filetoconvert);
 		} catch (Exception $e) {
 			$ext = pathinfo($fileinput, PATHINFO_EXTENSION);
-			dol_syslog("Failed to read image using Imagick (Try to install package 'apt-get install php-imagick ghostscript' and check there is no policy to disable ".$ext." convertion in /etc/ImageMagick*/policy.xml): ".$e->getMessage(), LOG_WARNING);
+			dol_syslog("Failed to read image using Imagick (Try to install package 'apt-get install php-imagick ghostscript' and check there is no policy to disable ".$ext." conversion in /etc/ImageMagick*/policy.xml): ".$e->getMessage(), LOG_WARNING);
 			return 0;
 		}
 		if ($ret) {
@@ -2575,7 +2575,7 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
  * TODO Replace code that set $accessallowed by a call to restrictedArea()
  *
- * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
+ * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Example: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
@@ -2644,7 +2644,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping for miscellaneous medias files
-	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root)) {
+	if ($modulepart == 'common') {
+		// Wrapping for some images
+		$accessallowed = 1;
+		$original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/'.$original_file;
+	} elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root)) {
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
@@ -2662,7 +2666,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		// Wrapping for doctemplates of websites
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
-	} elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root)) {
+	} elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root)) {	// To download zip of modules
 		// Wrapping for *.zip package files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 		// Dir for custom dirs
 		$tmp = explode(',', $dolibarr_main_document_root_alt);
@@ -3031,7 +3035,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
 	} elseif ($modulepart == 'project' && !empty($conf->project->multidir_output[$entity])) {
-		// Wrapping pour les projets
+		// Wrapping pour les projects
 		if ($fuser->hasRight('projet', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 921d31af701..44981c12b3e 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -165,7 +165,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderDispatch");
 
-		//If dispach process running we add the number of item to dispatch into the head
+		//If dispatch process running we add the number of item to dispatch into the head
 		if (in_array($object->statut, array($object::STATUS_ORDERSENT, $object::STATUS_RECEIVED_PARTIALLY, $object::STATUS_RECEIVED_COMPLETELY))) {
 			$sumQtyAllreadyDispatched = 0;
 			$sumQtyOrdered = 0;
@@ -246,7 +246,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d686883cd7f..c9fed272eaa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -250,8 +250,8 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 	require_once DOL_DOCUMENT_ROOT."/core/db/".$type.'.class.php';
 
 	$class = 'DoliDB'.ucfirst($type);
-	$dolidb = new $class($type, $host, $user, $pass, $name, $port);
-	return $dolidb;
+	$db = new $class($type, $host, $user, $pass, $name, $port);
+	return $db;
 }
 
 /**
@@ -10847,8 +10847,6 @@ function ajax_autoselect($htmlname, $addlink = '', $textonlink = 'Link')
  */
 function dolIsAllowedForPreview($file)
 {
-	global $conf;
-
 	// Check .noexe extension in filename
 	if (preg_match('/\.noexe$/i', $file)) {
 		return 0;
@@ -12936,7 +12934,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 					$result = $contactaction->fetchResources();
 					if ($result < 0) {
 						dol_print_error($db);
-						setEventMessage("actions.lib::show_actions_messaging Error fetch ressource", 'errors');
+						setEventMessage("actions.lib::show_actions_messaging Error fetch resource", 'errors');
 					}
 
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 45ccfc70b95..0db8cabbefb 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -136,10 +136,10 @@ function dol_getDefaultFormat(Translate $outputlangs = null)
 
 
 /**
- *	Show informations on an object
+ *	Show information on an object
  *  TODO Move this into html.formother
  *
- *	@param	object	$object			Objet to show
+ *	@param	object	$object			Object to show
  *  @param  int     $usetable       Output into a table
  *	@return	void
  */
@@ -754,7 +754,7 @@ function isValidVATID($company)
  */
 function clean_url($url, $http = 1)
 {
-	// Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
+	// Fixed by Matelli (see http://matelli.fr/showcases/patch%73-dolibarr/fix-cleaning-url.html)
 	// To include the minus sign in a char class, we must not escape it but put it at the end of the class
 	// Also, there's no need of escape a dot sign in a class
 	$regs = array();
@@ -790,7 +790,7 @@ function clean_url($url, $http = 1)
  * 	Returns an email value with obfuscated parts.
  *
  * 	@param 		string		$mail				Email
- * 	@param 		string		$replace			Replacement character (defaul: *)
+ * 	@param 		string		$replace			Replacement character (default: *)
  * 	@param 		int			$nbreplace			Number of replacement character (default: 8)
  * 	@param 		int			$nbdisplaymail		Number of character unchanged (default: 4)
  * 	@param 		int			$nbdisplaydomain	Number of character unchanged of domain (default: 3)
@@ -888,7 +888,7 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  * @param   string		$mask			Mask to use
  * @param   string		$table			Table containing field with counter
  * @param   string		$field			Field containing already used values of counter
- * @param   string		$where			To add a filter on selection (for exemple to filter on invoice types)
+ * @param   string		$where			To add a filter on selection (for example to filter on invoice types)
  * @param   Societe		$objsoc			The company that own the object we need a counter for
  * @param   string		$date			Date to use for the {y},{m},{d} tags.
  * @param   string		$mode			'next' for next value or 'last' for last value
@@ -1185,7 +1185,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskLike = dol_string_nospecial($mask);
 	$maskLike = str_replace("%", "_", $maskLike);
 
-	// Replace protected special codes with matching number of _ as wild card caracter
+	// Replace protected special codes with matching number of _ as wild card character
 	$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
 	$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
 	$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
@@ -1256,7 +1256,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		// Define $maskLike
 		$maskLike = dol_string_nospecial($mask);
 		$maskLike = str_replace("%", "_", $maskLike);
-		// Replace protected special codes with matching number of _ as wild card caracter
+		// Replace protected special codes with matching number of _ as wild card character
 		$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
 		$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
 		$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
@@ -1325,7 +1325,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			// Define $maskrefclient_maskLike
 			$maskrefclient_maskLike = dol_string_nospecial($mask);
 			$maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);
-			// Replace protected special codes with matching number of _ as wild card caracter
+			// Replace protected special codes with matching number of _ as wild card character
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
@@ -1623,9 +1623,9 @@ function numero_semaine($time)
 
 	/*
 	 * Norme ISO-8601:
-	 * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.
-	 * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.
-	 * - Le 1er jour de la semaine est le Lundi
+	 * - Week 1 of the year contains Jan 4th, or contains the first Thursday of January.
+	 * - Most years have 52 weeks, but 53 weeks for years starting on a Thursday and bisectile years that start on a Wednesday.
+	 * - The first day of a week is Monday
 	 */
 
 	// Definition du Jeudi de la semaine
@@ -1707,7 +1707,7 @@ function weight_convert($weight, &$from_unit, $to_unit)
 }
 
 /**
- *	Save personnal parameter
+ *	Save personal parameter
  *
  *	@param	DoliDB	$db         Handler database
  *	@param	Conf	$conf		Object conf
@@ -1719,7 +1719,7 @@ function weight_convert($weight, &$from_unit, $to_unit)
  */
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
-	// Verification parametres
+	// Verification parameters
 	if (count($tab) < 1) {
 		return -1;
 	}
@@ -1775,11 +1775,11 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 }
 
 /**
- *	Returns formated reduction
+ *	Returns formatted reduction
  *
  *	@param	int			$reduction		Reduction percentage
  *	@param	Translate	$langs			Output language
- *	@return	string						Formated reduction
+ *	@return	string						Formatted reduction
  */
 function dol_print_reduction($reduction, $langs)
 {
@@ -1795,7 +1795,7 @@ function dol_print_reduction($reduction, $langs)
 
 /**
  * 	Return OS version.
- *  Note that PHP_OS returns only OS (not version) and OS PHP was built on, not necessarly OS PHP runs on.
+ *  Note that PHP_OS returns only OS (not version) and OS PHP was built on, not necessarily OS PHP runs on.
  *
  *  @param 		string		$option 	Option string
  * 	@return		string					OS version
@@ -1951,7 +1951,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 
 /**
  * This function evaluates a string that should be a valid IPv4
- * Note: For ip 169.254.0.0, it returns 0 with some PHP (5.6.24) and 2 with some minor patchs of PHP (5.6.25). See https://github.com/php/php-src/pull/1954.
+ * Note: For ip 169.254.0.0, it returns 0 with some PHP (5.6.24) and 2 with some minor patches of PHP (5.6.25). See https://github.com/php/php-src/pull/1954.
  *
  * @param	string $ip IP Address
  * @return	int 0 if not valid or reserved range, 1 if valid and public IP, 2 if valid and private range IP
@@ -2422,7 +2422,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 			if ($color < 128) {
 				$color -= ($color * ($ratio / 100));
 			}
-		} else { // We decrease agressiveness
+		} else { // We decrease aggressiveness
 			if ($color > 128) {
 				$color -= (($color - 128) * (abs($ratio) / 100));
 			}
@@ -2690,7 +2690,7 @@ function price2fec($amount)
 	if (empty($amount)) {
 		$amount = 0; // To have a numeric value if amount not defined or = ''
 	}
-	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
+	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occurred when amount value = o (letter) instead 0 (number)
 
 	// Output decimal number by default
 	$nbdecimal = (!getDolGlobalString('ACCOUNTING_FEC_DECIMAL_LENGTH') ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);
diff --git a/htdocs/core/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
index cb683ceec1f..d8db03ae52f 100644
--- a/htdocs/core/lib/functions_ch.lib.php
+++ b/htdocs/core/lib/functions_ch.lib.php
@@ -156,14 +156,14 @@ function dol_ch_controle_bvrb($bvrb)
 	// Clean data
 	$bv = str_replace(' ', '', $bvrb);
 
-	// Make control
+	// Check (verify/validate)
 	$report = 0;
 	while (dol_strlen($bv) > 1) {
 		$match = substr($bv, 0, 1);
 		$report = $tableau[$report][$match];
 		$bv = substr($bv, 1);
 	}
-	$controle = $tableau[$report][10];
+	$check = $tableau[$report][10];
 
-	return ($controle == $bv);
+	return ($check == $bv);
 }
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 5dc4bc5b1a1..ab6d878809b 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -30,7 +30,7 @@
  *
  * @param	string	  $url 				    URL to call.
  * @param	string    $postorget		    'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
- * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with $postorget='PUTALREADYFORMATED'
+ * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formatted content with $postorget='PUTALREADYFORMATED'
  * @param	integer   $followlocation		0=Do not follow, 1=Follow location.
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)
@@ -69,7 +69,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	}
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
 
-	// By default use tls decied by PHP.
+	// By default use the TLS version decided by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
 	if (getDolGlobalString('MAIN_CURL_SSLVERSION')) {
 		curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
@@ -239,11 +239,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 	dol_syslog("getURLContent request=".$request);
 	if (getDolGlobalInt('MAIN_CURL_DEBUG')) {
-		// This may contains binary data, so we dont output reponse by default.
+		// This may contains binary data, so we don't output response by default.
 		dol_syslog("getURLContent request=".$request, LOG_DEBUG, 0, '_curl');
 		dol_syslog("getURLContent response =".$response, LOG_DEBUG, 0, '_curl');
 	}
-	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we don't output it
 
 	$rep = array();
 	if (curl_errno($ch)) {
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index eb0ca243c90..76361b759c4 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -23,7 +23,7 @@
  */
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @param	Object	$object         Holiday
  *  @return array           		head
@@ -74,7 +74,7 @@ function holiday_prepare_head($object)
 
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @return array           		head
  */
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index 20f0f585426..a84123662b9 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -60,7 +60,7 @@ function establishment_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @return	array		head
  */
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index b1959900794..5dc10149a72 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -61,12 +61,10 @@ function getDefaultImageSizes()
  *      Return if a filename is file name of a supported image format
  *
  *      @param	int		$acceptsvg	0=Default (depends on setup), 1=Always accept SVG as image files
- *      @return string				Return list fo image format
+ *      @return string				Return list of image formats
  */
 function getListOfPossibleImageExt($acceptsvg = 0)
 {
-	global $conf;
-
 	$regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php
 	if ($acceptsvg || getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES')) {
 		$regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript
@@ -123,7 +121,7 @@ function image_format_supported($file, $acceptsvg = 0)
 	}
 	if ($imgfonction) {
 		if (!function_exists($imgfonction)) {
-			// Fonctions of conversion not available in this PHP
+			// Functions of conversion not available in this PHP
 			return 0;
 		}
 
@@ -199,7 +197,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
 	} elseif (!file_exists($file)) {
-		// Si le fichier passe en parametre n'existe pas
+		// Si le fichier passe en parameter n'existe pas
 		return $langs->trans("ErrorFileNotFound", $file);
 	} elseif (image_format_supported($file) < 0) {
 		return 'This filename '.$file.' does not seem to be an image filename.';
@@ -255,7 +253,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 	if ($imgfonction) {
 		if (!function_exists($imgfonction)) {
-			// Fonctions de conversion non presente dans ce PHP
+			// Functions de conversion non presente dans ce PHP
 			return 'Read of image not possible. This PHP does not support GD functions '.$imgfonction;
 		}
 	}
@@ -283,7 +281,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		}
 		if ($imgfonction) {
 			if (!function_exists($imgfonction)) {
-				// Fonctions de conversion non presente dans ce PHP
+				// Functions de conversion non presente dans ce PHP
 				return 'Write of image not possible. This PHP does not support GD functions '.$imgfonction;
 			}
 		}
@@ -335,7 +333,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	$trans_colour = -1;	// By default, undefined
 	switch ($newExt) {
 		case 'gif':	// Gif
-			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
+			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // The method is different for the GIF format
 			imagecolortransparent($imgTarget, $trans_colour);
 			break;
 		case 'jpg':	// Jpg
@@ -343,7 +341,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
 		case 'png':	// Png
-			imagealphablending($imgTarget, false); // Pour compatibilite sur certain systeme
+			imagealphablending($imgTarget, false); // For compatibility with certain systems
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127); // Keep transparent channel
 			break;
 		case 'bmp':	// Bmp
@@ -453,7 +451,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 					if ($infoImg[2] === IMAGETYPE_PNG) { // In fact there is no exif on PNG but just in case
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
-						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
+						$img = imagerotate($img, $deg, imagecolorallocatealpha($img, 0, 0, 0, 127));
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
 					} else {
@@ -665,7 +663,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		if ($infoImg[2] === 'IMAGETYPE_PNG') { // In fact there is no exif on PNG but just in case
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
-			$rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127));
+			$rotated = imagerotate($img, $exifAngle, imagecolorallocatealpha($img, 0, 0, 0, 127));
 			imagealphablending($rotated, false);
 			imagesavealpha($rotated, true);
 		} else {
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index 96ad79f03e6..371bc6ed7c1 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -22,7 +22,7 @@
 
 /**
  *  \file       htdocs/core/lib/import.lib.php
- *  \brief      Ensemble de fonctions de base pour le module import
+ *  \brief      Ensemble de functions de base pour le module import
  *  \ingroup    import
  */
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 5f4a4527a03..9a21f14c45c 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -160,7 +160,7 @@ function facture_prepare_head($object)
 }
 
 /**
- * Return array head with list of tabs to view object informations.
+ * Return array head with list of tabs to view object information.
  *
  * @return array head array with tabs
  */
@@ -243,7 +243,7 @@ function invoice_admin_prepare_head()
 
 
 /**
- * Return array head with list of tabs to view object informations.
+ * Return array head with list of tabs to view object information.
  *
  * @param   Facture     $object     Invoice object
  * @return array                    head array with tabs
@@ -306,7 +306,7 @@ function invoice_rec_prepare_head($object)
 }
 
 /**
- * Return array head with list of tabs to view object informations.
+ * Return array head with list of tabs to view object information.
  *
  * @param   Facture     $object     Invoice object
  * @return array                    head array with tabs
@@ -981,7 +981,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
  *
  * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
  * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices
+ * @return	string				A HTML table that contains a list with open (unpaid) supplier invoices
  */
 function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 {
@@ -1169,7 +1169,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
  *
  * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
  * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices
+ * @return	string				A HTML table that contains a list with open (unpaid) supplier invoices
  */
 function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 {
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 382de7d61ab..c2a7fd730c1 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -115,7 +115,7 @@ function dol_json_encode($elements)
  * Return text according to type
  *
  * @param 	mixed	$val	Value to show
- * @return	string			Formated value
+ * @return	string			Formatted value
  */
 function _val($val)
 {
@@ -308,7 +308,7 @@ function dol_json_decode($json, $assoc = false)
  * Return text according to type
  *
  * @param   string  $val    Value to decode
- * @return  string          Formated value
+ * @return  string          Formatted value
  */
 function _unval($val)
 {
@@ -327,7 +327,7 @@ function _unval($val)
  *
  * Normally should be handled by mb_convert_encoding, but
  * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
+ * that lack the multibyte string extension.
  *
  * @param    string  $utf16		UTF-16 character
  * @return   string  			UTF-8 character
@@ -370,7 +370,7 @@ function utf162utf8($utf16)
  *
  * Normally should be handled by mb_convert_encoding, but
  * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
+ * that lack the multibyte string extension.
  *
  * @param    string  $utf8		UTF-8 character
  * @return   string  			UTF-16 character
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 08131124639..96d458f01c8 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -19,7 +19,7 @@
 
 /**
  * \file       htdocs/core/lib/ldap.lib.php
- * \brief      Ensemble de fonctions de base pour le module LDAP
+ * \brief      Ensemble de functions de base pour le module LDAP
  * \ingroup    ldap
  */
 
diff --git a/htdocs/core/lib/mailmanspip.lib.php b/htdocs/core/lib/mailmanspip.lib.php
index e3e81f25aeb..7ddc9b68615 100644
--- a/htdocs/core/lib/mailmanspip.lib.php
+++ b/htdocs/core/lib/mailmanspip.lib.php
@@ -18,11 +18,11 @@
 
 /**
  *	    \file       htdocs/core/lib/member.lib.php
- *		\brief      Ensemble de fonctions de base pour les adherents
+ *		\brief      Ensemble de functions de base pour les adherents
  */
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @return array Tabs of the module
  */
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 778379e84a2..8283de2dc75 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -25,7 +25,7 @@
  */
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @param	Adherent	$object		Member
  *  @return array					head
@@ -167,7 +167,7 @@ function member_prepare_head(Adherent $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @param	AdherentType	$object         Member
  *  @return array           		head
@@ -214,7 +214,7 @@ function member_type_prepare_head(AdherentType $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @return	array		head
  */
@@ -275,7 +275,7 @@ function member_admin_prepare_head()
 
 
 /**
- *  Return array head with list of tabs to view object stats informations
+ *  Return array head with list of tabs to view object stats information
  *
  *  @param	Adherent	$object         Member or null
  *  @return	array           		head
@@ -329,7 +329,7 @@ function member_stats_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @param	Subscription	$object		Subscription
  *  @return array						head
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 54b3bdeffd3..82f4c355738 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -219,7 +219,7 @@ function dol_getcache($memoryid)
 function dol_getshmopaddress($memoryid)
 {
 	global $shmkeys, $shmoffset;
-	if (empty($shmkeys[$memoryid])) {	// No room reserved for thid memoryid, no way to use cache
+	if (empty($shmkeys[$memoryid])) {	// No room reserved for this memoryid, no way to use cache
 		return 0;
 	}
 	return $shmkeys[$memoryid] + $shmoffset;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index ae0cc19193e..33505fec7ce 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -534,7 +534,7 @@ function compareFirstValue($a, $b)
  * @param array|null  $right           $right to update or add
  * @param string|null $objectname      name of object
  * @param string|null $module          name of module
- * @param int         $action          0 for delete, 1 for add, 2 for update, -1 when delete object completly, -2 for generate rights after add
+ * @param int         $action          0 for delete, 1 for add, 2 for update, -1 when delete object completely, -2 for generate rights after add
  * @return int                         1 if OK,-1 if KO
  */
 function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $module, $action)
@@ -610,7 +610,7 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 		$permissions = $perms_grouped;
 
 
-		// parcourir les objets
+		// parcourir les objects
 		$o=0;
 		foreach ($permissions as &$object) {
 			// récupérer la permission de l'objet
@@ -639,9 +639,9 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 			}
 		}
 		$rights_str = implode("", $rights);
-		// delete all permission from file
+		// delete all permissions from file
 		deletePerms($file);
-		// rewrite all permission again
+		// rewrite all permissions again
 		dolReplaceInFile($file, array('/* BEGIN MODULEBUILDER PERMISSIONS */' => '/* BEGIN MODULEBUILDER PERMISSIONS */'."\n\t\t".$rights_str));
 		return 1;
 	} else {
@@ -859,7 +859,7 @@ function getFromFile($file, $start, $end)
 function writePermsInAsciiDoc($file, $destfile)
 {
 	global $langs;
-	//search and get all permssion in stirng
+	//search and get all permissions in string
 	$start = '/* BEGIN MODULEBUILDER PERMISSIONS */';
 	$end = '/* END MODULEBUILDER PERMISSIONS */';
 	$content = getFromFile($file, $start, $end);
@@ -951,7 +951,7 @@ function addObjectsToApiFile($file, $objects, $modulename)
 	$varcomented = "@var MyObject \$myobject {@type MyObject}";
 	$constructObj = "\$this->myobject = new MyObject(\$this->db);";
 
-	// add properties and declare them in consturctor
+	// add properties and declare them in constructor
 	foreach ($content as $lineNumber => &$lineContent) {
 		if (strpos($lineContent, $varcomented) !== false) {
 			$lineContent = '';
@@ -995,7 +995,7 @@ function addObjectsToApiFile($file, $objects, $modulename)
 /**
  * Remove Object variables and methods from API_Module File
  * @param string   $file         file api module
- * @param string   $objectname   name of object whant to remove
+ * @param string   $objectname   name of object want to remove
  * @param string   $modulename   name of module
  * @return int                    1 if OK, -1 if KO
  */
@@ -1055,10 +1055,10 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 		return -1;
 	}
 	if ($action == 0 && !empty($key)) {
-		// delete menu manuelly
+		// delete menu manually
 		array_splice($menus, array_search($menus[$key], $menus), 1);
 	} elseif ($action == 1) {
-		// add menu manualy
+		// add menu manually
 		array_push($menus, $menuWantTo);
 	} elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) {
 		// update right from permissions array
@@ -1255,7 +1255,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 		}
 	}
 
-	// rewrite dictionnary if
+	// rewrite dictionary if
 	$dictionnaires['langs'] = $modulename.'@'.$modulename;
 	$dictionnaires['tabname'][] = strtolower($namedic);
 	$dictionnaires['tablib'][] = ucfirst(substr($namedic, 2));
@@ -1276,7 +1276,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 }
 
 /**
- * Generate Urls and add them to documentaion module
+ * Generate Urls and add them to documentation module
  *
  * @param string $file_api   filename or path of api
  * @param string $file_doc   filename or path of documentation
@@ -1315,9 +1315,9 @@ function writeApiUrlsInDoc($file_api, $file_doc)
 		$error++;
 	}
 
-	// buil format asciidoc for urls in table
+	// build format asciidoc for urls in table
 	if (!$error) {
-		$asciiDocTable = "[options=\"header\"]\n|===\n|Objet | URLs\n";
+		$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n";  // phpcs:ignore
 		foreach ($groupedUrls as $objectName => $urls) {
 			$urlsList = implode(" +\n*", $urls);
 			$asciiDocTable .= "|$objectName | \n*$urlsList +\n";
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 01effcb725d..2b39661e6e7 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -21,7 +21,7 @@
 
 /**
  *  \file       htdocs/core/lib/order.lib.php
- *  \brief      Ensemble de fonctions de base pour le module commande
+ *  \brief      Ensemble de functions de base pour le module commande
  *  \ingroup    commande
  */
 
@@ -171,7 +171,7 @@ function commande_prepare_head(Commande $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	    		    head array with tabs
  */
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 5e72271303e..428a88c9758 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -26,7 +26,7 @@
  *
  * @param	string	  $content			    MD content
  * @param   string    $parser               'parsedown' or 'nl2br'
- * @param   string    $replaceimagepath     Replace path to image with another path. Exemple: ('doc/'=>'xxx/aaa/')
+ * @param   string    $replaceimagepath     Replace path to image with another path. Example: ('doc/'=>'xxx/aaa/')
  * @return	string                          Parsed content
  */
 function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
@@ -36,7 +36,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 	//$content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1){:target="\2"}', $content);
 	$content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1)', $content);
 
-	// Replace HTML coments
+	// Replace HTML comments
 	$content = preg_replace('/<!--.*-->/Ums', '', $content);	// We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true.
 
 	if (is_array($replaceimagepath)) {
@@ -64,7 +64,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
  *
  * @param	string	  $content			    MD content
  * @param   string    $parser               'dolibarr'
- * @param   string    $replaceimagepath     Replace path to image with another path. Exemple: ('doc/'=>'xxx/aaa/')
+ * @param   string    $replaceimagepath     Replace path to image with another path. Example: ('doc/'=>'xxx/aaa/')
  * @return	string                          Parsed content
  */
 function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null)
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index ecb2aecc83d..13f7289a478 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -230,7 +230,7 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = 0)
 /**
  * Return string with full Url
  *
- * @param   int			$mode		      0=True url, 1=Url formated with colors
+ * @param   int			$mode		      0=True url, 1=Url formatted with colors
  * @param   string		$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)
  * @param	string		$ref		      Ref of object
  * @param	int|float	$amount		      Amount of money to request for
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index eb1e08ea01a..1719172b40e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -40,7 +40,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
@@ -332,7 +332,7 @@ function pdf_getHeightForLogo($logo, $url = false)
  * Function to try to calculate height of a HTML Content
  *
  * @param 	TCPDF     $pdf				PDF initialized object
- * @param 	string    $htmlcontent		HTML Contect
+ * @param 	string    $htmlcontent		HTML Content
  * @return 	int							Height
  * @see getStringHeight()
  */
@@ -421,7 +421,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 
 
 /**
- *   	Return a string with full address formated for output on documents
+ *   	Return a string with full address formatted for output on documents
  *
  * 		@param	Translate	          $outputlangs		    Output langs object
  *   	@param  Societe		          $sourcecompany		Source company object
@@ -822,7 +822,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 
 
 /**
- *  Show bank informations for PDF generation
+ *  Show bank information for PDF generation
  *
  *  @param	TCPDF			$pdf            		Object PDF
  *  @param  Translate	$outputlangs     		Object lang
@@ -871,7 +871,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 			$cury += 3;
 		}
 
-		if (!getDolGlobalString('PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN')) {    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+		if (!getDolGlobalString('PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN')) {    // Note that some countries still need bank number, BIC/IBAN not enough for them
 			// Note:
 			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
 			// desk = code guichet (FR), used only when $usedetailedbban = 1
@@ -1004,10 +1004,10 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
  * 	@param	int			$marge_gauche	Margin left (no more used)
  * 	@param	int			$page_hauteur	Page height
  * 	@param	Object		$object			Object shown in PDF
- * 	@param	int			$showdetails	Show company adress details into footer (0=Nothing, 1=Show address, 2=Show managers, 3=Both)
+ * 	@param	int			$showdetails	Show company address details into footer (0=Nothing, 1=Show address, 2=Show managers, 3=Both)
  *  @param	int			$hidefreetext	1=Hide free text, 0=Show free text
  *  @param	int			$page_largeur	Page width
- *  @param	int			$watermark		Watermark text to print on page
+ *  @param	string		$watermark		Watermark text to print on page
  * 	@return	int							Return height of bottom margin including footer text
  */
 function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0, $page_largeur = 0, $watermark = '')
@@ -1351,14 +1351,16 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		}
 	}
 	// Show page nb only on iso languages (so default Helvetica font)
-	// if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
 	$pdf->SetXY($dims['wk'] - $dims['rm'] - 18 - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_X', 0), -$posy - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_Y', 0));
-	// $pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
-	// $pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0); // doesn't works with all fonts
-	// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
-	$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();
+
+	if (getDolGlobalString('PDF_USE_GETALIASNBPAGE_FOR_TOTAL')) {
+		// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); 	// works with $pdf->Cell
+		$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();	// seems to not works with all fonts like ru_UK
+	} else {
+		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();		// seems to always work even with $pdf->Cell. But some users has reported wrong nb (no way to reproduce)
+	}
+
 	$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
-	// }
 
 	//  Show Draft Watermark
 	if (!empty($watermark)) {
@@ -1539,7 +1541,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		// Description short of product line
 		$libelleproduitservice = $label;
 		if (!empty($libelleproduitservice) && getDolGlobalString('PDF_BOLD_PRODUCT_LABEL')) {
-			// Adding <b> may convert the original string into a HTML string. Sowe have to first
+			// Adding <b> may convert the original string into a HTML string. So we have to first
 			// convert \n into <br> we text is not already HTML.
 			if (!dol_textishtml($libelleproduitservice)) {
 				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
@@ -2212,12 +2214,11 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  *  @return	string							Value for unit cell
  */
-function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
+function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0)
 {
-	global $langs;
+	global $hookmanager, $langs;
 
 	$reshook = 0;
 	$result = '';
@@ -2473,7 +2474,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 
 	foreach ($object->linkedObjects as $objecttype => $objects) {
 		if ($objecttype == 'facture') {
-			// For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
+			// For invoice, we don't want to have a reference line on document. Image we are using recurring invoice, we will have a line longer than document width.
 		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal') {
 			$outputlangs->load('propal');
 
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
index 7d19730674e..f856ac71c90 100644
--- a/htdocs/core/lib/phpsessionindb.lib.php
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -28,7 +28,7 @@
 // - create table ll_session from the llx_session-disabled.sql file
 // - uncomment the include DOL_DOCUMENT_ROOT.'/core/lib/phpsessionindb.inc.php into main.inc.php
 // - in your PHP.ini, set:  session.save_handler = user
-// The session_set_save_handler() at end of this fille will replace default session management.
+// The session_set_save_handler() at end of this file will replace default session management.
 
 
 /**
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index ce1b9c4e584..4f20d697c60 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/core/lib/prelevement.lib.php
- *	\brief      Ensemble de fonctions de base pour le module prelevement
+ *	\brief      Ensemble de functions de base pour le module prelevement
  *	\ingroup    propal
  */
 
@@ -117,7 +117,7 @@ function prelevement_check_config($type = 'direct-debit')
 }
 
 	/**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @param	BonPrelevement	$object         	Member
  *  @param  int     		$nbOfInvoices   	No of invoices
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 76c00e877e1..12b22ed33a4 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -44,7 +44,7 @@
  *		@param  float	$uselocaltax2_rate          0=do not use localtax2, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.
  *		@param 	float	$remise_percent_global		0
  *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
- *		@param	int		$info_bits					Miscellaneous informations on line
+ *		@param	int		$info_bits					Miscellaneous information on line
  *		@param	int		$type						0/1=Product/service
  *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array	$localtaxes_array			Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
@@ -277,33 +277,33 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		// We work to define prices using the price without tax
 		$result[6] = price2num($tot_sans_remise, 'MT');
 		$result[8] = price2num($tot_sans_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[0], 'MT'); // Selon TVA NPR ou non
-		$result8bis = price2num($tot_sans_remise * (1 + ($txtva / 100)) + $localtaxes[0], 'MT'); // Si TVA consideree normale (non NPR)
+		$result8bis = price2num($tot_sans_remise * (1 + ($txtva / 100)) + $localtaxes[0], 'MT'); // Si TVA consideree normal (non NPR)
 		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
 
 		$result[0] = price2num($tot_avec_remise, 'MT');
 		$result[2] = price2num($tot_avec_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[1], 'MT'); // Selon TVA NPR ou non
-		$result2bis = price2num($tot_avec_remise * (1 + ($txtva / 100)) + $localtaxes[1], 'MT'); // Si TVA consideree normale (non NPR)
+		$result2bis = price2num($tot_avec_remise * (1 + ($txtva / 100)) + $localtaxes[1], 'MT'); // Si TVA consideree normal (non NPR)
 		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[3] = price2num($pu, 'MU');
 		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
-		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
+		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normal (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
 	} else {
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
 		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
-		$result6bis = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
+		$result6bis = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normal (non NPR)
 		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
 
 		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
 		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
-		$result0bis = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
+		$result0bis = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normal (non NPR)
 		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[5] = price2num($pu + $localtaxes[2], 'MU');
 		$result[3] = price2num($pu / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MU'); // Selon TVA NPR ou non
-		$result3bis = price2num($pu / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
+		$result3bis = price2num($pu / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normal (non NPR)
 		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
 	}
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a2e42cde0c9..d0de3ba385a 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -23,7 +23,7 @@
 
 /**
  * \file       htdocs/core/lib/product.lib.php
- * \brief      Ensemble de fonctions de base pour le module produit et service
+ * \brief      Ensemble de functions de base pour le module produit et service
  * \ingroup	product
  */
 
@@ -313,7 +313,7 @@ function productlot_prepare_head($object)
 
 
 /**
-*  Return array head with list of tabs to view object informations.
+*  Return array head with list of tabs to view object information.
 *
 *  @return	array   	        head array with tabs
 */
@@ -374,7 +374,7 @@ function product_admin_prepare_head()
 
 
 /**
- * Return array head with list of tabs to view object informations.
+ * Return array head with list of tabs to view object information.
  *
  * @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/profid.lib.php b/htdocs/core/lib/profid.lib.php
index a2610078a7f..de4f5c70403 100644
--- a/htdocs/core/lib/profid.lib.php
+++ b/htdocs/core/lib/profid.lib.php
@@ -24,7 +24,7 @@
 
 
 /**
- *  Check if a string passes the Luhn agorithm test.
+ *  Check if a string passes the Luhn algorithm test.
  *  @param		string|int		$str		string to check
  *  @return		bool						True if the string passes the Luhn algorithm check, False otherwise
  *  @since		Dolibarr V20
@@ -97,3 +97,150 @@ function isValidSiret($siret)
 		return false;
 	}
 }
+
+
+/**
+ *  Check the syntax validity of a Portuguese (PT) Tax Identification Number (TIN).
+ *  (NIF = Número de Identificação Fiscal)
+ *
+ *  @param		string		$str		NIF to check
+ *  @return		boolean					True if valid, False otherwise
+ *  @since		Dolibarr V20
+ */
+function isValidTinForPT($str)
+{
+	$str = trim($str);
+	$str = preg_replace('/(\s)/', '', $str);
+
+	if (preg_match('/(^[0-9]{9}$)/', $str)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+/**
+ *  Check the syntax validity of an Algerian (DZ) Tax Identification Number (TIN).
+ *  (NIF = Numéro d'Identification Fiscale)
+ *
+ *  @param		string		$str		TIN to check
+ *  @return		boolean					True if valid, False otherwise
+ *  @since		Dolibarr V20
+ */
+function isValidTinForDZ($str)
+{
+	$str = trim($str);
+	$str = preg_replace('/(\s)/', '', $str);
+
+	if (preg_match('/(^[0-9]{15}$)/', $str)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+/**
+ *  Check the syntax validity of a Belgium (BE) Tax Identification Number (TIN).
+ *  (NN = Numéro National)
+ *
+ *  @param		string		$str		NN to check
+ *  @return		boolean					True if valid, False otherwise
+ *  @since		Dolibarr V20
+ */
+function isValidTinForBE($str)
+{
+	// https://economie.fgov.be/fr/themes/entreprises/banque-carrefour-des/actualites/structure-du-numero
+	$str = trim($str);
+	$str = preg_replace('/(\s)/', '', $str);
+
+	if (preg_match('/(^[0-9]{4}\.[0-9]{3}\.[0-9]{3}$)/', $str)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+/**
+ *  Check the syntax validity of a Spanish (ES) Tax Identification Number (TIN), where:
+ *  - NIF = Número de Identificación Fiscal
+ *  - CIF = Código de Identificación Fiscal
+ *  - NIE = Número de Identidad de Extranjero
+ *
+ *  @param		string		$str		TIN to check
+ *  @return		int						1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
+ *  @since		Dolibarr V20
+ */
+function isValidTinForES($str)
+{
+	$str = trim($str);
+	$str = preg_replace('/(\s)/', '', $str);
+	$str = strtoupper($str);
+
+	//Check format
+	if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $str)) {
+		return 0;
+	}
+
+	$num = array();
+	for ($i = 0; $i < 9; $i++) {
+		$num[$i] = substr($str, $i, 1);
+	}
+
+	//Check NIF
+	if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $str)) {
+		if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($str, 0, 8) % 23, 1)) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+
+	//algorithm checking type code CIF
+	$sum = $num[2] + $num[4] + $num[6];
+	for ($i = 1; $i < 8; $i += 2) {
+		$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+	}
+	$n = 10 - substr($sum, strlen($sum) - 1, 1);
+
+	//Check special NIF
+	if (preg_match('/^[KLM]{1}/', $str)) {
+		if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($str, 1, 8) % 23, 1)) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+
+	//Check CIF
+	if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $str)) {
+		if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1)) {
+			return 2;
+		} else {
+			return -2;
+		}
+	}
+
+	//Check NIE T
+	if (preg_match('/^[T]{1}/', $str)) {
+		if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $str)) {
+			return 3;
+		} else {
+			return -3;
+		}
+	}
+
+	//Check NIE XYZ
+	if (preg_match('/^[XYZ]{1}/', $str)) {
+		if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $str), 0, 8) % 23, 1)) {
+			return 3;
+		} else {
+			return -3;
+		}
+	}
+
+	//Can not be verified
+	return -4;
+}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index fcf4c865a2a..6afc152a83f 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -593,7 +593,7 @@ function project_admin_prepare_head()
  * @param   int         $projectidfortotallink  0 or Id of project to use on total line (link to see all time consumed for project)
  * @param   string      $dummy					Not used.
  * @param   int         $showbilltime           Add the column 'TimeToBill' and 'TimeBilled'
- * @param   array       $arrayfields            Array with displayed coloumn information
+ * @param   array       $arrayfields            Array with displayed column information
  * @param   array       $arrayofselected        Array with selected fields
  * @return	int									Nb of tasks shown
  */
@@ -625,12 +625,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 	for ($i = 0; $i < $numlines; $i++) {
 		if ($parent == 0 && $level >= 0) {
-			$level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
+			$level = 0; // if $level = -1, we don't use sublevel recursion, we show all lines
 		}
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
-		if ($lines[$i]->fk_task_parent == $parent || $level < 0) {       // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($lines[$i]->fk_task_parent == $parent || $level < 0) {       // if $level = -1, we don't use sublevel recursion, we show all lines
 			// Show task line.
 			$showline = 1;
 			$showlineingray = 0;
@@ -656,8 +656,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					// User is not allowed on this project and project is not public, so we hide line
 					if (!in_array($lines[$i]->fk_project, $projectsArrayId)) {
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
-						// because assignement on task can be done only on contact of project.
-						// If assignement was done and after, was removed from contact of project, then we can hide the line.
+						// because assignment on task can be done only on contact of project.
+						// If assignment was done and after, was removed from contact of project, then we can hide the line.
 						$showline = 0;
 					}
 				}
@@ -1031,7 +1031,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			$totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
 			$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
 
-			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			// this conf is actually hidden, by default we use 10% for "be careful or warning"
 			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
 			// define progress color according to time spend vs workload
@@ -1141,7 +1141,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 
 /**
- * Output a task line into a pertime intput mode
+ * Output a task line into a pertime input mode
  *
  * @param	string	   	$inc					Line number (start to 0, then increased by recursive call)
  * @param   string		$parent					Id of parent task to show (0 to show all)
@@ -1155,7 +1155,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  * @param	int			$preselectedday			Preselected day
  * @param   array       $isavailable			Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
- * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
 function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
@@ -1362,7 +1362,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 
 
 /**
- * Output a task line into a pertime intput mode
+ * Output a task line into a pertime input mode
  *
  * @param	string	   	$inc					Line number (start to 0, then increased by recursive call)
  * @param   string		$parent					Id of parent task to show (0 to show all)
@@ -1378,7 +1378,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @param	array		$arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
- * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
 function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null)
 {
@@ -1759,7 +1759,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 
 /**
- * Output a task line into a perday intput mode
+ * Output a task line into a perday input mode
  *
  * @param	string	   	$inc					Line output identificator (start to 0, then increased by recursive call)
  * @param	int			$firstdaytoshow			First day to show
@@ -1775,7 +1775,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @param	array		$arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
- * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
 function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null)
 {
@@ -2157,7 +2157,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 }
 
 /**
- * Output a task line into a perday intput mode
+ * Output a task line into a perday input mode
  *
  * @param	string	   	$inc					Line output identificator (start to 0, then increased by recursive call)
  * @param	int			$firstdaytoshow			First day to show
@@ -2172,7 +2172,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
  * @param   array       $isavailable			Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @param	array		$TWeek					Array of week numbers
- * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
 function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $TWeek = array())
 {
@@ -2826,8 +2826,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 /**
  * @param   Task        $task               the task object
- * @param   bool|string $label              true = auto, false = dont display, string = replace output
- * @param   bool|string $progressNumber     true = auto, false = dont display, string = replace output
+ * @param   bool|string $label              true = auto, false = don't display, string = replace output
+ * @param   bool|string $progressNumber     true = auto, false = don't display, string = replace output
  * @param   bool        $hideOnProgressNull hide if progress is null
  * @param   bool        $spaced             used to add space at bottom (made by css)
  * @return string
@@ -2862,7 +2862,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 	if ($task->planned_workload) {
 		$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);
 
-		// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+		// this conf is actually hidden, by default we use 10% for "be careful or warning"
 		$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
 		$diffTitle = '<br>'.$langs->trans('ProgressDeclared').' : '.$task->progress.(isset($task->progress) ? '%' : '');
@@ -2979,7 +2979,7 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 		if ($task->planned_workload) {
 			$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);
 
-			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			// this conf is actually hidden, by default we use 10% for "be careful or warning"
 			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
 			if ((float) $progressCalculated > (float) ($task->progress * $warningRatio)) {
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 681ebe94eef..f311fc57967 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -19,7 +19,7 @@
 
 /**
  * \file       htdocs/core/lib/propal.lib.php
- * \brief      Ensemble de fonctions de base pour le module propal
+ * \brief      Ensemble de functions de base pour le module propal
  * \ingroup    propal
  */
 
@@ -151,7 +151,7 @@ function propal_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index a2598b65091..2dce74e6a11 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -111,7 +111,7 @@ function reception_prepare_head(Reception $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	    		    head array with tabs
  */
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index b8210bd65a3..6038510a7fa 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -96,7 +96,7 @@ function salaries_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ *  Return array head with list of tabs to view object information
  *
  *  @return	array		head
  */
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index ff149b232db..420867a1015 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -107,7 +107,7 @@ function dolGetRandomBytes($length)
 }
 
 /**
- *	Encode a string with a symetric encryption. Used to encrypt sensitive data into database.
+ *	Encode a string with a symmetric encryption. Used to encrypt sensitive data into database.
  *  Note: If a backup is restored onto another instance with a different $conf->file->instance_unique_id, then decoded value will differ.
  *  This function is called for example by dol_set_const() when saving a sensible data into database configuration table llx_const.
  *
@@ -169,7 +169,7 @@ function dolEncrypt($chain, $key = '', $ciphering = 'AES-256-CTR', $forceseed =
 }
 
 /**
- *	Decode a string with a symetric encryption. Used to decrypt sensitive data saved into database.
+ *	Decode a string with a symmetric encryption. Used to decrypt sensitive data saved into database.
  *  Note: If a backup is restored onto another instance with a different $conf->file->instance_unique_id, then decoded value will differ.
  *
  *	@param   string		$chain		string to decode
@@ -223,8 +223,8 @@ function dolDecrypt($chain, $key = '')
 
 /**
  * 	Returns a hash (non reversible encryption) of a string.
- *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommanded value is 'password_hash')
- *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
+ *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommended value is 'password_hash')
+ *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorithm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
  * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash).
@@ -357,7 +357,7 @@ function dolGetLdapPasswordHash($password, $type = 'md5')
  *  @param  string				$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional). Can use '' if NA.
  *  @param  string				$dbt_select     Field rowid name, for select into tableandshare if not "rowid". Not used if objectid is null (optional)
  *  @param	int					$isdraft		1=The object with id=$objectid is a draft
- *  @param	int					$mode			Mode (0=default, 1=return without dieing)
+ *  @param	int					$mode			Mode (0=default, 1=return without dying)
  * 	@return	int									If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.
  *  @see dol_check_secure_access_document(), checkUserAccessToObject()
  */
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3405ba614e6..0261b43d547 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -45,7 +45,7 @@ function dol_getwebuser($mode)
 }
 
 /**
- *  Return a login if login/pass was successfull
+ *  Return a login if login/pass was successful
  *
  *	@param		string	$usertotest			Login value to test
  *	@param		string	$passwordtotest		Password value to test
@@ -97,7 +97,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 					$function = 'check_user_password_'.$mode;
 					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
 					if ($login && $login != '--bad-login-validity--') {
-						// Login is successfull with this method
+						// Login is successful with this method
 						$test = false; // To stop once at first login success
 						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
 						/*$dol_tz = GETPOST('tz');
@@ -479,7 +479,7 @@ function encodedecode_dbpassconf($level = 0)
  * Return a generated password using default module
  *
  * @param		boolean		$generic				true=Create generic password (32 chars/numbers), false=Use the configured password generation module
- * @param		array		$replaceambiguouschars	Discard ambigous characters. For example array('I').
+ * @param		array		$replaceambiguouschars	Discard ambiguous characters. For example array('I').
  * @param       int         $length                 Length of random string (Used only if $generic is true)
  * @return		string		    					New value for password
  * @see dol_hash(), dolJSToSetRandomPassword()
@@ -562,7 +562,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 }
 
 /**
- * Ouput javacript to autoset a generated password using default module into a HTML element.
+ * Output javascript to autoset a generated password using default module into a HTML element.
  *
  * @param		string 		$htmlname			HTML name of element to insert key into
  * @param		string		$htmlnameofbutton	HTML name of button
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index b072c3e51fd..eecef7aaaec 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -406,7 +406,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					print '</td>';
 				}
 
-				// Batch number managment
+				// Batch number management
 				/*TODO Add link to expeditiondet_batch
 				if (!empty($conf->productbatch->enabled))
 				{
@@ -438,7 +438,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					}
 				}*/
 
-				// Informations on receipt
+				// Information on receipt
 				if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
 					include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 					$expedition->fetchObjectLinked($expedition->id, $expedition->element);
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index a41df25a9d2..0290ec78080 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -52,7 +52,7 @@ function showOnlineSignatureUrl($type, $ref, $obj = null)
 /**
  * Return string with full Url
  *
- * @param   int				$mode				0=True url, 1=Url formated with colors
+ * @param   int				$mode				0=True url, 1=Url formatted with colors
  * @param   string			$type				Type of URL ('proposal', ...)
  * @param	string			$ref				Ref of object
  * @param   int     		$localorexternal  	0=Url for browser, 1=Url for external access
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index d397ff26311..9b790c39558 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -56,8 +56,8 @@ function stock_prepare_head($object)
 	/* Disabled because will never be implemented. Table always empty.
 	if (!empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
 	{
-		// Should not be enabled by defaut because does not work yet correctly because
-		// personnal stocks are not tagged into table llx_entrepot
+		// Should not be enabled by default because does not work yet correctly because
+		// personal stocks are not tagged into table llx_entrepot
 		$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Users");
 		$head[$h][2] = 'user';
@@ -84,7 +84,7 @@ function stock_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index dccdee72072..f1d0793e5cb 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/core/lib/propal.lib.php
- *	\brief      Ensemble de fonctions de base pour le module propal
+ *	\brief      Ensemble de functions de base pour le module propal
  *	\ingroup    propal
  */
 
@@ -105,7 +105,7 @@ function supplier_proposal_prepare_head($object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations.
+ *  Return array head with list of tabs to view object information.
  *
  *  @return	array   	        head array with tabs
  */
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index b9da77dc6f7..0a353042113 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -107,7 +107,7 @@ function tax_prepare_head(ChargeSociales $object)
  *  @param  string	$direction   	'sell' or 'buy'
  *  @param  int		$m				Month
  *  @param  int		$q           	Quarter
- *  @return array|int               Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developped, -3 if error
+ *  @return array|int               Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developed, -3 if error
  */
 function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0)
 {
@@ -696,7 +696,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
  *  @param  int		$modetax     	Not used
  *  @param  int		$direction   	'sell' (customer invoice) or 'buy' (supplier invoices)
  *  @param  int		$m           	Month
- *  @return array|int               Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developped, -3 if error
+ *  @return array|int               Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developed, -3 if error
  */
 function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m = 0)
 {
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 3745eddf513..019a3e24eb6 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
  * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
- * Copyright (C) 2019-2022  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@netlogic.fr>
  *
  * 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
@@ -213,7 +213,7 @@ function generate_random_id($car = 16)
  * @param  array  $arrayofcss  Array of complementary css files
  * @return void
  */
-function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index d679d230566..b12b8e28d3c 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -106,7 +106,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
  *  @param  array   $pere   					Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
  *  @param  int	    $rang   					Level of element
  *  @param	string	$iddivjstree				Id to use for parent ul element
- *  @param  int     $donoresetalreadyloaded     Do not reset global array $donoresetalreadyloaded used to avoid to go down on an aleady processed record
+ *  @param  int     $donoresetalreadyloaded     Do not reset global array $donoresetalreadyloaded used to avoid to go down on an already processed record
  *  @param  int     $showfk         			1=show fk_links to parent into label  (used by menu editor only)
  *  @param	string	$moreparam					Add more param on url of elements
  *  @return	void
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index cdc7360fbf8..31ed60ad716 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -18,7 +18,7 @@
 
 /**
  *	    \file       htdocs/core/lib/trip.lib.php
- *		\brief      Ensemble de fonctions de base pour les deplacements
+ *		\brief      Ensemble de functions de base pour les deplacements
  */
 
 /**
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 5f0bfd8915d..bc9400e0476 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -108,7 +108,7 @@ function dolKeepOnlyPhpCode($str)
 
 /**
  * Convert a page content to have correct links (based on DOL_URL_ROOT) into an html content. It replaces also dynamic content with '...php...'
- * Used to ouput the page on the Preview from backoffice.
+ * Used to output the page on the Preview from backoffice.
  *
  * @param	Website		$website			Web site object
  * @param	string		$content			Content to replace
@@ -271,7 +271,7 @@ function dolReplaceSmileyCodeWithUTF8($content)
 
 /**
  * Render a string of an HTML content and output it.
- * Used to ouput the page when viewed from a server (Dolibarr or Apache).
+ * Used to output the page when viewed from a server (Dolibarr or Apache).
  *
  * @param   string  $content    	Content string
  * @param	string	$contenttype	Content type
@@ -637,7 +637,7 @@ function includeContainer($containerref)
  */
 function getStructuredData($type, $data = array())
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs; // Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs; // Very important. Required to have var available when running included containers.
 
 	$type = strtolower($type);
 
@@ -842,7 +842,7 @@ function getStructuredData($type, $data = array())
  */
 function getSocialNetworkHeaderCards($params = null)
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 
 	$out = '';
 
@@ -916,7 +916,7 @@ function getSocialNetworkHeaderCards($params = null)
  */
 function getSocialNetworkSharingLinks()
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 
 	$out = '<!-- section for social network sharing of page -->'."\n";
 
@@ -968,6 +968,107 @@ function getSocialNetworkSharingLinks()
 	return $out;
 }
 
+
+/**
+ * Return HTML content to add structured data for an article, news or Blog Post.
+ *
+ * @param	Object	$object			Object
+ * @return  string					HTML img content or '' if no image found
+ * @see getImagePublicURLOfObject()
+ */
+function getNbOfImagePublicURLOfObject($object)
+{
+	global $db;
+
+	$nb = 0;
+
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	$regexforimg = getListOfPossibleImageExt(0);
+	$regexforimg = '('.$regexforimg.')$';
+
+	$sql = "SELECT COUNT(rowid) as nb";
+	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
+	$sql .= " WHERE entity IN (".getEntity($object->element).")";
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
+	$sql .= " AND share IS NOT NULL";	// Only image that are public
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			$nb = $obj->nb;
+		}
+	}
+
+	return $nb;
+}
+
+/**
+ * Return HTML content to add structured data for an article, news or Blog Post.
+ *
+ * @param	Object	$object			Object
+ * @param	int		$no				Numero of image (if there is several images. 1st one by default)
+ * @param   string  $extName        Extension to differentiate thumb file name ('', '_small', '_mini')
+ * @return  string					HTML img content or '' if no image found
+ * @see getNbOfImagePublicURLOfObject()
+ */
+function getImagePublicURLOfObject($object, $no = 1, $extName = '')
+{
+	global $db;
+
+	$image_path = '';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	$regexforimg = getListOfPossibleImageExt(0);
+	$regexforimg = '('.$regexforimg.')$';
+
+	$sql = "SELECT rowid, ref, share, filename, cover, position";
+	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
+	$sql .= " WHERE entity IN (".getEntity($object->element).")";
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
+	$sql .= $db->order("cover,position,rowid", "ASC,ASC,ASC");
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		$found = 0;
+		$foundnotshared = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				if (empty($obj->share)) {
+					$foundnotshared++;
+				} else {
+					$found++;
+
+					$image_path = DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($obj->share);
+					if ($extName) {
+						//getImageFileNameForSize($dir.$file, '_small')
+						$image_path .= '&extname='.urlencode($extName);
+					}
+				}
+			}
+			if ($found >= $no) {
+				break;
+			}
+			$i++;
+		}
+		if (!$found && $foundnotshared) {
+			$image_path = DOL_URL_ROOT.'/viewimage.php?modulepart=common&file=nophotopublic.png';
+		}
+	}
+
+	if (empty($image_path)) {
+		$image_path = DOL_URL_ROOT.'/viewimage.php?modulepart=common&file=nophoto.png';
+	}
+
+	return $image_path;
+}
+
+
 /**
  * Return list of containers object that match a criteria.
  * WARNING: This function can be used by websites.
@@ -985,7 +1086,7 @@ function getSocialNetworkSharingLinks()
  */
 function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null', $status = 1)
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 
 	$error = 0;
 	$arrayresult = array('code'=>'', 'list'=>array());
@@ -1140,7 +1241,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
  *
  * @param 	Website	 	$object			Object website
  * @param 	WebsitePage	$objectpage		Object website page
- * @param 	string		$urltograb		URL to grab (exemple: http://www.nltechno.com/ or http://www.nltechno.com/dir1/ or http://www.nltechno.com/dir1/mapage1)
+ * @param 	string		$urltograb		URL to grab (example: http://www.nltechno.com/ or http://www.nltechno.com/dir1/ or http://www.nltechno.com/dir1/mapage1)
  * @param 	string		$tmp			Content to parse
  * @param 	string		$action			Var $action
  * @param	string		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
@@ -1214,7 +1315,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
 				} else {
-					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
+					$alreadygrabbed[$urltograbbis] = 1; // Track that file was already grabbed.
 
 					dol_mkdir(dirname($filetosave));
 
@@ -1283,7 +1384,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
 				} else {
-					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
+					$alreadygrabbed[$urltograbbis] = 1; // Track that file was already grabbed.
 
 					dol_mkdir(dirname($filetosave));
 
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 8767a8a227c..639fbba277c 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -651,8 +651,8 @@ function showWebsiteTemplates(Website $website)
  * - Block if bad code in the new string.
  * - Block also if user has no permission to change PHP code.
  *
- * @param	string		$phpfullcodestringold		PHP old string. For exemple "<?php echo 'a' ?><php echo 'b' ?>"
- * @param	string		$phpfullcodestring			PHP new string. For exemple "<?php echo 'a' ?><php echo 'c' ?>"
+ * @param	string		$phpfullcodestringold		PHP old string. For example "<?php echo 'a' ?><php echo 'b' ?>"
+ * @param	string		$phpfullcodestring			PHP new string. For example "<?php echo 'a' ?><php echo 'c' ?>"
  * @return	int										Error or not
  * @see dolKeepOnlyPhpCode()
  */
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index a26604b18bc..a0150d403c8 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -26,7 +26,7 @@
 /**
  *  Check authentication array and set error, errorcode, errorlabel
  *
- *  @param	array	$authentication     Array with authentication informations ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
+ *  @param	array	$authentication     Array with authentication information ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
  *  @param 	int		$error				Number of errors
  *  @param  string	$errorcode			Error string code
  *  @param  string	$errorlabel			Error string label
diff --git a/htdocs/core/login/README.txt b/htdocs/core/login/README.txt
index 0231ef807fa..118fff0854a 100644
--- a/htdocs/core/login/README.txt
+++ b/htdocs/core/login/README.txt
@@ -1,6 +1,6 @@
-README (english)
+README (English)
 ---------------------------------------------
-Decription of htdocs/core/login directory
+Description of htdocs/core/login directory
 ---------------------------------------------
 
 This directory contains files that handle the way to validate passwords.
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 143dcd33779..42467f123bf 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -114,7 +114,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					if ($cryptType == 'auto') {
 						if ($passcrypted && dol_verifyHash($passtyped, $passcrypted, '0')) {
 							$passok = true;
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - hash ".$cryptType." of pass is ok");
+							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication ok - hash ".$cryptType." of pass is ok");
 						}
 					}
 
@@ -123,7 +123,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						if ((!$passcrypted || $passtyped)
 							&& ($passclear && ($passtyped == $passclear))) {
 							$passok = true;
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found old pass in database", LOG_WARNING);
+							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication ok - found old pass in database", LOG_WARNING);
 						}
 					}
 
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index 6e72f3c48cc..dda4a0e78cf 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -113,7 +113,7 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
 				$_POST['dol_use_jmobile'] = $tmparray['dol_use_jmobile'];
 			}
 
-			// If googleoauth_login has been set (by google_oauthcallback after a successfull OAUTH2 request on openid scope
+			// If googleoauth_login has been set (by google_oauthcallback after a successful OAUTH2 request on openid scope
 			if (!empty($_SESSION['googleoauth_receivedlogin']) && dol_verifyHash($conf->file->instance_unique_id.$usertotest, $_SESSION['googleoauth_receivedlogin'], '0')) {
 				unset($_SESSION['googleoauth_receivedlogin']);
 				$login = $usertotest;
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 00670738053..02ea104a2b3 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -137,7 +137,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 		// Forge LDAP user and password to test with them
 		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
-		// admin login no exectued.
+		// admin login no executed.
 		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
@@ -187,7 +187,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				if ($login && !empty($conf->ldap->enabled) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {	// ldap2dolibarr synchronization
 					dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
 
-					// On charge les attributs du user ldap
+					// On charge les attributes du user ldap
 					if ($ldapdebug) {
 						print "DEBUG: login ldap = ".$login."<br>\n";
 					}
@@ -216,12 +216,12 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					$resultFetchUser = $usertmp->fetch('', $login, $sid, 1, ($entitytotest > 0 ? $entitytotest : -1));
 					if ($resultFetchUser > 0) {
 						dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
-						// On verifie si le login a change et on met a jour les attributs dolibarr
+						// Verify if the login changed and update the Dolibarr attributes
 
 						if ($usertmp->login != $ldap->login && $ldap->login) {
 							$usertmp->login = $ldap->login;
 							$usertmp->update($usertmp);
-							// TODO Que faire si update echoue car on update avec un login deja existant pour un autre compte.
+							// TODO What to do if the update fails because the login already exists for another account.
 						}
 
 						//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 60480d6c9cb..ff26edcd027 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -449,7 +449,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					$i++;
 				}
 			} else {
-				// Should not happend. Entries are added
+				// Should not happen. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
 			}
 		} else {
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 890e4257da0..eee9f086be2 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -197,7 +197,7 @@ class MenuManager
 					print $val['titre'];
 					print '</a>'."\n";
 
-					// Search submenu fot this mainmenu entry
+					// Search submenu for this mainmenu entry
 					$tmpmainmenu = $val['mainmenu'];
 					$tmpleftmenu = 'all';
 					$submenu = new Menu();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 94c4d961750..09d631d6d1c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -738,8 +738,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	$newmenu = $menu;
 
-	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
-	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
+	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]??'');
+	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]??''));
 
 	if (is_null($mainmenu)) {
 		$mainmenu = 'home';
@@ -1787,7 +1787,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 							$i++;
 						}
 					} else {
-						// Should not happend. Entries are added
+						// Should not happen. Entries are added
 						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
 					}
 				} else {
@@ -1901,7 +1901,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				 $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 if (isModEnabled('propal')) {
 				 $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->hasRight('compta',  'resultat', 'lire'));
-				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->hasRight('compta',  'resultat', 'lire'));
+				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transferred",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 }
 				 */
 
@@ -2266,9 +2266,9 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet', 'creer'));
 
 			if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
-				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
+				$newmenu->add("/projet/list.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 			} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 1) {
-				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
+				$newmenu->add("/projet/list.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
 			} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 50d1086104e..1d3bb633db6 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -197,7 +197,7 @@ class MenuManager
 					print $val['titre'];
 					print '</a>'."\n";
 
-					// Search submenu fot this mainmenu entry
+					// Search submenu for this mainmenu entry
 					$tmpmainmenu = $val['mainmenu'];
 					$tmpleftmenu = 'all';
 					$submenu = new Menu();
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 542cb1a493a..c67e783bd48 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -187,7 +187,7 @@ class MenuManager
 					print $val['titre'];
 					print '</a>'."\n";
 
-					// Search submenu fot this mainmenu entry
+					// Search submenu for this mainmenu entry
 					$tmpmainmenu = $val['mainmenu'];
 					$tmpleftmenu = 'all';
 					$submenu = new Menu();
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 1f300718385..2a81062d00e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -37,7 +37,7 @@
 class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -69,7 +69,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $family;
 
 	/**
-	 * @var array Custom family informations
+	 * @var array Custom family information
 	 * @see $family
 	 *
 	 * e.g.:
@@ -425,7 +425,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Enables a module.
-	 * Inserts all informations into database.
+	 * Inserts all information into database.
 	 *
 	 * @param array  $array_sql 	SQL requests to be executed when enabling module
 	 * @param string $options   	String with options when disabling module:
@@ -1112,8 +1112,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * Create tables and keys required by module:
 	 * - Files table.sql or table-module.sql with create table instructions
 	 * - Then table.key.sql or table-module.key.sql with create keys instructions
-	 * - Then data_xxx.sql (usualy provided by external modules only)
-	 * - Then update_xxx.sql (usualy provided by external modules only)
+	 * - Then data_xxx.sql (usually provided by external modules only)
+	 * - Then update_xxx.sql (usually provided by external modules only)
 	 * Files must be stored in subdirectory 'tables' or 'data' into directory $reldir (Example: '/install/mysql/' or '/module/sql/')
 	 * This function may also be called by :
 	 * - _load_tables('/install/mysql/', 'modulename') into the this->init() of core module descriptors.
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index d94334250a2..78b348c0f4b 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -294,7 +294,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index 31b8799d472..46262b3c1dc 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_standard_asset extends ModelePDFAsset
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -120,7 +120,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -582,7 +582,7 @@ class pdf_standard_asset extends ModelePDFAsset
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// Quantity
 					// Enough for 6 chars
@@ -1159,18 +1159,18 @@ class pdf_standard_asset extends ModelePDFAsset
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		$this->cols['theColKey'] = array(
 			'rank' => $rank, // int : use for ordering columns
 			'width' => 20, // the column width in mm
 			'title' => array(
 				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				'label' => ' ', // the final label : used fore final generated text
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 			'content' => array(
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 		);
@@ -1182,7 +1182,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index f9645d66853..1e69ae8b371 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
- *	Classe permettant de generer les projets au modele Ban
+ *	Class permettant de generer les projects au modele Ban
  */
 
 class pdf_ban extends ModeleBankAccountDoc
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index b1d67a3da4e..18419b0c97d 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -534,7 +534,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *	@param	TCPDF				$pdf           	Object PDF
 	 *	@param  CompanyBankAccount	$object         Object invoice
 	 *	@param	int					$posy			Position depart
-	 *	@param	Translate			$outputlangs	Objet langs
+	 *	@param	Translate			$outputlangs	Object langs
 	 *	@return int									Position pour suite
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index f88228eb746..017f9385ae7 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -208,7 +208,7 @@ class modTcpdfbarcode extends ModeleBarCode
 	}
 
 	/**
-	 *	get available output_modes for tcpdf class wth its translated description
+	 *	get available output_modes for tcpdf class with its translated description
 	 *
 	 * @param	string $dolEncodingType dolibarr barcode encoding type
 	 * @return	string tcpdf encoding type
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 3962613f7f0..c242c479e84 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -284,9 +284,9 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	/**
 	 *	Return if a code is used (by other element)
 	 *
-	 *	@param	DoliDB		$db			Handler acces base
+	 *	@param	DoliDB		$db			Handler access base
 	 *	@param	string		$code		Code to check
-	 *	@param	Product		$product	Objet product
+	 *	@param	Product		$product	Object product
 	 *	@return	int						0 if available, <0 if KO
 	 */
 	public function verif_dispo($db, $code, $product)
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 955db0a20ff..2c7a716aded 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -285,9 +285,9 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	/**
 	 *	Return if a code is used (by other element)
 	 *
-	 *	@param	DoliDB		$db			Handler acces base
+	 *	@param	DoliDB		$db			Handler access base
 	 *	@param	string		$code		Code to check
-	 *	@param	Societe		$thirdparty	Objet third-party
+	 *	@param	Societe		$thirdparty	Object third-party
 	 *	@return	int						0 if available, <0 if KO
 	 */
 	public function verif_dispo($db, $code, $thirdparty)
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 7301d29fef3..2dddba86689 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -304,7 +304,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index db0704d6494..864997ac473 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -375,7 +375,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$lineinpage = 0;
 		$num = count($this->lines);
 		for ($j = 0; $j < $num; $j++) {
-			// Dynamic max line heigh calculation
+			// Dynamic max line height calculation
 			$dynamic_line_height = array();
 			$dynamic_line_height[] = $pdf->getStringHeight(60, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq));
 			$dynamic_line_height[] = $pdf->getStringHeight(80, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq));
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 015fc18fed0..8779292a144 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -310,7 +310,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 88de6414416..eb36e298227 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_einstein extends ModelePDFCommandes
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -469,7 +469,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -756,7 +756,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy=$pdf->GetY()+1;
 		}*/
 
-		// Show planed date of delivery
+		// Show planned date of delivery
 		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
@@ -869,7 +869,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *	@param  Commande	$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index e02d239a5bd..2b051a87d75 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_eratosthene extends ModelePDFCommandes
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -130,7 +130,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -658,7 +658,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -958,7 +958,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$posy=$pdf->GetY()+1;
 		}*/
 
-		// Show planed date of delivery
+		// Show planned date of delivery
 		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
@@ -1069,7 +1069,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *	@param  Commande	$object         Object to show
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
@@ -1716,18 +1716,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1739,7 +1739,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 8ffc21c69b3..b0fc0edb705 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -308,7 +308,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 260baee7172..a3bae6c2475 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 class pdf_strato extends ModelePDFContract
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 486ce956866..f8ea2fb1664 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -46,7 +46,7 @@ class mod_contract_olive extends ModelNumRefContracts
 
 	public $code_modifiable = 1; // Code modifiable
 
-	public $code_modifiable_invalide = 1; // Code modifiable si il est invalide
+	public $code_modifiable_invalide = 1; // Code modifiable si il est invalid
 
 	public $code_modifiable_null = 1; // Code modifiables si il est null
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 56f71ce36e8..03a9f649e70 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -25,7 +25,7 @@
 /**
  *	\file       htdocs/core/modules/delivery/doc/pdf_storm.modules.php
  *	\ingroup    livraison
- *	\brief      File of class to manage receving receipts with template Storm
+ *	\brief      File of class to manage receiving receipts with template Storm
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_storm extends ModelePDFDeliveryOrder
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -460,7 +460,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 
 					// Quantity
@@ -892,18 +892,18 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -915,7 +915,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index d2a0eabdedf..1b4fb4a84d7 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -24,7 +24,7 @@
 /**
  *	\file       htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
  *	\ingroup    livraison
- *	\brief      File of class to manage receving receipts with template Typhon
+ *	\brief      File of class to manage receiving receipts with template Typhon
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_typhon extends ModelePDFDeliveryOrder
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -382,7 +382,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					/*
 					 // TVA
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index 7a0713025cf..579f4af7ced 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -21,7 +21,7 @@
 /**
  *   \file       htdocs/core/modules/delivery/mod_delivery_jade.php
  *   \ingroup    delivery
- *   \brief      Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade
+ *   \brief      Fichier contenant la class du modele de numerotation de reference de bon de livraison Jade
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 
 /**
  *  \class      mod_delivery_jade
- *  \brief      Classe du modele de numerotation de reference de bon de livraison Jade
+ *  \brief      Class du modele de numerotation de reference de bon de livraison Jade
  */
 
 class mod_delivery_jade extends ModeleNumRefDeliveryOrder
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index d25df47624d..bb1b2e7ad33 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -21,13 +21,13 @@
 /**
  *	\file       htdocs/core/modules/delivery/mod_delivery_saphir.php
  *	\ingroup    expedition
- *	\brief      Fichier contenant la classe du modele de numerotation de reference de livraison Saphir
+ *	\brief      Fichier contenant la class du modele de numerotation de reference de livraison Saphir
  */
 require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 
 /**
  *	\class      mod_delivery_saphir
- *	\brief      Classe du modele de numerotation de reference de livraison Saphir
+ *	\brief      Class du modele de numerotation de reference de livraison Saphir
  */
 class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 {
@@ -162,7 +162,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 *  Return next free ref
 	 *
 	 *  @param	Societe		$objsoc      	Object thirdparty
-	 *  @param  Object		$object			Objet livraison
+	 *  @param  Object		$object			Object livraison
 	 *  @return string      				Descriptive text
 	 */
 	public function delivery_get_num($objsoc = 0, $object = '')
diff --git a/htdocs/core/modules/delivery/modules_delivery.php b/htdocs/core/modules/delivery/modules_delivery.php
index eab3918dace..5f727d5f4ce 100644
--- a/htdocs/core/modules/delivery/modules_delivery.php
+++ b/htdocs/core/modules/delivery/modules_delivery.php
@@ -24,8 +24,8 @@
 /**
  *	\file       htdocs/core/modules/delivery/modules_delivery.php
  *	\ingroup    expedition
- *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
- *				et la classe mere de numerotation des bons de livraisons
+ *	\brief      Fichier contenant la class mere de generation de bon de livraison en PDF
+ *				et la class mere de numerotation des bons de livraisons
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonnumrefgenerator.class.php';
 
 
 /**
- *	Classe mere des modeles de bon de livraison
+ *	Class mere des modeles de bon de livraison
  */
 abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 {
@@ -60,7 +60,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 
 
 /**
- *  Classe mere des modeles de numerotation des references de bon de livraison
+ *  Class mere des modeles de numerotation des references de bon de livraison
  */
 abstract class ModeleNumRefDeliveryOrder extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 795d803b9d8..e56b7580ced 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -38,7 +38,7 @@ class html_cerfafr extends ModeleDon
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb      $db      Database handler
+	 *  @param      DoliDB      $db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/dons/html_generic.modules.php b/htdocs/core/modules/dons/html_generic.modules.php
index c1bb138fdc7..fa16c9a03b1 100644
--- a/htdocs/core/modules/dons/html_generic.modules.php
+++ b/htdocs/core/modules/dons/html_generic.modules.php
@@ -39,7 +39,7 @@ class html_generic extends ModeleDon
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb      $db      Database handler
+	 *  @param      DoliDB      $db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index f35415d6e0f..deb3b68733e 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -308,7 +308,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a SHIPPING contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a SHIPPING contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 3cf292e4a91..7ddf42614a6 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_espadon extends ModelePdfExpedition
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -775,7 +775,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *	@param  Expedition	$object         Object expedition
 	 *	@param  int			$deja_regle     Amount already paid
 	 *	@param	int         $posy           Start Position
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position for suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
@@ -1233,18 +1233,18 @@ class pdf_espadon extends ModelePdfExpedition
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1256,7 +1256,7 @@ class pdf_espadon extends ModelePdfExpedition
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index a4d790f2285..e154510777a 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_merou extends ModelePdfExpedition
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 8e3595c1d08..6fe85fa3683 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 class pdf_rouget extends ModelePdfExpedition
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -506,7 +506,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					$pdf->SetXY($this->posxweightvol, $curY);
 					$weighttxt = '';
@@ -649,7 +649,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *	@param  Expedition	$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 82d81cdb4b7..3040f848c7e 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
 class pdf_standard extends ModeleExpenseReport
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -322,7 +322,6 @@ class pdf_standard extends ModeleExpenseReport
 				}
 
 				$iniY = $tab_top + 7;
-				$initialY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
 				$showpricebeforepagebreak = 1;
@@ -488,7 +487,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetFillColor(248, 248, 248);
 
 				if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
-					// TODO Show vat amout per tax level
+					// TODO Show vat amount per tax level
 					$posy += 5;
 					$pdf->SetXY(130, $posy);
 					$pdf->SetTextColor(0, 0, 60);
@@ -551,7 +550,7 @@ class pdf_standard extends ModeleExpenseReport
 	 * @param   ExpenseReport	$object             Object to show
 	 * @param   int         	$linenumber         line number
 	 * @param   int         	$curY               current y position
-	 * @param   int         	$default_font_size  default siez of font
+	 * @param   int         	$default_font_size  default font size
 	 * @param   Translate   	$outputlangs        Object lang for output
 	 * @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
 	 * @return  void
@@ -807,7 +806,7 @@ class pdf_standard extends ModeleExpenseReport
 			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
 			$pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
 
-			// Informations for expense report (dates and users workflow)
+			// Information for expense report (dates and users workflow)
 			if ($object->fk_user_author > 0) {
 				$userfee = new User($this->db);
 				$userfee->fetch($object->fk_user_author);
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index df1fc7ee783..6bc4c6671dd 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -19,7 +19,7 @@
 /**
  * \file       htdocs/core/modules/expensereport/mod_expensereport_sand.php
  * \ingroup    expensereport
- * \brief      Fichier contenant la classe du modele de numerotation de reference de note de frais Sand
+ * \brief      Fichier contenant la class du modele de numerotation de reference de note de frais Sand
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 82b8a36cb8c..4a7f8b510e4 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 /**
  *	Parent class for export modules
  */
-class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by listOfAvailableExportFormat
+class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance properties loaded by listOfAvailableExportFormat
 {
 	/**
 	 * @var string Error code (or message)
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 3742801f80f..0344b4a3c53 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -86,7 +86,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
-			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par default, si n'etait pas defini
 		}
 	}
 
@@ -309,7 +309,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a BILLING contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a BILLING contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 818d157964b..6c58f02900a 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_crabe extends ModelePDFFactures
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -439,7 +439,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
 
-				// $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher
+				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
 				$tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
@@ -673,7 +673,7 @@ class pdf_crabe extends ModelePDFFactures
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -770,7 +770,7 @@ class pdf_crabe extends ModelePDFFactures
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandonned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -1327,7 +1327,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 0130fa8c0db..1d6b8104d87 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_sponge extends ModelePDFFactures
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -164,7 +164,7 @@ class pdf_sponge extends ModelePDFFactures
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -447,7 +447,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
 
-				// $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher
+				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
 				$this->tab_top = 90 + $top_shift + $shipp_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
@@ -493,7 +493,7 @@ class pdf_sponge extends ModelePDFFactures
 				$this->tab_top_newpage += 0;
 
 
-				// Define heigth of table for lines (for first page)
+				// Define height of table for lines (for first page)
 				$tab_height = $this->page_hauteur - $this->tab_top - $this->heightforfooter - $this->heightforfreetext - $this->getHeightForQRInvoice(1, $object, $langs);
 
 				$nexY = $this->tab_top - 1;
@@ -807,7 +807,7 @@ class pdf_sponge extends ModelePDFFactures
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -929,7 +929,7 @@ class pdf_sponge extends ModelePDFFactures
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandonned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -1421,7 +1421,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
@@ -1713,7 +1713,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 				//}
 
-				// Situations totals migth be wrong on huge amounts with old mode 1
+				// Situations totals might be wrong on huge amounts with old mode 1
 				if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1 && $object->situation_cycle_ref && $object->situation_counter > 1) {
 					$sum_pdf_tva = 0;
 					foreach ($this->tva as $tvakey => $tvaval) {
@@ -2026,7 +2026,7 @@ class pdf_sponge extends ModelePDFFactures
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *  Show top header of page. This include the logo, ref and address blocs
+	 *  Show top header of page. This include the logo, ref and address blocks
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Facture		$object     	Object to show
@@ -2458,18 +2458,18 @@ class pdf_sponge extends ModelePDFFactures
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -2481,7 +2481,7 @@ class pdf_sponge extends ModelePDFFactures
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index a87513c216e..9f1a312e705 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_soleil extends ModelePDFFicheinter
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 8f014e68111..09ac4078e63 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -28,7 +28,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 
 /**
- *	Class to manage numbering of intervention cards with rule Artic.
+ *	Class to manage numbering of intervention cards with rule Arctic.
  */
 class mod_arctic extends ModeleNumRefFicheinter
 {
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 20050edf0c6..2abbbe07264 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -70,10 +70,10 @@ abstract class ModeleNumRefFicheinter extends CommonNumRefGenerator
 /**
  *  Create an intervention document on disk using template defined into FICHEINTER_ADDON_PDF
  *
- *  @param	DoliDB		$db  			objet base de donnee
+ *  @param	DoliDB		$db  			object base de donnee
  *  @param	Object		$object			Object fichinter
- *  @param	string		$modele			force le modele a utiliser ('' par defaut)
- *  @param	Translate	$outputlangs	objet lang a utiliser pour traduction
+ *  @param	string		$modele			force le modele a utiliser ('' par default)
+ *  @param	Translate	$outputlangs	object lang a utiliser pour traduction
  *  @param  int			$hidedetails    Hide details of lines
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
@@ -117,7 +117,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$modele.".modules.php";
 
-			// On verifie l'emplacement du modele
+			// Get the location of the module and verify it exists
 			$file = dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
 			if (file_exists($file)) {
 				$filefound = 1;
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
index 10c4bdb1ee4..66b3c56faae 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 class pdf_standard extends ModelePDFEvaluation
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -268,7 +268,6 @@ class pdf_standard extends ModelePDFEvaluation
 				}
 
 				$iniY = $tab_top + 7;
-				$initialY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
 				$pdf->setTopMargin($tab_top_newpage);
@@ -454,7 +453,7 @@ class pdf_standard extends ModelePDFEvaluation
 	 * @param	Evaluation		$object             Object to show
 	 * @param   int         	$linenumber         line number
 	 * @param   int         	$curY               current y position
-	 * @param   int         	$default_font_size  default siez of font
+	 * @param   int         	$default_font_size  default font size
 	 * @param   Translate   	$outputlangs        Object lang for output
 	 * @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
 	 * @return  void
@@ -583,7 +582,7 @@ class pdf_standard extends ModelePDFEvaluation
 			// Sender properties
 			$carac_emetteur = '';
 
-			// employee informations
+			// employee information
 			$employee = new User($this->db);
 			$employee->fetch($object->fk_user);
 			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname) . ' ' . strtoupper($employee->lastname));
@@ -611,7 +610,7 @@ class pdf_standard extends ModelePDFEvaluation
 			/*$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Informations"), '', 'L');*/
+			$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Information"), '', 'L');*/
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->MultiCell(190, $hautcadre, "", 0, 'R', 1);
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 124fe9f7bbc..cbade8098ee 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -66,7 +66,7 @@ class ImportCsv extends ModeleImports
 
 	public $handle; // Handle fichier
 
-	public $cacheconvert = array(); // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a conversion
 
 	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
@@ -254,18 +254,18 @@ class ImportCsv extends ModeleImports
 				if (getDolGlobalString('IMPORT_CSV_FORCE_CHARSET')) {	// Forced charset
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8') {
 						$newarrayres[$key]['val'] = $val;
-						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it's null
 					} else {
 						$newarrayres[$key]['val'] = mb_convert_encoding($val, 'UTF-8', 'ISO-8859-1');
-						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it's null
 					}
 				} else { // Autodetect format (UTF8 or ISO)
 					if (utf8_check($val)) {
 						$newarrayres[$key]['val'] = $val;
-						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it's null
 					} else {
 						$newarrayres[$key]['val'] = mb_convert_encoding($val, 'UTF-8', 'ISO-8859-1');
-						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it's null
 					}
 				}
 			}
@@ -917,7 +917,7 @@ class ImportCsv extends ModeleImports
 								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+								// Note: For extrafield tablename, we have in importfieldshidden_array an entry 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = "SELECT rowid FROM ".$tablename;
 
 								if (empty($keyfield)) {
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 14e4b561eae..badf9469140 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -70,7 +70,7 @@ class ImportXlsx extends ModeleImports
 
 	public $handle; // Handle fichier
 
-	public $cacheconvert = array(); // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a conversion
 
 	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
@@ -959,7 +959,7 @@ class ImportXlsx extends ModeleImports
 								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+								// Note: For extrafield tablename, we have in importfieldshidden_array an entry 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = "SELECT rowid FROM " . $tablename;
 
 
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 9017e81aa14..19339df0ead 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -30,7 +30,7 @@ class mailing_advthirdparties extends MailingTargets
 	public $desc = "Third parties";
 	public $require_admin = 0;
 
-	public $require_module = array("none"); // This module should not be displayed as Selector in mailling
+	public $require_module = array("none"); // This module should not be displayed as Selector in mailing
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -188,7 +188,7 @@ class mailing_advthirdparties extends MailingTargets
 	 */
 	public function getSqlArrayForStats()
 	{
-		// CHANGE THIS: Optionnal
+		// CHANGE THIS: Optional
 
 		//var $statssql=array();
 		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index ac1e6979217..bbe821716f0 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -391,7 +391,7 @@ class mailing_contacts1 extends MailingTargets
 		if (empty($this->evenunsubscribe)) {
 			$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = sp.email and mu.entity = ".((int) $conf->entity).")";
 		}
-		// Exclude unsubscribed email adresses
+		// Exclude unsubscribed email addresses
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 
diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
index 006405f63c8..0c578cb055d 100644
--- a/htdocs/core/modules/mailings/eventorganization.modules.php
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -141,7 +141,7 @@ class mailing_eventorganization extends MailingTargets
 	 */
 	public function getSqlArrayForStats()
 	{
-		// CHANGE THIS: Optionnal
+		// CHANGE THIS: Optional
 
 		//var $statssql=array();
 		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 06fb4f6125a..7a8d2d86f44 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 class MailingTargets // This can't be abstract as it is used for some method
 {
 	/**
-	 * @var DoliDb		Database handler (result of a new DoliDB)
+	 * @var DoliDB		Database handler (result of a new DoliDB)
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 739ef8c52f8..ef64329899a 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -163,7 +163,7 @@ class mailing_partnership extends MailingTargets
 	 */
 	public function getSqlArrayForStats()
 	{
-		// CHANGE THIS: Optionnal
+		// CHANGE THIS: Optional
 
 		//var $statssql=array();
 		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 9dc1c18f696..5cf555762d7 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -71,7 +71,7 @@ class mailing_pomme extends MailingTargets
 		$sql = "SELECT '".$this->db->escape($langs->trans("DolibarrUsers"))."' as label,";
 		$sql .= " count(distinct(u.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
+		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicit dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 
 		$statssql[0] = $sql;
@@ -94,7 +94,7 @@ class mailing_pomme extends MailingTargets
 
 		$sql = "SELECT count(distinct(u.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
+		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicit dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		if (empty($this->evenunsubscribe)) {
 			$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = u.email and mu.entity = ".((int) $conf->entity).")";
@@ -167,7 +167,7 @@ class mailing_pomme extends MailingTargets
 		$sql = "SELECT u.rowid as id, u.email as email, null as fk_contact,";
 		$sql .= " u.lastname, u.firstname as firstname, u.civility as civility_id, u.login, u.office_phone";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
+		$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicit dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		$sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		if (GETPOSTISSET("filter") && GETPOST("filter") == '1') {
@@ -176,7 +176,7 @@ class mailing_pomme extends MailingTargets
 		if (GETPOSTISSET("filter") && GETPOST("filter") == '0') {
 			$sql .= " AND u.statut=0";
 		}
-		if (GETPOSTISSET("filteremployee") && GETPOSt("filteremployee") == '1') {
+		if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '1') {
 			$sql .= " AND u.employee=1";
 		}
 		if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '0') {
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index b11f80712ec..52882aeb856 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -230,7 +230,7 @@ class mailing_thirdparties extends MailingTargets
 	 */
 	public function getSqlArrayForStats()
 	{
-		// CHANGE THIS: Optionnal
+		// CHANGE THIS: Optional
 
 		//var $statssql=array();
 		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index e1eed1ffb6d..55c5ce0bc54 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -164,7 +164,7 @@ class mailing_xinputfile extends MailingTargets
 
 						if (!empty($buffer)) {
 							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-							if (isValidEMail($email)) {
+							if (isValidEmail($email)) {
 								if ($old != $email) {
 									$cibles[$j] = array(
 													'email' => $email,
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index a141cb7881e..1f1a7cb5aa8 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -135,7 +135,7 @@ class mailing_xinputuser extends MailingTargets
 
 		$cibles = array();
 		if (!empty($email)) {
-			if (isValidEMail($email)) {
+			if (isValidEmail($email)) {
 				$cibles[] = array(
 					'email' => $email,
 					'lastname' => $lastname,
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index fb8d7d1e378..827449ebb5f 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -298,7 +298,7 @@ class doc_generic_member_odt extends ModelePDFMember
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index f2c023564c1..bf521d58c42 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -262,7 +262,7 @@ class pdf_standard extends CommonStickerGenerator
 	/**
 	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
+	 *	@param	Adherent	$object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
 	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
@@ -418,7 +418,7 @@ class pdf_standard extends CommonStickerGenerator
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
-		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
+		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja service
 		$posX = 1;
 		$posY = 1;
 		if ($posX > 0) {
diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index 984ce4fa295..897bdd03086 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -59,7 +59,7 @@ abstract class ModelePDFMember extends CommonDocGenerator
 
 
 /**
- *  Classe mere des modeles de numerotation des references de members
+ *  Class mere des modeles de numerotation des references de members
  */
 abstract class ModeleNumRefMembers extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index e19b6e244a6..956ebb3c3a5 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -147,7 +147,7 @@ class modAdherent extends DolibarrModules
 		$this->const[$r][0] = "ADHERENT_MAILMAN_ADMIN_PASSWORD";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "";
-		$this->const[$r][3] = "Mot de passe Admin des liste mailman";
+		$this->const[$r][3] = "Password admin mailman lists";
 		$this->const[$r][4] = 0;
 		$r++;
 
@@ -207,9 +207,9 @@ class modAdherent extends DolibarrModules
 		$r = 0;
 
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][1]     Libelle par default si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
 		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][3]     1=Permis par default, 0=Non permis par default
 		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index b74db69921b..94a0677fec0 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -125,9 +125,9 @@ class modAgenda extends DolibarrModules
 		$r = 0;
 
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][1]     Libelle par default si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
 		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][3]     1=Permis par default, 0=Non permis par default
 		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 		// $r++;
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 9621904ebe6..27af84dca96 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -106,7 +106,7 @@ class modApi extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index a0fb405887e..299b2564ec5 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -135,7 +135,7 @@ class modAsset extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 3a55acc8124..cfa5c7a650c 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -66,7 +66,7 @@ class modBanque extends DolibarrModules
 		//-------------
 		$this->config_page_url = array("bank.php");
 
-		// Dependancies
+		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array("modComptabilite", "modAccounting", "modPrelevement");
 		$this->conflictwith = array();
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 861bca9c1d2..b6ac87127b3 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -81,22 +81,22 @@ class modBarcode extends DolibarrModules
 
 		$this->rights[$r][0] = 301; // id de la permission
 		$this->rights[$r][1] = 'Generate PDF sheets of barcodes'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'read';
 		$r++;
 
 		$this->rights[$r][0] = 304; // id de la permission
 		$this->rights[$r][1] = 'Read barcodes'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire_advance';
 		$r++;
 
 		$this->rights[$r][0] = 305; // id de la permission
 		$this->rights[$r][1] = 'Create/modify barcodes'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer_advance';
 		$r++;
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 18d38c7c63a..eb91bf4ef47 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -65,7 +65,7 @@ class modBlockedLog extends DolibarrModules
 		//-------------
 		$this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
 
-		// Dependancies
+		// Dependencies
 		//-------------
 		$this->hidden = false; // A condition to disable module
 		$this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index c3b642626a9..2832ec9da99 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -155,7 +155,7 @@ class modBom extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php
index b1fb1c7ecdf..a11bff28ed5 100644
--- a/htdocs/core/modules/modBookCal.class.php
+++ b/htdocs/core/modules/modBookCal.class.php
@@ -179,7 +179,7 @@ class modBookCal extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in customer order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 80e7675fd97..2dca829e7d1 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -56,7 +56,7 @@ class modBookmark extends DolibarrModules
 		// Data directories to create when module is enabled
 		$this->dirs = array();
 
-		// Dependancies
+		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->langfiles = array("bookmarks");
@@ -80,22 +80,22 @@ class modBookmark extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 331; // id de la permission
 		$this->rights[$r][1] = 'Lire les bookmarks'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 332; // id de la permission
 		$this->rights[$r][1] = 'Creer/modifier les bookmarks'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 333; // id de la permission
 		$this->rights[$r][1] = 'Supprimer les bookmarks'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 00343e438e4..43c92e4810c 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -90,21 +90,21 @@ class modCategorie extends DolibarrModules
 		$this->rights[$r][0] = 241; // id de la permission
 		$this->rights[$r][1] = 'Lire les categories'; // libelle de la permission
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 		$r++;
 
 		$this->rights[$r][0] = 242; // id de la permission
 		$this->rights[$r][1] = 'Creer/modifier les categories'; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 		$r++;
 
 		$this->rights[$r][0] = 243; // id de la permission
 		$this->rights[$r][1] = 'Supprimer les categories'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 		$r++;
 
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index f4edbee6c3f..d08a8438954 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -63,7 +63,7 @@ class modCollab extends DolibarrModules
 		//-------------
 		$this->config_page_url = array(/*'collab.php'*/);
 
-		// Dependancies
+		// Dependencies
 		//-------------
 		$this->hidden = getDolGlobalString('MODULE_COLLAB_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 2d626adc396..eb276ea8c3d 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -67,7 +67,7 @@ class modCommande extends DolibarrModules
 		// Config pages
 		$this->config_page_url = array("commande.php");
 
-		// Dependancies
+		// Dependencies
 		$this->depends = array("modSociete");
 		$this->requiredby = array("modExpedition");
 		$this->conflictwith = array();
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index c11dd5ce047..44d9962ef6c 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -64,7 +64,7 @@ class modCron extends DolibarrModules
 		//-------------
 		$this->config_page_url = array("cron.php@cron");
 
-		// Dependancies
+		// Dependencies
 		//-------------
 		$this->hidden = getDolGlobalString('MODULE_CRON_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 97fc2642874..c8eed3a7c34 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -29,7 +29,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 // The class name should start with a lower case mod for Dolibarr to pick it up
-// so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
+// so we ignore the Squiz.Class.ValidClassName.NotCamelCaps rule.
 // @codingStandardsIgnoreStart
 /**
  *  Description and activation class for module datapolicy
@@ -160,7 +160,7 @@ class modDataPolicy extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index 3f0faf48949..f699b0e5e94 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -129,7 +129,7 @@ class modDav extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index 590c29e03ad..c8feb86fc19 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -49,7 +49,7 @@ class modDebugBar extends DolibarrModules
 
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "A tool for developper adding a debug bar in your browser.";
+		$this->description = "A tool for developer adding a debug bar in your browser.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -80,8 +80,8 @@ class modDebugBar extends DolibarrModules
 
 		$this->rights[1][0] = 431; // id de la permission
 		$this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
-		$this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
-		$this->rights[1][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[1][2] = 'u'; // type de la permission (deprecated)
+		$this->rights[1][3] = 0; // La permission est-elle une permission par default
 		$this->rights[1][4] = 'read';
 	}
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index c3e8fd96f52..0ff36b2e4fb 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\defgroup   deplacement     Module trips
+ *	\defgroup   deplacement     Module traves
  *	\brief      Module pour gerer les deplacements et notes de frais
  *	\file       htdocs/core/modules/modDeplacement.class.php
  *	\ingroup    deplacement
@@ -62,7 +62,7 @@ class modDeplacement extends DolibarrModules
 		$this->config_page_url = array();
 		$this->langfiles = array("companies", "trips");
 
-		// Dependancies
+		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
 
@@ -77,7 +77,7 @@ class modDeplacement extends DolibarrModules
 		$this->rights_class = 'deplacement';
 
 		$this->rights[1][0] = 171;
-		$this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy';
+		$this->rights[1][1] = 'View own expense and travel reports, and its hierarchy';
 		$this->rights[1][2] = 'r';
 		$this->rights[1][3] = 0;
 		$this->rights[1][4] = 'lire';
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 30497f7c698..48428e3f326 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -58,7 +58,7 @@ class modDon extends DolibarrModules
 		// Data directories to create when module is enabled
 		$this->dirs = array("/don/temp");
 
-		// Dependancies
+		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
 
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index a6575ee9dd4..f580c18ef30 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -59,7 +59,7 @@ class modDynamicPrices extends DolibarrModules
 		//-------------
 		$this->config_page_url = array("dynamic_prices.php@product");
 
-		// Dependancies
+		// Dependencies
 		//-------------
 		$this->depends = array();
 		$this->requiredby = array();
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index cf9f0dbc5f1..1912c92827b 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -127,7 +127,7 @@ class modEmailCollector extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 5bcf2f77bac..0f709e1ccad 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -168,7 +168,7 @@ class modEventOrganization extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index b895b57bfc8..b1ce595d2ca 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -167,8 +167,8 @@ class modExpedition extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 105; // id de la permission
 		$this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'shipping_advance';
 		$this->rights[$r][5] = 'send';
 
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index d5ec3e34032..525760c6ac3 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -35,7 +35,7 @@ class modExpenseReport extends DolibarrModules
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
-	 *   @param		DoliDb	$db      Database handler
+	 *   @param		DoliDB	$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index eba11ac1089..ac84fd96b7b 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -18,7 +18,7 @@
 
 /**
  *  \defgroup   externalrss     Module externalrss
- *	\brief      Module pour inclure des informations externes RSS
+ *	\brief      Module pour inclure des information externes RSS
  *	\file       htdocs/core/modules/modExternalRss.class.php
  *	\ingroup    externalrss
  *	\brief      Description and activation file for the module externalrss
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index bdb44069936..4c34316ade1 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -295,7 +295,7 @@ class modFournisseur extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 1236;
-		$this->rights[$r][1] = 'Exporter les factures fournisseurs, attributs et reglements';
+		$this->rights[$r][1] = 'Exporter les factures fournisseurs, attributes et reglements';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'facture';
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 48491c5fbe5..927325431fd 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -140,7 +140,7 @@ class modHRM extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 62b35b97662..cec8cfcc3fd 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -182,7 +182,7 @@ class modKnowledgeManagement extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 69678a85c29..8944a951c05 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -77,17 +77,17 @@ class modLabel extends DolibarrModules
 
 		$this->rights[1][0] = 601; // id de la permission
 		$this->rights[1][1] = 'Read stickers';
-		$this->rights[1][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[1][3] = 0; // La permission est-elle une permission par default
 		$this->rights[1][4] = 'lire';
 
 		$this->rights[2][0] = 602; // id de la permission
 		$this->rights[2][1] = 'Create/modify stickers';
-		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[2][3] = 0; // La permission est-elle une permission par default
 		$this->rights[2][4] = 'creer';
 
 		$this->rights[4][0] = 609; // id de la permission
 		$this->rights[4][1] = 'Delete stickers';
-		$this->rights[4][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[4][3] = 0; // La permission est-elle une permission par default
 		$this->rights[4][4] = 'supprimer';
 	}
 
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index f4b883763e4..626c8e7c0ca 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -93,8 +93,8 @@ class modMailing extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 221; // id de la permission
 		$this->rights[$r][1] = 'Consulter les mailings'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 6c8dfda12c9..3f88584d3bf 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -127,22 +127,22 @@ class modMargin extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 59001; // id de la permission
 		$this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'liretous';
 
 		$r++;
 		$this->rights[$r][0] = 59002; // id de la permission
 		$this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 59003; // id de la permission
 		$this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'read';
 		$this->rights[$r][5] = 'all';
 	}
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 2139c2f0a91..dd0715b4e7e 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -166,7 +166,7 @@ class modMrp extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 20ae486d46c..a93f386af8e 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -111,7 +111,7 @@ class modMultiCurrency extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 0a6e8d0b23e..fcfa34e3fa9 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -87,9 +87,9 @@ class modOauth extends DolibarrModules
 
 		$r = 0;
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][1]     Libelle par default si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
 		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][3]     1=Permis par default, 0=Non permis par default
 		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index f8fa512c36e..be6da6264f2 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -197,7 +197,7 @@ class modPartnership extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 27f87ea87c4..5feb71c96e4 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -86,9 +86,9 @@ class modPrinting extends DolibarrModules
 
 		$r = 0;
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][1]     Libelle par default si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
 		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][3]     1=Permis par default, 0=Non permis par default
 		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index be44400b1d7..35a75ca1345 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -115,30 +115,30 @@ class modProduct extends DolibarrModules
 
 		$this->rights[$r][0] = 31; // id de la permission
 		$this->rights[$r][1] = 'Read products'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 		$r++;
 
 		$this->rights[$r][0] = 32; // id de la permission
 		$this->rights[$r][1] = 'Create/modify products'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 		$r++;
 
 		$this->rights[$r][0] = 33; // id de la permission
 		$this->rights[$r][1] = 'Read prices products'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'product_advance';
 		$this->rights[$r][5] = 'read_prices';
 		$r++;
 
 		$this->rights[$r][0] = 34; // id de la permission
 		$this->rights[$r][1] = 'Delete products'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 		$r++;
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 27606feb190..e289dcf1713 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -53,7 +53,7 @@ class modProjet extends DolibarrModules
 		$this->module_position = '14';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion des projets";
+		$this->description = "Gestion des projects";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 
@@ -142,60 +142,60 @@ class modProjet extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 41; // id de la permission
 		$this->rights[$r][1] = "Read projects and tasks (shared projects or projects I am contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 42; // id de la permission
 		$this->rights[$r][1] = "Create/modify projects and tasks (shared projects or projects I am contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 44; // id de la permission
 		$this->rights[$r][1] = "Delete project and tasks (shared projects or projects I am contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = 45; // id de la permission
 		$this->rights[$r][1] = "Export projects"; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'export';
 
 		$r++;
 		$this->rights[$r][0] = 141; // id de la permission
 		$this->rights[$r][1] = "Read all projects and tasks (also private projects I am not contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'all';
 		$this->rights[$r][5] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 142; // id de la permission
 		$this->rights[$r][1] = "Create/modify all projects and tasks (also private projects I am not contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'all';
 		$this->rights[$r][5] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 144; // id de la permission
 		$this->rights[$r][1] = "Delete all projects and tasks (also private projects I am not contact for)"; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'all';
 		$this->rights[$r][5] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = 145; // id de la permission
 		$this->rights[$r][1] = "Can enter time consumed on assigned tasks (timesheet)"; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'time';
 
 		// Menus
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 18d29d64324..48c733a76b3 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -131,53 +131,53 @@ class modPropale extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 21; // id de la permission
 		$this->rights[$r][1] = 'Read commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 22; // id de la permission
 		$this->rights[$r][1] = 'Create and update commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 24; // id de la permission
 		$this->rights[$r][1] = 'Validate commercial proposals'; // Validate proposal
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'propal_advance';
 		$this->rights[$r][5] = 'validate';
 
 		$r++;
 		$this->rights[$r][0] = 25; // id de la permission
 		$this->rights[$r][1] = 'Send commercial proposals to customers'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'propal_advance';
 		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 26; // id de la permission
 		$this->rights[$r][1] = 'Close commercial proposals'; // Set proposal to signed or refused
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'propal_advance';
 		$this->rights[$r][5] = 'close';
 
 		$r++;
 		$this->rights[$r][0] = 27; // id de la permission
 		$this->rights[$r][1] = 'Delete commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = 28; // id de la permission
 		$this->rights[$r][1] = 'Exporting commercial proposals and attributes'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'export';
 
 
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 4e544f0cf79..ae755358000 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -87,9 +87,9 @@ class modReceiptPrinter extends DolibarrModules
 
 		$r = 0;
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][1]     Libelle par default si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
 		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][3]     1=Permis par default, 0=Non permis par default
 		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index bd66a1db3f0..f5f8429f5db 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -136,8 +136,8 @@ class modReception extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = $this->numero.$r; // id de la permission
 		$this->rights[$r][1] = 'Envoyer les receptions aux clients'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'reception_advance';
 		$this->rights[$r][5] = 'send';
 
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index c33c9a5daa6..c8c5b623845 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -175,7 +175,7 @@ class modRecruitment extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index acca9803b2d..49b1ed8f19d 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -123,7 +123,7 @@ class modResource extends DolibarrModules
 		// 'product'			to add a tab in product view
 		// 'stock'				to add a tab in stock view
 		// 'propal'				to add a tab in propal view
-		// 'member'				to add a tab in fundation member view
+		// 'member'				to add a tab in foundation member view
 		// 'contract'			to add a tab in contract view
 		// 'user'				to add a tab in user view
 		// 'group'				to add a tab in group view
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 7062dac67eb..d4e7dffe945 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -89,30 +89,30 @@ class modService extends DolibarrModules
 
 		$this->rights[$r][0] = 531; // id de la permission
 		$this->rights[$r][1] = 'Read services'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 		$r++;
 
 		$this->rights[$r][0] = 532; // id de la permission
 		$this->rights[$r][1] = 'Create/modify services'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 		$r++;
 
 		$this->rights[$r][0] = 533; // id de la permission
 		$this->rights[$r][1] = 'Read prices services'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'service_advance';
 		$this->rights[$r][5] = 'read_prices';
 		$r++;
 
 		$this->rights[$r][0] = 534; // id de la permission
 		$this->rights[$r][1] = 'Delete les services'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 		$r++;
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index e4f34e432ec..7c1edc59adb 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -138,8 +138,8 @@ class modSociete extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 121; // id de la permission
 		$this->rights[$r][1] = 'Read third parties'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		/*$r++;
@@ -162,8 +162,8 @@ class modSociete extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 122; // id de la permission
 		$this->rights[$r][1] = 'Create and update third parties'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		/* $r++;
@@ -186,15 +186,15 @@ class modSociete extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 125; // id de la permission
 		$this->rights[$r][1] = 'Delete third parties'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = 126; // id de la permission
 		$this->rights[$r][1] = 'Export third parties'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'export';
 
 		$r++;
@@ -226,32 +226,32 @@ class modSociete extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 281; // id de la permission
 		$this->rights[$r][1] = 'Read contacts'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'contact';
 		$this->rights[$r][5] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 282; // id de la permission
 		$this->rights[$r][1] = 'Create and update contact'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'contact';
 		$this->rights[$r][5] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = 283; // id de la permission
 		$this->rights[$r][1] = 'Delete contacts'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'contact';
 		$this->rights[$r][5] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = 286; // id de la permission
 		$this->rights[$r][1] = 'Export contacts'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'contact';
 		$this->rights[$r][5] = 'export';
 
@@ -868,7 +868,7 @@ class modSociete extends DolibarrModules
 			'sr.default_rib' => 'Default',
 			'sr.rum' => 'RUM',
 			'sr.frstrecur' => "WithdrawMode",
-			'sr.type' => "Type ban is defaut",
+			'sr.type' => "Type ban is default",
 		);
 
 		$this->import_convertvalue_array[$r] = array(
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index b22f164d6a3..19deac068ba 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -102,7 +102,7 @@ class modStock extends DolibarrModules
 		$r++;
 		$this->const[$r][0] = "MOUVEMENT_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/stocks/mouvements";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/stocks/movements";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 
@@ -135,14 +135,14 @@ class modStock extends DolibarrModules
 		$this->rights[2][5] = '';
 
 		$this->rights[3][0] = 1004;
-		$this->rights[3][1] = 'Lire mouvements de stocks';
+		$this->rights[3][1] = 'Lire movements de stocks';
 		$this->rights[3][2] = 'r';
 		$this->rights[3][3] = 0;
 		$this->rights[3][4] = 'mouvement';
 		$this->rights[3][5] = 'lire';
 
 		$this->rights[4][0] = 1005;
-		$this->rights[4][1] = 'Creer/modifier mouvements de stocks';
+		$this->rights[4][1] = 'Creer/modifier movements de stocks';
 		$this->rights[4][2] = 'w';
 		$this->rights[4][3] = 0;
 		$this->rights[4][4] = 'mouvement';
diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index 652ba0480c9..73e4a7c9397 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -157,7 +157,7 @@ class modStockTransfer extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
@@ -440,21 +440,21 @@ class modStockTransfer extends DolibarrModules
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsible for stock transfers", 1, NULL, 0)');
 		}
 
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STFROM" AND element = "StockTransfer" AND source = "external"');
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact sending the stock transfer", 1, NULL, 0)');
 		}
 
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "external"');
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact receiving the stock transfer", 1, NULL, 0)');
 		}
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index ae1e47c0d8e..d7c7941d08b 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -107,37 +107,37 @@ class modSupplierProposal extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Read supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Create/modify supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'creer';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'validate_advance';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'send_advance';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Delete supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'supprimer';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Close supplier price requests'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'cloturer';
 
 		// Main menu entries
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 06b5b79dbf3..383996d4345 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -142,7 +142,7 @@ class modTakePos extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
@@ -283,7 +283,7 @@ class modTakePos extends DolibarrModules
 				$societe->client = 1;
 				$societe->code_client = -1;
 				$societe->code_fournisseur = -1;
-				$societe->note_private = "Default customer automaticaly created by Point Of Sale module activation. Can be used as the default generic customer in the Point Of Sale setup. Can also be edited or removed if you don't need a generic customer.";
+				$societe->note_private = "Default customer automatically created by Point Of Sale module activation. Can be used as the default generic customer in the Point Of Sale setup. Can also be edited or removed if you don't need a generic customer.";
 
 				$searchcompanyid = $societe->create($user);
 			}
@@ -295,11 +295,11 @@ class modTakePos extends DolibarrModules
 			}
 		}
 
-		//Create category if not exists
+		// Create product category DefaultPOSCatLabel if not exists
 		$categories = new Categorie($this->db);
 		$cate_arbo = $categories->get_full_arbo('product', 0, 1);
 		if (is_array($cate_arbo)) {
-			if (!count($cate_arbo)) {
+			if (!count($cate_arbo) || !getDolGlobalString('TAKEPOS_ROOT_CATEGORY_ID')) {
 				$category = new Categorie($this->db);
 
 				$category->label = $langs->trans("DefaultPOSCatLabel");
@@ -308,6 +308,8 @@ class modTakePos extends DolibarrModules
 				$result = $category->create($user);
 
 				if ($result > 0) {
+					dolibarr_set_const($this->db, 'TAKEPOS_ROOT_CATEGORY_ID', $result, 'chaine', 0, 'Id of category for products visible in TakePOS', $conf->entity);
+
 					/* TODO Create a generic product only if there is no product yet. If 0 product,  we create 1. If there is already product, it is better to show a message to ask to add product in the category */
 					/*
 					$product = new Product($this->db);
@@ -323,7 +325,7 @@ class modTakePos extends DolibarrModules
 			}
 		}
 
-		//Create cash account if not exists
+		// Create cash account CASH-POS / DefaultCashPOSLabel if not exists
 		if (!getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH1')) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$cashaccount = new Account($this->db);
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index a5b318d1a2d..667320cdd76 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -22,7 +22,7 @@
 
 /**
  * 		\defgroup   tax		Module taxes
- * 		\brief      Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
+ * 		\brief      Module pour inclure des functions de saisies des taxes (tva) et charges sociales
  *      \file       htdocs/core/modules/modTax.class.php
  *      \ingroup    tax
  *      \brief      Description and activation file for the module taxes
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 7061a3a9a57..c4539befe3f 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -184,44 +184,44 @@ class modTicket extends DolibarrModules
 		$r = 0;
 		$this->rights[$r][0] = 56001; // id de la permission
 		$this->rights[$r][1] = "Read ticket"; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'read';
 
 		$r++;
 		$this->rights[$r][0] = 56002; // id de la permission
 		$this->rights[$r][1] = "Create les tickets"; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'write';
 
 		$r++;
 		$this->rights[$r][0] = 56003; // id de la permission
 		$this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'delete';
 
 		$r++;
 		$this->rights[$r][0] = 56004; // id de la permission
 		$this->rights[$r][1] = "Manage tickets"; // libelle de la permission
-		//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		//$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'manage';
 
 		$r++;
 		$this->rights[$r][0] = 56006; // id de la permission
 		$this->rights[$r][1] = "Export ticket"; // libelle de la permission
-		//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		//$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'export';
 
 		/* Seems not used and in conflict with societe->client->voir (see all thirdparties)
 		$r++;
 		$this->rights[$r][0] = 56005; // id de la permission
 		$this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'view';
 		$this->rights[$r][5] = 'all';
 		*/
diff --git a/htdocs/core/modules/modWebhook.class.php b/htdocs/core/modules/modWebhook.class.php
index 40c6bfeec1a..d8e5ac36c34 100644
--- a/htdocs/core/modules/modWebhook.class.php
+++ b/htdocs/core/modules/modWebhook.class.php
@@ -181,7 +181,7 @@ class modWebhook extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index bd37c5cceeb..becde5af45c 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -108,8 +108,8 @@ class modWorkflow extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 6001; // id de la permission
 		$this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par default
 		$this->rights[$r][4] = 'read';
 		*/
 
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index f7c0919f930..8fa1503a1ae 100644
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -165,7 +165,7 @@ class modWorkstation extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index c89a9603365..b732329f166 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -170,7 +170,7 @@ class modZapier extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sales order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 4d9a837cf5c..0e91c19feda 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -530,7 +530,7 @@ class pdf_standard extends ModelePDFMovement
 							$curY = $tab_top_newpage;
 						}
 
-						$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+						$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 						// $objp = $this->db->fetch_object($resql);
 
@@ -579,7 +579,7 @@ class pdf_standard extends ModelePDFMovement
 						$pdf->SetXY($this->posxlabel + 0.8, $curY);
 						$pdf->MultiCell($this->posxqty - $this->posxlabel - 0.8, 6, $productstatic->label, 0, 'L');
 
-						// Lot/serie
+						// Lot/series
 						$pdf->SetXY($this->posxqty, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxqty - 0.8, 3, $productlot->batch, 0, 'R');
 
@@ -587,7 +587,7 @@ class pdf_standard extends ModelePDFMovement
 						$pdf->SetXY($this->posxup, $curY);
 						$pdf->MultiCell($this->posxunit - $this->posxup - 0.8, 3, $objp->inventorycode, 0, 'R');
 
-						// Label mouvement
+						// Label movement
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 3, $objp->label, 0, 'R');
 						$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
@@ -856,7 +856,7 @@ class pdf_standard extends ModelePDFMovement
 			$pdf->MultiCell($this->posxqty - $this->posxlabel, 2, $outputlangs->transnoentities("Label"), '', 'C');
 		}
 
-		//Lot/serie Product
+		//Lot/series Product
 		//$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty, $tab_top + 1);
@@ -870,11 +870,11 @@ class pdf_standard extends ModelePDFMovement
 			$pdf->MultiCell($this->posxunit - $this->posxup, 2, $outputlangs->transnoentities("Inventory Code"), '', 'C');
 		}
 
-		//Label mouvement
+		//Label movement
 		//$pdf->line($this->posxunit, $tab_top, $this->posxunit, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxunit, $tab_top + 1);
-			$pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Mouvement"), '', 'C');
+			$pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Movement"), '', 'C');
 		}
 
 		//Origin
diff --git a/htdocs/core/modules/movement/modules_movement.php b/htdocs/core/modules/movement/modules_movement.php
index 0525793a715..1f95210055f 100644
--- a/htdocs/core/modules/movement/modules_movement.php
+++ b/htdocs/core/modules/movement/modules_movement.php
@@ -26,12 +26,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 
 
 /**
- *	Parent class to manage warehouse mouvement document templates
+ *	Parent class to manage warehouse movement document templates
  */
 abstract class ModelePDFMovement extends CommonDocGenerator
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index fe403dc402d..ced6b5f73a3 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -297,7 +297,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index bb507df6109..f77891d4635 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_vinci extends ModelePDFMo
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -116,7 +116,7 @@ class pdf_vinci extends ModelePDFMo
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
+		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support during PDF transition: TODO remove this at the end
 	}
 
 
@@ -333,7 +333,7 @@ class pdf_vinci extends ModelePDFMo
 						}
 
 
-						// apply note frame to previus pages
+						// apply note frame to previous pages
 						$i = $pageposbeforenote;
 						while ($i < $pageposafternote) {
 							$pdf->setPage($i);
@@ -565,7 +565,7 @@ class pdf_vinci extends ModelePDFMo
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// Quantity
 					// Enough for 6 chars
@@ -739,7 +739,7 @@ class pdf_vinci extends ModelePDFMo
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
@@ -1350,18 +1350,18 @@ class pdf_vinci extends ModelePDFMo
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1383,7 +1383,7 @@ class pdf_vinci extends ModelePDFMo
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index b1ccd2adabd..81ec4a4cd4c 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -128,7 +128,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 
 		//$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 		$token = $apiService->requestAccessToken(GETPOST('code'));
-		// Github is a service that does not need state to be stored as second paramater of requestAccessToken
+		// Github is a service that does not need state to be stored as second parameter of requestAccessToken
 
 		// Into constructor of GitHub, the call
 		// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index b48f9ec54da..0c612e7dd4e 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -203,7 +203,7 @@ if (!GETPOST('code')) {
 			$url .= '&login_hint='.urlencode(GETPOST('username'));
 		}
 
-		// Check that the redirect_uri that wil be used is same than url of current domain
+		// Check that the redirect_uri that will be used is same than url of current domain
 
 		// Define $urlwithroot
 		global $dolibarr_main_url_root;
@@ -283,7 +283,7 @@ if (!GETPOST('code')) {
 
 				// Verify that email is a verified email
 				/*if (empty($userinfo['email_verified'])) {
-					setEventMessages($langs->trans('Bad value for email, emai lwas not verified by Google'), null, 'errors');
+					setEventMessages($langs->trans('Bad value for email, email lwas not verified by Google'), null, 'errors');
 					$errorincheck++;
 				}*/
 
@@ -343,7 +343,7 @@ if (!GETPOST('code')) {
 			} else {
 				// If call back to url for a OAUTH2 login
 				if ($forlogin) {
-					$_SESSION["dol_loginmesg"] = "Failed to login using Google. OAuth callback URL retreives a token with non valid data";
+					$_SESSION["dol_loginmesg"] = "Failed to login using Google. OAuth callback URL retrieves a token with non valid data";
 					$errorincheck++;
 				}
 			}
diff --git a/htdocs/core/modules/oauth/microsoft_oauthcallback.php b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
index fde5371380a..26b083b7c32 100644
--- a/htdocs/core/modules/oauth/microsoft_oauthcallback.php
+++ b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
@@ -163,7 +163,7 @@ if (GETPOST('code') || GETPOST('error')) {     // We are coming from oauth provi
 
 			//$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 			$token = $apiService->requestAccessToken(GETPOST('code'));
-			// Microsoft is a service that does not need state to be stored as second paramater of requestAccessToken
+			// Microsoft is a service that does not need state to be stored as second parameter of requestAccessToken
 
 			//print $token->getAccessToken().'<br><br>';
 			//print $token->getExtraParams()['id_token'].'<br>';
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index ba0247d5915..b094b3314d2 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -138,7 +138,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 
 		//$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 		$token = $apiService->requestAccessToken(GETPOST('code'));
-		// Stripe is a service that does not need state to be stored as second paramater of requestAccessToken
+		// Stripe is a service that does not need state to be stored as second parameter of requestAccessToken
 
 		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 2e54fcbc907..4f6e499c6d2 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -134,7 +134,7 @@ if (GETPOST('code')) {     // We are coming from oauth provider page
 
 		//$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 		$token = $apiService->requestAccessToken(GETPOST('code'));
-		// Stripe is a service that does not need state to be stored as second paramater of requestAccessToken
+		// Stripe is a service that does not need state to be stored as second parameter of requestAccessToken
 
 		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 14ed5ae52cb..2381defc7b8 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -233,7 +233,7 @@ class printing_printgcp extends PrintingDriver
 			$html .= '<td>'.$printer_det['status'].'</td>';
 			$html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
 			$html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
-			// Defaut
+			// Default
 			$html .= '<td class="center">';
 			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id']) {
 				$html .= img_picto($langs->trans("Default"), 'on');
@@ -308,7 +308,7 @@ class printing_printgcp extends PrintingDriver
 		$printers = $responsedata['printers'];
 		// Check if we have printers?
 		if (is_array($printers) && count($printers) == 0) {
-			// We dont have printers so return blank array
+			// We don't have printers so return blank array
 			$ret['available'] = array();
 		} else {
 			// We have printers so returns printers as array
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 8b9bf5c5fc8..e83823777da 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -228,7 +228,7 @@ class printing_printipp extends PrintingDriver
 			//$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
 			$html .= '<td>'.$printer_det->media_default->_value0.'</td>';
 			$html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
-			// Defaut
+			// Default
 			$html .= '<td class="center">';
 			if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
 				$html .= img_picto($langs->trans("Default"), 'on');
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index b4b60ec63b2..37a72f76df5 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -23,7 +23,7 @@
 /**
  *  \file       htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
  *  \ingroup    core
- *  \brief      Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
+ *  \brief      Fichier de la class permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php';
@@ -225,9 +225,9 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Function to build PDF on disk, then output on HTTP strem.
+	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *	@param	array		$arrayofrecords		Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+	 *	@param	array		$arrayofrecords		Array of record information (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$outputdir			Output directory for pdf file
@@ -300,7 +300,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
-		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
+		// Enable  printing the label when the page was already started
 		$posX = 1;
 		$posY = 1;
 		if ($posX > 0) {
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index d0703bd4bb1..4ad68cfe233 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -23,7 +23,7 @@
 /**
  *	\file		htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
  *	\ingroup	core
- *	\brief		Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
+ *	\brief		Fichier de la class permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php';
@@ -248,9 +248,9 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Function to build PDF on disk, then output on HTTP strem.
+	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *	@param	array		$arrayofrecords		Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+	 *	@param	array		$arrayofrecords		Array of record information (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$outputdir			Output directory for pdf file
@@ -323,7 +323,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
-		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
+		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja service
 		$posX = 1;
 		$posY = 1;
 		if ($posX > 0) {
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index c91ea3d3d9d..d98d6ee8201 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -69,7 +69,7 @@ class ModelePDFLabels
  *	@param  DoliDB		$db					Database handler
  *	@param  array		$arrayofrecords		Array of records
  *	@param	string		$modele				Force le modele a utiliser ('' to not force)
- *	@param	Translate	$outputlangs		Objet lang a utiliser pour traduction
+ *	@param	Translate	$outputlangs		Object lang a utiliser pour traduction
  *	@param	string		$outputdir			Output directory
  *  @param  string      $template           pdf generenate document class to use default 'standardlabel'
  *  @param  string      $filename           Short file name of PDF output file
@@ -126,7 +126,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$template.".class.php";
 
-			// On verifie l'emplacement du modele
+			// Determine the model path and validate that it exists
 			$file = dol_buildpath($reldir."core/modules/printsheet/doc/".$file, 0);
 			if (file_exists($file)) {
 				$filefound = 1;
@@ -139,7 +139,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		}
 	}
 
-	// Charge le modele
+	// Load the model
 	if ($filefound) {
 		require_once $file;
 
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index da4c655fd63..a619a004b3a 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -306,7 +306,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 5d28341688f..2ea09bac36d 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_standard extends ModelePDFProduct
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -406,7 +406,7 @@ class pdf_standard extends ModelePDFProduct
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par default
 
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
@@ -429,7 +429,7 @@ class pdf_standard extends ModelePDFProduct
 					// Unit
 					if($conf->global->PRODUCT_USE_UNITS)
 					{
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
 					}
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 1304caa7e0b..858a62af001 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -47,7 +47,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
@@ -142,7 +142,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	public function getExample($langs, $objproduct = 0, $type = -1)
+	public function getExample($langs, $objproduct = null, $type = -1)
 	{
 		$exampleproduct = $exampleservice = '';
 
@@ -183,7 +183,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 * @param  	int		    $type       Produit ou service (0:product, 1:service)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	public function getNextValue($objproduct = 0, $type = -1)
+	public function getNextValue($objproduct = null, $type = -1)
 	{
 		global $db, $conf;
 
@@ -306,11 +306,11 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoi si un code est pris ou non (par autre tiers)
+	 *  Indicate if the code is available or not (by another third party)
 	 *
-	 *  @param	DoliDB		$db			Handler acces base
+	 *  @param	DoliDB		$db			Handler access base
 	 *  @param	string		$code		Code a verifier
-	 *  @param	Product		$product		Objet product
+	 *  @param	Product		$product		Object product
 	 *  @return	int						0 if available, <0 if KO
 	 */
 	public function verif_dispo($db, $code, $product)
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 384fff9a915..c63a321f31d 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -20,7 +20,7 @@
 /**
  *       \file       htdocs/core/modules/product/mod_codeproduct_leopard.php
  *       \ingroup    product
- *       \brief      Fichier de la classe des gestion leopard des codes produits
+ *       \brief      Fichier de la class des gestion leopard des codes produits
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
 
 /**
  *	\class 		mod_codeproduct_leopard
- *	\brief 		Classe permettant la gestion leopard des codes produits
+ *	\brief 		Class permettant la gestion leopard des codes produits
  */
 class mod_codeproduct_leopard extends ModeleProductCode
 {
@@ -52,7 +52,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 
 	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
@@ -103,7 +103,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	public function getExample($langs, $objproduct = 0, $type = -1)
+	public function getExample($langs, $objproduct = null, $type = -1)
 	{
 		return '';
 	}
@@ -115,7 +115,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return next value
 	 */
-	public function getNextValue($objproduct = 0, $type = -1)
+	public function getNextValue($objproduct = null, $type = -1)
 	{
 		return '';
 	}
diff --git a/htdocs/core/modules/product_batch/mod_lot_free.php b/htdocs/core/modules/product_batch/mod_lot_free.php
index bcba82c0ad5..a41cbb0863b 100644
--- a/htdocs/core/modules/product_batch/mod_lot_free.php
+++ b/htdocs/core/modules/product_batch/mod_lot_free.php
@@ -49,7 +49,7 @@ class mod_lot_free extends ModeleNumRefBatch
 	 */
 	public $code_modifiable;
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
diff --git a/htdocs/core/modules/product_batch/mod_sn_free.php b/htdocs/core/modules/product_batch/mod_sn_free.php
index c663833b8d4..c4af991cfd7 100644
--- a/htdocs/core/modules/product_batch/mod_sn_free.php
+++ b/htdocs/core/modules/product_batch/mod_sn_free.php
@@ -27,15 +27,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batc
 
 /**
  *	\class 		mod_codeproduct_leopard
- *	\brief 		Classe permettant la gestion leopard des codes produits
+ *	\brief 		Class permettant la gestion leopard des codes produits
  */
 class mod_sn_free extends ModeleNumRefBatch
 {
 	/*
-	 * Attention ce module est utilise par defaut si aucun module n'a
-	 * ete definit dans la configuration
-	 *
-	 * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible
+	 * :warning:
+	 *    This module is used by default if none was set in the configuration.
+	 *    Therefore, the implementation must remain as open as possible.
 	 */
 
 	/**
@@ -45,7 +44,7 @@ class mod_sn_free extends ModeleNumRefBatch
 
 	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index ec63bd80adb..26911824813 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -124,7 +124,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
-			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par default, si n'etait pas defini
 		}
 	}
 
@@ -592,7 +592,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
+					// if we have a PROJECTLEADER contact and we don't use it as recipient we store the contact object for later use
 					$contactobject = $object->contact;
 				}
 
@@ -742,7 +742,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							}
 						}
 
-						//Time ressources
+						//Time resources
 						$sql = "SELECT t.rowid, t.element_date as task_date, t.element_duration as task_duration, t.fk_user, t.note";
 						$sql .= ", u.lastname, u.firstname, t.thm";
 						$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 025f53f2ac7..3e7d0967ecd 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_baleine extends ModelePDFProjects
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -210,7 +210,7 @@ class pdf_baleine extends ModelePDFProjects
 					$tplidx = $pdf->importPage(1);
 				}
 
-				// Complete object by loading several other informations
+				// Complete object by loading several other information
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
@@ -353,7 +353,7 @@ class pdf_baleine extends ModelePDFProjects
 									$this->_pagehead($pdf, $object, 0, $outputlangs);
 								}
 								$pdf->setPage($pageposafter + 1);
-								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
 								$pdf->SetTextColor(0, 0, 0);
 
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index e582aec1a5b..ccac883e1ad 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -55,7 +55,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 class pdf_beluga extends ModelePDFProjects
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -241,7 +241,7 @@ class pdf_beluga extends ModelePDFProjects
 					$tplidx = $pdf->importPage(1);
 				}
 
-				// Complete object by loading several other informations
+				// Complete object by loading several other information
 				$task = new Task($this->db);
 				$tasksarray = array();
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
@@ -435,7 +435,7 @@ class pdf_beluga extends ModelePDFProjects
 					}
 
 					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
-					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, '', '', $projectField);
+					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, null, null, $projectField);
 
 					$num = count($elementarray);
 					if ($num >= 0) {
@@ -564,7 +564,7 @@ class pdf_beluga extends ModelePDFProjects
 												$this->_pagehead($pdf, $object, 0, $outputlangs);
 											}
 											$pdf->setPage($pageposafter + 1);
-											$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+											$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 											$pdf->MultiCell(0, 3, ''); // Set interline to 3
 											$pdf->SetTextColor(0, 0, 0);
 
@@ -598,7 +598,7 @@ class pdf_beluga extends ModelePDFProjects
 									$curY = $tab_top_newpage + $heightoftitleline + 1;
 								}
 
-								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 								// Date
 								if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') {
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 80759f92e81..66f3a9c7890 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_timespent extends ModelePDFProjects
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -205,7 +205,7 @@ class pdf_timespent extends ModelePDFProjects
 					$tplidx = $pdf->importPage(1);
 				}
 
-				// Complete object by loading several other informations
+				// Complete object by loading several other information
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
@@ -352,7 +352,7 @@ class pdf_timespent extends ModelePDFProjects
 									$this->_pagehead($pdf, $object, 0, $outputlangs);
 								}
 								$pdf->setPage($pageposafter + 1);
-								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
 								$pdf->SetTextColor(0, 0, 0);
 
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 11a60bc4a4e..d19476d7277 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonnumrefgenerator.class.php';
 abstract class ModelePDFProjects extends CommonDocGenerator
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -67,7 +67,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 
 
 /**
- *  Classe mere des modeles de numerotation des references de projets
+ *  Class mere des modeles de numerotation des references de projects
  */
 abstract class ModeleNumRefProjects extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index d542d255b4a..25eb9b4c0b0 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -657,7 +657,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$odfHandler->mergeSegment($listlinestaskres);
 					}
 
-					// Time ressources
+					// Time resources
 					$sql = "SELECT t.rowid, t.element_date as task_date, t.element_duration as task_duration, t.fk_user, t.note";
 					$sql .= ", u.lastname, u.firstname";
 					$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 91ecf105346..b07f918d279 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -19,14 +19,14 @@
 /**
  *	\file       htdocs/core/modules/project/mod_project_universal.php
  *	\ingroup    project
- *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
+ *	\brief      Fichier contenant la class du modele de numerotation de reference de projet Universal
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
- * 	Classe du modele de numerotation de reference de projet Universal
+ * 	Class du modele de numerotation de reference de projet Universal
  */
 class mod_task_universal extends ModeleNumRefTask
 {
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 63a85245ca7..a12dd5ed70a 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -343,7 +343,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 53a2b63ec49..f9f40168f75 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_azur extends ModelePDFPropales
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -561,7 +561,7 @@ class pdf_azur extends ModelePDFPropales
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// VAT Rate
 					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
@@ -582,7 +582,7 @@ class pdf_azur extends ModelePDFPropales
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -1061,7 +1061,7 @@ class pdf_azur extends ModelePDFPropales
 	 *	@param  Propal		$object         Object propal
 	 *	@param  int			$deja_regle     Amount already paid
 	 *	@param	int			$posy			Start position
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position for continuation
 	 */
@@ -1732,7 +1732,7 @@ class pdf_azur extends ModelePDFPropales
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Propal		$object         Object invoice
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index fcb5d64c92f..29c317bb131 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_cyan extends ModelePDFPropales
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -124,7 +124,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -671,7 +671,7 @@ class pdf_cyan extends ModelePDFPropales
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -1153,7 +1153,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *	@param  Propal		$object         Object proposal
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
@@ -1799,7 +1799,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Propal		$object         Object proposal
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
@@ -1854,18 +1854,18 @@ class pdf_cyan extends ModelePDFPropales
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1877,7 +1877,7 @@ class pdf_cyan extends ModelePDFPropales
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index b897e029969..9b20d84c164 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -23,8 +23,8 @@
 /**
  *  \file       htdocs/core/modules/propale/modules_propale.php
  *  \ingroup    propale
- *  \brief      Fichier contenant la classe mere de generation des propales en PDF
- *  			et la classe mere de numerotation des propales
+ *  \brief      Fichier contenant la class mere de generation des propales en PDF
+ *  			et la class mere de numerotation des propales
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis
 
 
 /**
- *	Classe mere des modeles de propale
+ *	Class mere des modeles de propale
  */
 abstract class ModelePDFPropales extends CommonDocGenerator
 {
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index e877ef29be2..a230e3e5aa9 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -66,7 +66,7 @@ class pdf_paiement extends CommonDocGenerator
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index f5af4dd8776..de5e25de9e7 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -26,14 +26,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 
 /**
- *	Classe permettant de generer les rapports de paiement
+ *	Class permettant de generer les rapports de paiement
  */
 class pdf_paiement_fourn extends pdf_paiement
 {
 	/**
 	 *  Constructor
 	 *
-	 *  @param      DoliDb		$db      Database handler
+	 *  @param      DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 3dd7619e4f2..88431592811 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -302,7 +302,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 95163db7bbc..157dc628c6a 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -20,7 +20,7 @@
 /**
  *	\file       htdocs/core/modules/reception/doc/pdf_squille.modules.php
  *	\ingroup    reception
- *	\brief      Fichier de la classe permettant de generer les bordereaux envoi au modele Squille
+ *	\brief      Fichier de la class permettant de generer les bordereaux envoi au modele Squille
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 
 /**
- *	Classe permettant de generer les borderaux envoi au modele Squille
+ *	Class permettant de generer les borderaux envoi au modele Squille
  */
 class pdf_squille extends ModelePdfReception
 {
@@ -498,7 +498,7 @@ class pdf_squille extends ModelePdfReception
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// Description
 					$pdf->SetXY($this->posxweightvol, $curY);
@@ -640,7 +640,7 @@ class pdf_squille extends ModelePdfReception
 	 *	@param  Reception	$object         Object reception
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param	int			$totalOrdered	Total ordered
 	 *  @param	int			$totalAmount	Total amount
 	 *	@return int							Position pour suite
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 66621512b54..d3ce46cd83d 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -57,7 +57,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	 *  @param		DoliDB		$db			Database handler
 	 *	@param		Conf		$conf		Handler de conf
 	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
+	 *	@param		User		$user		Handler du user connected
 	 */
 	public function __construct($db, $conf, $langs, $user)
 	{
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 09458d884c6..6c858c43fa4 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -59,7 +59,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 	public $NbRepeat;
 
 	/**
-	 * Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
+	 * Flag to 1 if we must clean ambiguous characters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
 	 *
 	 * @var integer
 	 */
@@ -78,7 +78,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *  @param		DoliDB		$db			Database handler
 	 *	@param		Conf		$conf		Handler de conf
 	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
+	 *	@param		User		$user		Handler du user connected
 	 */
 	public function __construct($db, $conf, $langs, $user)
 	{
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 0bab8e8b32b..7eb0746fd8f 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -57,7 +57,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 *  @param		DoliDB		$db			Database handler
 	 *	@param		Conf		$conf		Handler de conf
 	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
+	 *	@param		User		$user		Handler du user connected
 	 */
 	public function __construct($db, $conf, $langs, $user)
 	{
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 4f5aedc7684..ec17cac6e9b 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -32,7 +32,7 @@ abstract class ModeleGenPassword
 	public $picto = 'generic';
 
 	/**
-	 * Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
+	 * Flag to 1 if we must clean ambiguous characters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
 	 *
 	 * @var integer
 	 */
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index fdc1f870c41..c06fecc1af4 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -46,7 +46,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	public $code_modifiable;
 
 	/**
-	 * @var int Code modifiable si il est invalide
+	 * @var int Code modifiable si il est invalid
 	 */
 	public $code_modifiable_invalide;
 
@@ -94,6 +94,8 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function __construct($db)
 	{
+		$this->db = $db;
+
 		$this->code_null = 0;
 		$this->code_modifiable = 1;
 		$this->code_modifiable_invalide = 1;
@@ -344,11 +346,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *		Renvoi si un code est pris ou non (par autre tiers)
+	 *		Indicate if the code is available or not (by another third party)
 	 *
-	 *		@param	DoliDB		$db			Handler acces base
+	 *		@param	DoliDB		$db			Handler access base
 	 *		@param	string		$code		Code a verifier
-	 *		@param	Societe		$soc		Objet societe
+	 *		@param	Societe		$soc		Object societe
 	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
 	 *		@return	int						0 if available, <0 if KO
 	 */
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 18bb5dcf5fe..5330b6c1f54 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -20,7 +20,7 @@
 /**
  *       \file       htdocs/core/modules/societe/mod_codeclient_leopard.php
  *       \ingroup    societe
- *       \brief      Fichier de la classe des gestion leopard des codes clients
+ *       \brief      Fichier de la class des gestion leopard des codes clients
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
 class mod_codeclient_leopard extends ModeleThirdPartyCode
 {
 	/*
-	 * Attention ce module est utilise par defaut si aucun module n'a
-	 * ete definit dans la configuration
+	 * Attention ce module est utilise par default si aucun module n'a
+	 * ete definite dans la configuration
 	 *
 	 * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible
 	 */
@@ -45,7 +45,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 
 	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
@@ -70,6 +70,8 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 */
 	public function __construct($db)
 	{
+		$this->db = $db;
+
 		$this->code_null = 1;
 		$this->code_modifiable = 1;
 		$this->code_modifiable_invalide = 1;
@@ -112,7 +114,6 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 */
 	public function getNextValue($objsoc = 0, $type = -1)
 	{
-		global $langs;
 		return '';
 	}
 
@@ -132,8 +133,6 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 */
 	public function verif($db, &$code, $soc, $type)
 	{
-		global $conf;
-
 		$result = 0;
 		$code = trim($code);
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 5e788514204..f8f4235e81b 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -21,14 +21,14 @@
 /**
  *       \file       htdocs/core/modules/societe/mod_codeclient_monkey.php
  *       \ingroup    societe
- *       \brief      Fichier de la classe des gestion lion des codes clients
+ *       \brief      Fichier de la class des gestion lion des codes clients
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 
 
 /**
- *	Classe permettant la gestion monkey des codes tiers
+ *	Class permettant la gestion monkey des codes tiers
  */
 class mod_codeclient_monkey extends ModeleThirdPartyCode
 {
@@ -39,7 +39,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalid
 
 	public $code_modifiable_null; // Code modifiables si il est null
 
@@ -70,6 +70,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function __construct($db)
 	{
+		$this->db = $db;
+
 		$this->code_null = 1;
 		$this->code_modifiable = 1;
 		$this->code_modifiable_invalide = 1;
@@ -114,7 +116,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function getNextValue($objsoc = 0, $type = -1)
 	{
-		global $db, $conf, $mc;
+		global $db;
 
 		$field = '';
 		$prefix = '';
@@ -128,7 +130,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			return -1;
 		}
 
-		// First, we get the max value (reponse immediate car champ indexe)
+		// First, we get the max value (response immediate car champ indexe)
 		$posindice = strlen($prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
@@ -178,8 +180,6 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function verif($db, &$code, $soc, $type)
 	{
-		global $conf;
-
 		$result = 0;
 		$code = strtoupper(trim($code));
 
@@ -211,19 +211,17 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *		Renvoi si un code est pris ou non (par autre tiers)
+	 *		Indicates if the code is available or not (by another third party)
 	 *
-	 *		@param	DoliDB		$db			Handler acces base
+	 *		@param	DoliDB		$db			Handler access base
 	 *		@param	string		$code		Code a verifier
-	 *		@param	Societe		$soc		Objet societe
+	 *		@param	Societe		$soc		Object societe
 	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
 	 *		@return	int						0 if available, <0 if KO
 	 */
 	public function verif_dispo($db, $code, $soc, $type = 0)
 	{
 		// phpcs:enable
-		global $conf, $mc;
-
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
 		if ($type == 1) {
 			$sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
@@ -251,7 +249,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoi si un code respecte la syntaxe
+	 *  Renvoi si un code respecte la syntax
 	 *
 	 *  @param  string      $code       Code a verifier
 	 *  @return int                     0 si OK, <0 si KO
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 0d4a9d69dcd..9899db44b21 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -309,7 +309,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index e2cb7c6c17a..da930624da1 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -347,7 +347,7 @@ class pdf_standard extends ModelePDFStock
 							$curY = $tab_top_newpage;
 						}
 
-						$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+						$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 						$productstatic->id = $objp->rowid;
 						$productstatic->ref = $objp->ref;
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index e0acbea66e5..cd5ad31db44 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -24,7 +24,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 abstract class ModelePDFStock extends CommonDocGenerator
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 7f42f2e83c2..304a2218647 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 class pdf_eagle extends ModelePDFStockTransfer
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -74,8 +74,20 @@ class pdf_eagle extends ModelePDFStockTransfer
 	 * @var int posx weightvol
 	 */
 	public $posxweightvol;
+
+	/**
+	 * @var int posx warehousesource
+	 */
 	public $posxwarehousesource;
+
+	/**
+	 * @var int posx warehousedestination
+	 */
 	public $posxwarehousedestination;
+
+	/**
+	 * @var int at Least One Batch
+	 */
 	public $atLeastOneBatch;
 
 	/**
@@ -83,7 +95,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	public function __construct($db = 0)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -534,7 +546,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// Lot / série
 					if (isModEnabled('productbatch')) {
@@ -699,7 +711,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 	 *	@param  StockTransfer	$object         Object invoice
 	 *	@param  int				$deja_regle     Montant deja regle
 	 *	@param	int				$posy			Position depart
-	 *	@param	Translate		$outputlangs	Objet langs
+	 *	@param	Translate		$outputlangs	Object langs
 	 *	@return int								Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
index 8e2c7c64979..7973c3425f9 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_eagle_proforma extends ModelePDFCommandes
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -629,7 +629,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -889,7 +889,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			$posy=$pdf->GetY()+1;
 		}*/
 
-		// Show planed date of delivery
+		// Show planned date of delivery
 		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1000,7 +1000,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
@@ -1488,18 +1488,18 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1511,7 +1511,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index 36ff93a744a..46d41a2f480 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -306,7 +306,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index a6bdd688a07..96e637adca2 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_canelle extends ModelePDFSuppliersInvoices
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -444,7 +444,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -610,7 +610,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *	@param  FactureFournisseur	$object         Object invoice
 	 *	@param  int					$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int					$posy			Position depart
-	 *	@param	Translate			$outputlangs	Objet langs
+	 *	@param	Translate			$outputlangs	Object langs
 	 *	@return int									Position of cursor after output
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 5193d053b5d..36be92a41ba 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -302,7 +302,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index a9146dd35e1..61681bc51e0 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_cornas extends ModelePDFSuppliersOrders
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -119,7 +119,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
+		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support during PDF transition: TODO remove this at the end
 
 		$this->tabTitleHeight = 5; // default height
 
@@ -409,7 +409,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						}
 
 
-						// apply note frame to previus pages
+						// apply note frame to previous pages
 						$i = $pageposbeforenote;
 						while ($i < $pageposafternote) {
 							$pdf->setPage($i);
@@ -578,7 +578,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat')) {
@@ -605,7 +605,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -910,7 +910,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
@@ -1474,18 +1474,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		 $this->cols['theColKey'] = array(
 		 'rank' => $rank, // int : use for ordering columns
 		 'width' => 20, // the column width in mm
 		 'title' => array(
 		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 		 'label' => ' ', // the final label : used fore final generated text
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 'content' => array(
-		 'align' => 'L', // text alignement :  R,C,L
+		 'align' => 'L', // text alignment :  R,C,L
 		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 		 ),
 		 );
@@ -1497,7 +1497,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 1bbb8cbf623..91a780c6c4a 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_muscadet extends ModelePDFSuppliersOrders
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -482,7 +482,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// VAT Rate
 					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
@@ -505,7 +505,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -788,7 +788,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 3f03b6c1b16..35aec96e909 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -20,14 +20,14 @@
 /**
  *    	\file       htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
  *		\ingroup    commande
- *		\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet
+ *		\brief      Fichier contenant la class du modele de numerotation de reference de commande fournisseur Muguet
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 
 
 /**
- *	Classe du modele de numerotation de reference de commande fournisseur Muguet
+ *	Class du modele de numerotation de reference de commande fournisseur Muguet
  */
 class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 {
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 9132d35c8a2..7535fab0482 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -21,14 +21,14 @@
 /**
  *	\file       htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
  *	\ingroup    commande
- *	\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee
+ *	\brief      File for class for 'orchidee' type numbering the supplier orders
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 
 
 /**
- *	Classe du modele de numerotation de reference de commande fournisseur Orchidee
+ *	Class providing the 'Orchidee' numbering models for supplier orders
  */
 class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 {
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 9f4e77a2b97..c5319938818 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
 class pdf_standard extends ModelePDFSuppliersPayments
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -353,7 +353,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// ref fourn
 					$pdf->SetXY($this->posxreffacturefourn, $curY);
@@ -487,7 +487,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *	@param	TCPDF			$pdf			Object PDF
 	 *	@param  PaiementFourn	$object         Object PaiementFourn
 	 *	@param	int				$posy			Position depart
-	 *	@param	Translate		$outputlangs	Objet langs
+	 *	@param	Translate		$outputlangs	Object langs
 	 *	@return int								Position pour suite
 	 */
 	protected function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 4130df223c4..1f2ee456924 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -330,7 +330,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index e84248c114f..532a02a469f 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_aurore extends ModelePDFSupplierProposal
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -480,7 +480,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -489,7 +489,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
@@ -868,7 +868,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 8364b587e6d..f7db023cd8f 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_zenith extends ModelePDFSupplierProposal
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -118,7 +118,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
+		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support during PDF transition: TODO remove this at the end
 
 		$this->tabTitleHeight = 5; // default height
 
@@ -408,7 +408,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 						}
 
 
-						// apply note frame to previus pages
+						// apply note frame to previous pages
 						$i = $pageposbeforenote;
 						while ($i < $pageposafternote) {
 							$pdf->setPage($i);
@@ -577,7 +577,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat')) {
@@ -604,7 +604,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 					// Unit
 					if ($this->getColumnStatus('unit')) {
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -909,7 +909,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@param	Translate	$outputlangs	Object langs
 	 *	@return int							Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
@@ -1476,7 +1476,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index d54b9629178..84517038a74 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -23,8 +23,8 @@
 /**
  *  \file       htdocs/core/modules/propale/modules_propale.php
  *  \ingroup    propale
- *  \brief      Fichier contenant la classe mere de generation des propales en PDF
- *  			et la classe mere de numerotation des propales
+ *  \brief      File for the parent class of PDF proposal generation
+ *  			 and parent class of proposals and proposal numbering
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis
 
 
 /**
- *	Classe mere des modeles de propale
+ *	Perent class of the Proposal models
  */
 abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 {
@@ -60,7 +60,7 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 
 
 /**
- *	Classe mere des modeles de numerotation des references de propales
+ *	Parent class of the Proposal numbering model classes
  */
 abstract class ModeleNumRefSupplierProposal extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php
index 7a296d85f15..88894d4fa8a 100644
--- a/htdocs/core/modules/takepos/modules_takepos.php
+++ b/htdocs/core/modules/takepos/modules_takepos.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonnumrefgenerator.class.php';
 
 
 /**
- *  Classe mere des modeles de numerotation des tickets de caisse
+ *  Parent Class of the models to number the cash register receipts
  */
 abstract class ModeleNumRefTakepos extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 5f45b253c2e..6904febfe28 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -296,7 +296,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index b8c2754ad12..0278ade325d 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -57,7 +57,7 @@ abstract class ModelePDFTicket extends CommonDocGenerator
 
 
 /**
- *  Classe mere des modeles de numerotation des references de projets
+ *  Parent Class of the project reference numbering model classes
  */
 abstract class ModeleNumRefTicket extends CommonNumRefGenerator
 {
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index fa746b86c61..c4a13084560 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -327,7 +327,7 @@ class doc_generic_user_odt extends ModelePDFUser
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index d25b59ed894..8830d63a554 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -330,7 +330,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 7eb1dd464bc..78db690f00b 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -242,7 +242,7 @@ print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
 
-// Customer Default Langauge
+// Customer Default Language
 if (getDolGlobalInt('MAIN_MULTILANGS')) {
 	print '<tr><td>'.$langs->trans("DefaultLang");
 	if (!empty($array_query['cust_language'])) {
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 047e09a1e93..267c56e42a7 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -73,4 +73,4 @@ print '<div id="'.$blocname.'_bloc" class="'.($hide ? 'hideobject' : 'nohideobje
 include DOL_DOCUMENT_ROOT.'/core/tpl/'.$blocname.'.tpl.php';
 print '</div><br>';
 ?>
-<!-- END PHP TEMPLATE BLOC SHOW/HIDE -->
+<!-- END PHP TEMPLATE BLOCK SHOW/HIDE -->
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 0ba296fffea..2eab1e2d90e 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -20,7 +20,7 @@
  */
 
 /*
- * Code to ouput content when action is presend
+ * Code to output content when action is presend
  *
  * $trackid must be defined
  * $modelmail
@@ -210,7 +210,7 @@ if ($action == 'presend') {
 		$fuser->fetch($object->fk_user);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
 	} else {
-		// For exemple if element is project
+		// For example if element is project
 		if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) {
 			$object->fetch_thirdparty();
 		}
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 48642f29135..9f8c49198ec 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -151,7 +151,7 @@ foreach ($object->fields as $key => $val) {
 
 	$rightpart .= '<tr><td';
 	$rightpart .= ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
-	//if ($val['notnull'] > 0) $rightpart .= ' fieldrequired';		// No fieldrequired inthe view output
+	//if ($val['notnull'] > 0) $rightpart .= ' fieldrequired';		// No fieldrequired in the view output
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
 		$rightpart .= ' tdtop';
 	}
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index d9b01c57bab..b917090f960 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -34,7 +34,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 				}
 				// If field is a computed field, we make computation to get value
 				if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
-					$objectoffield = $object; //For compatibily with the computed formula
+					$objectoffield = $object; //For compatibility with the computed formula
 					$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '2');
 					if (is_numeric(price2num($value)) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
 						$obj->$tmpkey = price2num($value);
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 0c3d98f03a6..ff858ef0d29 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -10,7 +10,7 @@ if (empty($extrafieldsobjectkey) && is_object($object)) {
 	$extrafieldsobjectkey = $object->table_element;
 }
 
-// Loop to complete the sql search criterias from extrafields
+// Loop to complete the sql search criteria from extrafields
 if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 	if (empty($extrafieldsobjectprefix)) {
 		$extrafieldsobjectprefix = 'ef.';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 073bd71f479..6f81ec20683 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -81,7 +81,6 @@ $php_self = preg_replace('/(\?|&amp;|&)token=[^&]+/', '\1', $php_self);
 
 // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
 $arrayofjs = array(
-	'/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),
 	'/core/js/dst.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))
 );
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 95538b90bc5..edeff7d71e1 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -295,7 +295,7 @@ if ($massaction == 'presend') {
 	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 
-	// Tableau des parametres complementaires du post
+	// Tableau des parameters complementaires du post
 	$formmail->param['action'] = $action;
 	$formmail->param['models'] = $modelmail;	// the filter to know which kind of template emails to show. 'none' means no template suggested.
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int') ? GETPOST('modelmailselected', 'int') : '-1';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index c8a80fba260..c3647f5f316 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -295,7 +295,7 @@ if ($nolinesbefore) {
 				} else {
 					$ajaxoptions = array(
 						// Disabled: This is useless because setting discount and price_ht after a selection is already managed
-						// by ths page itself with a .change on the combolist '#idprodfournprice'
+						// by this page itself with a .change on the combolist '#idprodfournprice'
 						//'update' => array('remise_percent' => 'discount', 'price_ht' => 'price_ht')			// html id tags that will be edited with each ajax json response key
 					);
 					$alsoproductwithnosupplierprice = 1;
@@ -498,7 +498,7 @@ if ($nolinesbefore) {
 	<?php
 	if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td class="nobottom nowrap right"><input class="falt right" type="text" size="1" value="" name="progress"><span class="opacitymedium hideonsmartphone">%</span></td>';
+		print '<td class="nobottom nowrap right"><input class="flat right" type="text" size="1" value="" name="progress"><span class="opacitymedium hideonsmartphone">%</span></td>';
 		$coldisplay++;
 		print '<td></td>';
 	}
@@ -676,7 +676,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 				price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));
 		}
 
-		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value
+		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formatted value
 
 		return true;
 	}
@@ -788,7 +788,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 				console.log("objectline_create.tpl We are in a price per qty context, we do not call ajax/product, init of fields is done few lines later");
 			} else {
 				<?php if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) { ?>
-					if (isNaN(pbq)) { console.log("We use experimental option PRODUIT_CUSTOMER_PRICES_BY_QTY or PRODUIT_CUSTOMER_PRICES_BY_QTY but we could not get the id of pbq from product combo list, so load of price may be 0 if product has differet prices"); }
+					if (isNaN(pbq)) { console.log("We use experimental option PRODUIT_CUSTOMER_PRICES_BY_QTY or PRODUIT_CUSTOMER_PRICES_BY_QTY but we could not get the id of pbq from product combo list, so load of price may be 0 if product has different prices"); }
 				<?php } ?>
 				// Get the price for the product and display it
 				console.log("Load unit price and set it into #price_ht or #price_ttc for product id="+$(this).val()+" socid=<?php print $object->socid; ?>");
@@ -807,7 +807,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 						$('#date_start').attr('mandatoryperiod', data.mandatory_period);
 						$('#date_end').attr('mandatoryperiod', data.mandatory_period);
 
-						// service and we setted mandatory_period to true
+						// service and we set mandatory_period to true
 						if (data.mandatory_period == 1 && data.type == 1) {
 							jQuery('#date_start').addClass('inputmandatory');
 							jQuery('#date_end').addClass('inputmandatory');
@@ -876,7 +876,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 						var proddesc = data.desc;
 								<?php
 							} ?>
-						console.log("objectline_create.tpl Load desciption into text area : "+proddesc);
+						console.log("objectline_create.tpl Load description into text area : "+proddesc);
 							<?php
 							if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) { ?>
 						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
@@ -948,13 +948,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 						{
 							i++;
 							this.price = parseFloat(this.price); // to fix when this.price >0
-							// If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0)
+							// If margin is calculated on best supplier price, we set it by default (but only if value is not 0)
 							//console.log("id="+this.id+"-price="+this.price+"-"+(this.price > 0));
 							if (bestpricefound == 0 && this.price > 0) { defaultkey = this.id; defaultprice = this.price; bestpriceid = this.id; bestpricevalue = this.price; bestpricefound=1; }	// bestpricefound is used to take the first price > 0
 						}
 						if (this.id == 'pmpprice')
 						{
-							// If margin is calculated on PMP, we set it by defaut (but only if value is not 0)
+							// If margin is calculated on PMP, we set it by default (but only if value is not 0)
 							console.log("id="+this.id+"-price="+this.price);
 							if ('pmp' == defaultbuyprice || 'costprice' == defaultbuyprice)
 							{
@@ -966,7 +966,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 						}
 						if (this.id == 'costprice')
 						{
-							// If margin is calculated on Cost price, we set it by defaut (but only if value is not 0)
+							// If margin is calculated on Cost price, we set it by default (but only if value is not 0)
 							console.log("id="+this.id+"-price="+this.price+"-pmppricevalue="+pmppricevalue);
 							if ('costprice' == defaultbuyprice)
 							{
@@ -1115,7 +1115,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			var description = $('option:selected', this).attr('data-description');
 			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
 
-			console.log("Load desciption into text area : "+description);
+			console.log("Load description into text area : "+description);
 				<?php
 				if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) {
 					?>
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ca0d6d95f3b..948ee08ae50 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -143,7 +143,7 @@ $coldisplay++;
 	}
 
 	// Do not allow editing during a situation cycle
-	// but in some situations that is required (update legal informations for example)
+	// but in some situations that is required (update legal information for example)
 	if (getDolGlobalString('INVOICE_SITUATION_CAN_FORCE_UPDATE_DESCRIPTION')) {
 		$situationinvoicelinewithparent = 0;
 	}
@@ -178,7 +178,7 @@ $coldisplay++;
 		}
 	}
 
-	// Show autofill date for recuring invoices
+	// Show autofill date for recurring invoices
 	if (isModEnabled("service") && $line->product_type == 1 && ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec')) {
 		if ($line->element == 'invoice_supplier_det_rec') {
 			$line->date_start_fill = $line->date_start;
@@ -321,7 +321,7 @@ $coldisplay++;
 		if ($user->hasRight('margins', 'creer')) {
 			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				$margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
-				// if credit note, dont allow to modify margin
+				// if credit note, don't allow to modify margin
 				if ($line->subprice < 0) {
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="opacitymedium hideonsmartphone">%</span></td>';
 				} else {
@@ -331,7 +331,7 @@ $coldisplay++;
 			}
 			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
-				// if credit note, dont allow to modify margin
+				// if credit note, don't allow to modify margin
 				if ($line->subprice < 0) {
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="opacitymedium hideonsmartphone">%</span></td>';
 				} else {
@@ -469,7 +469,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			else if (npRate == "np_markRate")
 				price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));
 		}
-		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value
+		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formatted value
 
 		return true;
 	}
@@ -515,11 +515,11 @@ jQuery(document).ready(function()
 	if (isModEnabled('margin')) {
 		?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
-		jQuery("#tva_tx").click(function() {						/* somtimes field is a text, sometimes a combo */
+		jQuery("#tva_tx").click(function() {						/* sometimes field is a text, sometimes a combo */
 			jQuery("input[name='np_marginRate']:first").val('');
 			jQuery("input[name='np_markRate']:first").val('');
 		});
-		jQuery("#tva_tx").keyup(function() {						/* somtimes field is a text, sometimes a combo */
+		jQuery("#tva_tx").keyup(function() {						/* sometimes field is a text, sometimes a combo */
 			jQuery("input[name='np_marginRate']:first").val('');
 			jQuery("input[name='np_markRate']:first").val('');
 		});
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 7d243729a09..199dc6aab77 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -342,7 +342,7 @@ if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
 	// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 	// must also not be output for most entities (proposal, intervention, ...)
 	//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-	print price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
+	print price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formatting role of function price
 } else {
 	print '&nbsp;';
 }
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 96eb6b0ee3d..5351f59c1b7 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -416,7 +416,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				//Compare array
 				$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
 				if (count($diff_array) == 0) {
-					//No diff => mean everythings is shipped
+					//No diff => mean everything is shipped
 					$ret = $order->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
 					if ($ret < 0) {
 						$this->setErrorsFromObject($order);
@@ -486,7 +486,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				//Compare array
 				$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
 				if (count($diff_array) == 0) {
-					//No diff => mean everythings is received
+					//No diff => mean everything is received
 					$ret = $order->setStatut(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY, null, null, 'SUPPLIER_ORDER_CLOSE');
 					if ($ret < 0) {
 						$this->setErrorsFromObject($order);
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index b4cd2d2ce53..c129095017f 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -1367,7 +1367,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// TODO Merge all previous cases into this generic one
 			// $action = PASSWORD, BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
 			// Can also be a value defined by an external module like SENTBYSMS, COMPANY_SENTBYSMS, MEMBER_SENTBYSMS, ...
-			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
+			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at beginning of this function).
 			// Note that these key can be set in agenda setup, only if defined into llx_c_action_trigger
 			if (!empty($object->context['actionmsg']) && empty($object->actionmsg)) {	// For description
 				$object->actionmsg = $object->context['actionmsg'];
@@ -1458,9 +1458,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$now = dol_now();
 
 		if (isset($_SESSION['listofnames-'.$object->trackid])) {
-			$attachs = $_SESSION['listofnames-'.$object->trackid];
-			if ($attachs && strpos($action, 'SENTBYMAIL')) {
-				$object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
+			$attachments = $_SESSION['listofnames-'.$object->trackid];
+			if ($attachments && strpos($action, 'SENTBYMAIL')) {
+				$object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachments);
 			}
 		}
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index a515078bc70..87a46036fc9 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -67,7 +67,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		if (!getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED') || !in_array($action, explode(',', getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED')))) {
 			// If custom actions are not set or if action not into custom actions, we can exclude action if object->elementis not valid
 			$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-			if (!in_array($object->element, $listofqualifiedelement)) {
+			if (!is_object($object) || !property_exists($object, 'element') || !in_array($object->element, $listofqualifiedelement)) {
 				return 1;
 			}
 		}
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 7c484c49b49..ccd403aa611 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -260,7 +260,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 				}
 			}
 		} elseif ($action == 'USERGROUP_CREATE') {
-			// Groupes
+			// Groups
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 8b992b79022..bea7284cb01 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -20,12 +20,12 @@
  *  \file       htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
  *  \ingroup    core
  *  \brief      Fichier
- *  \remarks    Son propre fichier d'actions peut etre cree par recopie de celui-ci:
- *              - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php
- *                                           ou: interface_99_all_Mytrigger.class.php
- *              - Le fichier doit rester stocke dans core/triggers
- *              - Le nom de la classe doit etre InterfaceMytrigger
- *              - Le nom de la propriete name doit etre Mytrigger
+ *  \remarks    This file can be used as a template for creating your own action file:
+ *              - The file name must be: interface_99_modMymodule_Mytrigger.class.php
+ *                                   or: interface_99_all_Mytrigger.class.php
+ *              - The file must be located in core/triggers
+ *              - The class name must be InterfaceMytrigger
+ *              - The property name must be Mytrigger
  */
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
diff --git a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
index ea846616096..983449b23ac 100644
--- a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
@@ -195,7 +195,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			// case 'PRODUCT_SET_MULTILANGS':
 			// case 'PRODUCT_DEL_MULTILANGS':
 
-			//Stock mouvement
+			//Stock movement
 			// case 'STOCK_MOVEMENT':
 
 			//MYECMDIR
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 990f0b5f91d..30dd8e920a8 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -89,7 +89,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontodelete) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
 	} else {
-		Header("Location: ".DOL_URL_ROOT.'/cron/list.php');
+		header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		exit;
 	}
 }
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5729d136869..1431dc400fd 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2023		William Mead		<william.mead@manchenumerique.fr>
  *
  * 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
@@ -192,7 +193,7 @@ class Cronjob extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -512,16 +513,16 @@ class Cronjob extends CommonObject
 	 *  Load list of cron jobs in a memory array from the database
 	 *  @TODO Use object CronJob and not CronJobLine.
 	 *
-	 *  @param	string		$sortorder      sort order
-	 *  @param	string		$sortfield      sort field
-	 *  @param	int			$limit		    limit page
-	 *  @param	int			$offset    	    page
-	 *  @param	int			$status    	    display active or not
-	 *  @param	array		$filter    	    filter output
-	 *  @param  int         $processing     Processing or not
-	 *  @return int          			    Return integer <0 if KO, >0 if OK
+	 *  @param	string		$sortorder		sort order
+	 *  @param	string		$sortfield		sort field
+	 *  @param	int			$limit			limit page
+	 *  @param	int			$offset			page
+	 *  @param	int			$status			display active or not
+	 *  @param	array		$filter			filter output
+	 *  @param	int			$processing		Processing or not
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
+	public function fetchAll($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = [], $processing = -1)
 	{
 		$this->lines = array();
 
@@ -1023,7 +1024,7 @@ class Cronjob extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index aeaede39bb8..3c3cae35e12 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -164,7 +164,7 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 
-			// Programm next run
+			// Plan next run
 			$res = $object->reprogram_jobs($user->login, $now);
 			if ($res > 0) {
 				if ($resrunjob >= 0) {	// We show the result of reprogram only if no error message already reported
@@ -490,7 +490,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("Priority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("CronModule", $_SERVER["PHP_SELF"], "t.module_name", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100 ');
 print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 0e30db94d84..805cc537f38 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -102,7 +102,7 @@ class ActionsDatapolicy extends CommonHookActions
 
 		// FIXME Removed hard coded id, use codes
 		if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
-			// on verifie si l'objet est utilisé
+			// Verify if the object is used
 			if ($object->isObjectUsed(GETPOST('socid'))) {
 				$object->name = $langs->trans('ANONYME');
 				$object->name_alias = '';
@@ -252,7 +252,7 @@ class ActionsDatapolicy extends CommonHookActions
 			}
 
 			if (GETPOST('socid')) {
-				/* Removed due to awful harcoded values
+				/* Removed due to awful hardcoded values
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$societe = new Societe($this->db);
 				$societe->fetch(GETPOST('socid'));
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 3693c240285..9ebe9ae4099 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -147,7 +147,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 	// Check date validity
 	if ($user->isNotIntoValidityDateRange()) {
 		// User validity dates are no more valid
-		dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
+		dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now());
 		return false;
 	}
 
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 9b40abdb668..6f9af2136c7 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 class TraceableDB extends DoliDB
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db; // cannot be protected because of parent declaration
 	/**
@@ -75,8 +75,8 @@ class TraceableDB extends DoliDB
 	 * Format a SQL IF
 	 *
 	 * @param   string $test Test string (example: 'cd.statut=0', 'field IS NULL')
-	 * @param   string $resok resultat si test egal
-	 * @param   string $resko resultat si test non egal
+	 * @param   string $resok resultat si test equal
+	 * @param   string $resko resultat si test non equal
 	 * @return	string                SQL string
 	 */
 	public function ifsql($test, $resok, $resko)
@@ -102,7 +102,7 @@ class TraceableDB extends DoliDB
 	 * Function to use to build INSERT, UPDATE or WHERE predica
 	 *
 	 *   @param	    int		$param      Date TMS to convert
-	 *	 @param		mixed	$gm			'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
+	 *	 @param		mixed	$gm			'gmt'=Input information are GMT values, 'tzserver'=Local to server TZ
 	 *   @return	string      		Date in a string YYYY-MM-DD HH:MM:SS
 	 */
 	public function idate($param, $gm = 'tzserver')
@@ -124,7 +124,7 @@ class TraceableDB extends DoliDB
 	 * Start transaction
 	 *
 	 * @param	string	$textinlog		Add a small text into log. '' by default.
-	 * @return  int         			1 if transaction successfuly opened or already opened, 0 if error
+	 * @return  int         			1 if transaction successfully opened or already opened, 0 if error
 	 */
 	public function begin($textinlog = '')
 	{
@@ -197,7 +197,7 @@ class TraceableDB extends DoliDB
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '')
@@ -209,7 +209,7 @@ class TraceableDB extends DoliDB
 	 *  List tables into a database with table info
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTablesFull($database, $table = '')
@@ -323,7 +323,7 @@ class TraceableDB extends DoliDB
 	 *	Cancel a transaction and go back to initial data values
 	 *
 	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
+	 * 	@return	resource|int         		1 if cancellation is ok or transaction not open, 0 if error
 	 */
 	public function rollback($log = '')
 	{
@@ -387,7 +387,7 @@ class TraceableDB extends DoliDB
 	}
 
 	/**
-	 * Connexion to server
+	 * Connection to server
 	 *
 	 * @param   string $host database server host
 	 * @param   string $login login
@@ -483,7 +483,7 @@ class TraceableDB extends DoliDB
 	/**
 	 * Return generic error code of last operation.
 	 *
-	 * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 * @return    string        Error code (Examples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	public function errno()
 	{
@@ -533,7 +533,7 @@ class TraceableDB extends DoliDB
 	 *
 	 * @param    string $table 				Name of table
 	 * @param    string $field_name 		Name of field to add
-	 * @param    string $field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
+	 * @param    string $field_desc 		Tableau associatif de description du champ a inserer[nom du parameter][valeur du parameter]
 	 * @param    string $field_position 	Optionnel ex.: "after champtruc"
 	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
@@ -614,7 +614,7 @@ class TraceableDB extends DoliDB
 	 *
 	 * @param    string $dolibarr_main_db_host 	Ip serveur
 	 * @param    string $dolibarr_main_db_user 	Nom user a creer
-	 * @param    string $dolibarr_main_db_pass 	Mot de passe user a creer
+	 * @param    string $dolibarr_main_db_pass 	Password user a creer
 	 * @param    string $dolibarr_main_db_name 	Database name where user must be granted
 	 * @return   int                            Return integer <0 if KO, >=0 if OK
 	 */
@@ -630,7 +630,7 @@ class TraceableDB extends DoliDB
 	 * 19700101020000 -> 7200 whaterver is TZ if gmt=1
 	 *
 	 * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
+	 * @param	bool			$gm			1=Input information are GMT values, otherwise local to server TZ
 	 * @return	int|string					Date TMS or ''
 	 */
 	public function jdate($string, $gm = false)
@@ -667,7 +667,7 @@ class TraceableDB extends DoliDB
 	 * List information of columns into a table.
 	 *
 	 * @param   string 			$table 			Name of table
-	 * @return  array                			Array with inforation on table
+	 * @return  array                			Array with information on table
 	 */
 	public function DDLInfoTable($table)
 	{
@@ -686,9 +686,9 @@ class TraceableDB extends DoliDB
 	}
 
 	/**
-	 * Close database connexion
+	 * Close database connection
 	 *
-	 * @return  boolean     					True if disconnect successfull, false otherwise
+	 * @return  boolean     					True if disconnect successful, false otherwise
 	 * @see     connect()
 	 */
 	public function close()
@@ -707,9 +707,9 @@ class TraceableDB extends DoliDB
 	}
 
 	/**
-	 * Return connexion ID
+	 * Return connection ID
 	 *
-	 * @return  string      Id connexion
+	 * @return  string      Id connection
 	 */
 	public function DDLGetConnectId()
 	{
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 442d3df7453..54e1cb1e07f 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -696,11 +696,11 @@ if ($action == 'create') {
 			print '</div></div>';
 		} else {
 			/* Expedition non trouvee */
-			print "Expedition inexistante ou acces refuse";
+			print "Expedition inexistante ou access refuse";
 		}
 	} else {
 		/* Expedition non trouvee */
-		print "Expedition inexistante ou acces refuse";
+		print "Expedition inexistante ou access refuse";
 	}
 }
 
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index b9a5aad392a..37c5f3a0a17 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -83,7 +83,7 @@ class Delivery extends CommonObject
 	public $socid;
 
 	/**
-	 * @var string ref custome
+	 * @var string ref customer
 	 */
 	public $ref_customer;
 
@@ -143,7 +143,7 @@ class Delivery extends CommonObject
 	/**
 	 *  Create delivery receipt in database
 	 *
-	 *  @param 	User	$user       Objet du user qui cree
+	 *  @param 	User	$user       Object du user qui cree
 	 *  @return int         		Return integer <0 si erreur, id delivery cree si ok
 	 */
 	public function create($user)
@@ -991,7 +991,7 @@ class Delivery extends CommonObject
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -1040,7 +1040,7 @@ class Delivery extends CommonObject
 			while ($i < $num_lines) {
 				$objSourceLine = $this->db->fetch_object($resultSourceLine);
 
-				// Get lines of sources alread delivered
+				// Get lines of sources already delivered
 				$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
 				$sql .= " FROM ".MAIN_DB_PREFIX."deliverydet as ld, ".MAIN_DB_PREFIX."delivery as l,";
 				$sql .= " ".MAIN_DB_PREFIX.$this->linked_objects[0]['type']." as c";
@@ -1082,7 +1082,7 @@ class Delivery extends CommonObject
 	/**
 	 *	Set the planned delivery date
 	 *
-	 *	@param      User			$user        		Objet utilisateur qui modifie
+	 *	@param      User			$user        		Object utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 2ccfafae0f1..b8e7c01c763 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -442,7 +442,7 @@ if ($action == 'create') {
 			print '<td>';
 			$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
 			print $form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-			// Option to reload page to retrieve customer informations. Note, this clear other input
+			// Option to reload page to retrieve customer information. Note, this clear other input
 			if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index e734be8efff..e43515e9161 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -53,7 +53,7 @@ class Donations extends DolibarrApi
 	/**
 	 * Get properties of an donation object
 	 *
-	 * Return an array with donation informations
+	 * Return an array with donation information
 	 *
 	 * @param   int         $id         ID of order
 	 * @return  Object					Object with cleaned properties
@@ -94,7 +94,7 @@ class Donations extends DolibarrApi
 	 * @param int       $page               Page number
 	 * @param string    $thirdparty_ids     Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                       Array of order objects
 	 *
 	 * @throws RestException
@@ -186,7 +186,7 @@ class Donations extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->don->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -235,7 +235,7 @@ class Donations extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->don->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 4e9a2f7ab44..bc0f189cdd7 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -259,7 +259,7 @@ class Don extends CommonObject
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -482,7 +482,7 @@ class Don extends CommonObject
 	/**
 	 *  Update a donation record
 	 *
-	 *  @param 		User	$user   Objet utilisateur qui met a jour le don
+	 *  @param 		User	$user   Object utilisateur qui met a jour le don
 	 *  @param      int		$notrigger	Disable triggers
 	 *  @return     int      		>0 if OK, <0 if KO
 	 */
@@ -879,7 +879,7 @@ class Don extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Charge indicateurs this->nb pour le tableau de bord
+	 *	Load the indicators this->nb for the state board
 	 *
 	 *	@return     int         Return integer <0 if KO, >0 if OK
 	 */
@@ -1007,7 +1007,7 @@ class Don extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1061,7 +1061,7 @@ class Don extends CommonObject
 			foreach (array('html', 'doc', 'pdf') as $prefix) {
 				$file = $prefix."_".preg_replace('/^html_/', '', $modele).".modules.php";
 
-				// On verifie l'emplacement du modele
+				// Verify the path for the module
 				$file = dol_buildpath($reldir."core/modules/dons/".$file, 0);
 				if (file_exists($file)) {
 					$filefound = 1;
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index f72c5783721..55d7ba74ff0 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -122,13 +122,11 @@ class PaymentDonation extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User		$user			User making payment
-	 *  @param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
+	 *  @param      int 		$notrigger 		0=launch triggers after, 1=disable triggers
 	 *  @return     int     					Return integer <0 if KO, id of payment if OK
 	 */
-	public function create($user, $notrigger = false)
+	public function create($user, $notrigger = 0)
 	{
-		global $conf, $langs;
-
 		$error = 0;
 
 		$now = dol_now();
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 5c78435a847..f30da30fc8e 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -711,7 +711,7 @@ class EcmDirectory extends CommonObject
 	}
 
 	/**
-	 *	Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
+	 *	Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its children.
 	 *  Separator between directories is always '/', whatever is OS.
 	 *
 	 * 	@param	int		$id_categ		id_categ entry to update
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 3f45874d693..aa0b89ff9b0 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -185,7 +185,7 @@ class EcmFiles extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -196,10 +196,10 @@ class EcmFiles extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      	User that creates
-	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -638,12 +638,11 @@ class EcmFiles extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -760,12 +759,11 @@ class EcmFiles extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -865,7 +863,7 @@ class EcmFiles extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 9810b4db600..2fce02da93a 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -189,7 +189,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes' &
 }
 
 // Refresh directory view
-// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
+// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual' && $permissiontoread) {
 	$ecmdirtmp = new EcmDirectory($db);
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index f30b38f83f7..a5084938f88 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -161,7 +161,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes') {
 }
 
 // Refresh directory view
-// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
+// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 9640969b7ba..ecfcf35d2c4 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -153,7 +153,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 }
 
 // Refresh directory view
-// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
+// This refresh list of dirs, not list of files (for performance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 2bd5393f594..a74124b9d74 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -106,7 +106,7 @@ class EmailCollector extends CommonObject
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -242,7 +242,7 @@ class EmailCollector extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -299,10 +299,10 @@ class EmailCollector extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -519,10 +519,10 @@ class EmailCollector extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -546,17 +546,17 @@ class EmailCollector extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -670,7 +670,7 @@ class EmailCollector extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
@@ -850,7 +850,7 @@ class EmailCollector extends CommonObject
 
 	/**
 	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters'
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
 	 *
 	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
 	 */
@@ -1686,7 +1686,8 @@ class EmailCollector extends CommonObject
 				$trackidfoundintorecipientid = 0;
 				$reg = array();
 				// See also later list of all supported tags...
-				if (preg_match('/\+(thi|ctc|use|mem|sub|proj|tas|con|tic|pro|ord|inv|spro|sor|sin|leav|stockinv|job|surv|salary)([0-9]+)@/', $emailto, $reg)) {
+				// Note: "th[i]" to avoid matching a codespell suggestion to convert to this.
+				if (preg_match('/\+(th[i]|ctc|use|mem|sub|proj|tas|con|tic|pro|ord|inv|spro|sor|sin|leav|stockinv|job|surv|salary)([0-9]+)@/', $emailto, $reg)) {
 					$trackidfoundintorecipienttype = $reg[1];
 					$trackidfoundintorecipientid = $reg[2];
 				} elseif (preg_match('/\+emailing-(\w+)@/', $emailto, $reg)) {	// Can be 'emailing-test' or 'emailing-IdMailing-IdRecipient'
@@ -1722,9 +1723,9 @@ class EmailCollector extends CommonObject
 					if (preg_match('/^(Re|AW)\s*:\s+/i', $headers['Subject'])) {
 						$isanswer = 1;
 					}
-					if (getDolglobalString('EMAILCOLLECTOR_USE_IN_REPLY_TO_TO_DETECT_ANSWERS')) {
+					if (getDolGlobalString('EMAILCOLLECTOR_USE_IN_REPLY_TO_TO_DETECT_ANSWERS')) {
 						// Note: "In-Reply-To" to detect if mail is an answer of another mail is not reliable because we can have:
-						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewriten)
+						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewritten)
 						if (!empty($headers['In-Reply-To'])) {
 							$isanswer = 1;
 						}
@@ -1741,7 +1742,7 @@ class EmailCollector extends CommonObject
 				if ($searchfilterisnotanswer > 0) {
 					if (!empty($headers['In-Reply-To'])) {
 						// Note: we can have
-						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
+						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewritten)
 						$isanswer = 0;
 						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
 							$isanswer = 1;
@@ -2660,6 +2661,22 @@ class EmailCollector extends CommonObject
 										$errorforactions++;
 										$this->errors = $actioncomm->errors;
 									} else {
+										if (($fk_element_type == 'ticket') && (!empty($attachments))) {
+											// There is an attachment for the ticket -> store attachment
+											$ticket = New Ticket($this->db);
+											$ticket->fetch($fk_element_id);
+											$destdir = $conf->ticket->dir_output.'/'.$ticket->ref;
+											if (!dol_is_dir($destdir)) {
+												dol_mkdir($destdir);
+											}
+											if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+												foreach ($attachments as $attachment) {
+													$attachment->save($destdir.'/');
+												}
+											} else {
+												$this->getmsg($connection, $imapemail, $destdir);
+											}
+										}
 										$operationslog .= '<br>Event created -> id='.dol_escape_htmltag($actioncomm->id);
 									}
 								}
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 997907b3c60..ce4bec37cb8 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -64,7 +64,7 @@ class EmailCollectorAction extends CommonObject
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -114,7 +114,7 @@ class EmailCollectorAction extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -150,10 +150,10 @@ class EmailCollectorAction extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs;
 		if (empty($this->type)) {
@@ -244,10 +244,10 @@ class EmailCollectorAction extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -255,17 +255,17 @@ class EmailCollectorAction extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -417,7 +417,7 @@ class EmailCollectorAction extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 87e239f2ed3..8d6188e9249 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -66,7 +66,7 @@ class EmailCollectorFilter extends CommonObject
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -116,7 +116,7 @@ class EmailCollectorFilter extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -152,10 +152,10 @@ class EmailCollectorFilter extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -258,10 +258,10 @@ class EmailCollectorFilter extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -269,17 +269,17 @@ class EmailCollectorFilter extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -431,7 +431,7 @@ class EmailCollectorFilter extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 51190e768ca..2f535dd151d 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -153,8 +153,8 @@ function getAttachments($jk, $mbox)
  */
 function getFileData($jk, $fpos, $type, $mbox)
 {
-	$mege = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
-	$data = getDecodeValue($mege, $type);
+	$merge = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
+	$data = getDecodeValue($merge, $type);
 
 	return $data;
 }
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 241ee830c94..f76c84e97eb 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -94,7 +94,7 @@ class ConferenceOrBooth extends ActionComm
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -151,7 +151,7 @@ class ConferenceOrBooth extends ActionComm
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -189,10 +189,10 @@ class ConferenceOrBooth extends ActionComm
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$this->setPercentageFromStatus();
 		$this->setActionCommFields($user);
@@ -355,10 +355,10 @@ class ConferenceOrBooth extends ActionComm
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$this->setPercentageFromStatus();
 		$this->setActionCommFields($user);
@@ -368,10 +368,10 @@ class ConferenceOrBooth extends ActionComm
 	/**
 	 * Delete object in database
 	 *
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param 	int $notrigger  false=launch triggers after, true=disable triggers
+	 * @return 	int             Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = false)
+	public function delete($notrigger = 0)
 	{
 		//TODO delete attendees and subscription
 		return parent::delete($notrigger);
@@ -394,7 +394,7 @@ class ConferenceOrBooth extends ActionComm
 
 		// Protection
 		if ($this->status == self::STATUS_CONFIRMED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -512,7 +512,7 @@ class ConferenceOrBooth extends ActionComm
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param	int		$maxlength					Not use here just for declaration method compatibility with parent classes
@@ -760,7 +760,7 @@ class ConferenceOrBooth extends ActionComm
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 1165ff89086..d81411b35b5 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -82,7 +82,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -189,7 +189,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -242,14 +242,14 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs;
 
-		if (!isValidEMail($this->email)) {
+		if (!isValidEmail($this->email)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -484,10 +484,10 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -495,11 +495,11 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -510,10 +510,10 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -541,7 +541,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -726,7 +726,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1014,7 +1014,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1116,7 +1116,7 @@ class ConferenceOrBoothAttendeeLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 47172b01203..21d38f947b6 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -65,7 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 7fcd29de5cc..f07c1826399 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -92,7 +92,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -811,7 +811,7 @@ $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('sele
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 6c7871f90e7..d0cc03cde79 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -79,7 +79,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 7b4a70e1c88..006b870fd93 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -44,7 +44,7 @@ global $dolibarr_main_url_root;
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
 
-// Get Paramters
+// Get Parameters
 $action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha');   // The bulk action (combo box choice into lists)
 $show_files  = GETPOST('show_files', 'int');   // Show files area generated by bulk actions ?
@@ -100,7 +100,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -806,7 +806,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index a9fc53b7f47..a50580e12e2 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -276,7 +276,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 	$resaction .= $langs->trans("NbSent") . ': ' . ($nbsent ? $nbsent : 0) . "\n<br>";
 
 	if ($nbsent) {
-		$action = ''; // Do not show form post if there was at least one successfull sent
+		$action = ''; // Do not show form post if there was at least one successful sent
 		//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 		setEventMessages($langs->trans("EMailSentForNElements", $nbsent . '/' . count($toselect)), null, 'mesgs');
 		setEventMessages($resaction, null, 'mesgs');
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index bc7779ec75a..1db8454fee9 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -205,7 +205,7 @@ function conferenceorboothAttendeePrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	//TODO : Note and docuement
+	//TODO : Note and document
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'conferenceorboothattendee@eventorganization');
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index d939deac498..b23e16dfa04 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -246,7 +246,7 @@ if (empty($reshook)) {
 		$object->socid = $objectsrc->socid;
 		$object->ref_customer = GETPOST('ref_customer', 'alpha');
 		$object->model_pdf = GETPOST('model');
-		$object->date_delivery = $date_delivery; // Date delivery planed
+		$object->date_delivery = $date_delivery; // Date delivery planned
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
 		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
@@ -318,7 +318,7 @@ if (empty($reshook)) {
 					// No detail were provided for lots, so if a qty was provided, we can throw an error.
 					if (GETPOST($qty)) {
 						// We try to set an amount
-						// Case we dont use the list of available qty for each warehouse/lot
+						// Case we don't use the list of available qty for each warehouse/lot
 						// GUI does not allow this yet
 						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOST($idl, 'int').')', null, 'errors');
 						$error++;
@@ -1561,7 +1561,7 @@ if ($action == 'create') {
 									print "</tr>\n";
 								}
 							}
-							// Show subproducts of product (not recommanded)
+							// Show subproducts of product (not recommended)
 							if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
 								$product->get_sousproduits_arbo();
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
@@ -1844,7 +1844,7 @@ if ($action == 'create') {
 
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1, 250);
 	}
-	// Confirm cancelation
+	// Confirm cancellation
 	if ($action == 'cancel') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
 	}
@@ -2411,7 +2411,7 @@ if ($action == 'create') {
 						print '<tr>';
 						// Qty to ship or shipped
 						print '<td><input class="qtyl right" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
-						// Batch number managment
+						// Batch number management
 						if ($lines[$i]->entrepot_id == 0) {
 							// only show lot numbers from src warehouse when shipping from multiple warehouses
 							$line->fetch($detail_batch->fk_expeditiondet);
@@ -2424,7 +2424,7 @@ if ($action == 'create') {
 					print '<tr>';
 					// Qty to ship or shipped
 					print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
-					// Batch number managment
+					// Batch number management
 					print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 					print '</tr>';
 				} elseif (isModEnabled('stock')) {
@@ -2436,7 +2436,7 @@ if ($action == 'create') {
 							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
 							print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
-							// Batch number managment
+							// Batch number management
 							print '<td> - '.$langs->trans("NA").'</td>';
 							print '</tr>';
 						} elseif (count($lines[$i]->details_entrepot) > 1) {
@@ -2447,7 +2447,7 @@ if ($action == 'create') {
 								print '<td><input class="qtyl right" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
 								// Warehouse source
 								print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
-								// Batch number managment
+								// Batch number management
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
 							}
@@ -2470,7 +2470,7 @@ if ($action == 'create') {
 						print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 						// Warehouse source
 						print '<td></td>';
-						// Batch number managment
+						// Batch number management
 						print '<td></td>';
 						print '</tr>';
 					}
@@ -2481,7 +2481,7 @@ if ($action == 'create') {
 					print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 					// Warehouse source
 					print '<td></td>';
-					// Batch number managment
+					// Batch number management
 					print '<td></td>';
 					print '</tr>';
 				}
@@ -2514,7 +2514,7 @@ if ($action == 'create') {
 					print '</td>';
 				}
 
-				// Batch number managment
+				// Batch number management
 				if (isModEnabled('productbatch')) {
 					if (isset($lines[$i]->detail_batch)) {
 						print '<!-- Detail of lot -->';
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index ee4c0c89a8b..bd7a7f495cd 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -55,7 +55,7 @@ class Shipments extends DolibarrApi
 	/**
 	 * Get properties of a shipment object
 	 *
-	 * Return an array with shipment informations
+	 * Return an array with shipment information
 	 *
 	 * @param   int         $id         ID of shipment
 	 * @return  Object					Object with cleaned properties
@@ -94,7 +94,7 @@ class Shipments extends DolibarrApi
 	 * @param int			   $page				Page number
 	 * @param string		   $thirdparty_ids		Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of shipment objects
 	 *
 	 * @throws RestException
@@ -190,7 +190,7 @@ class Shipments extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->shipment->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -406,7 +406,7 @@ class Shipments extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		// TODO Check the lineid $lineid is a line of ojbect
+		// TODO Check the lineid $lineid is a line of object
 
 		$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
 		if ($updateRes > 0) {
@@ -443,7 +443,7 @@ class Shipments extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->shipment->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 076a9317d6e..c304b4a82b5 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -31,7 +31,7 @@
 /**
  *  \file       htdocs/expedition/class/expedition.class.php
  *  \ingroup    expedition
- *  \brief      Fichier de la classe de gestion des expeditions
+ *  \brief      File of class managing the shipments
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -169,7 +169,7 @@ class Expedition extends CommonObject
 	public $weight;
 
 	/**
-	 * @var integer|string Date delivery planed
+	 * @var integer|string Date delivery planned
 	 */
 	public $date_delivery;
 
@@ -332,7 +332,7 @@ class Expedition extends CommonObject
 	/**
 	 *  Create expedition en base
 	 *
-	 *  @param	User	$user       Objet du user qui cree
+	 *  @param	User	$user       Object du user qui cree
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				Return integer <0 si erreur, id expedition creee si ok
 	 */
@@ -521,7 +521,7 @@ class Expedition extends CommonObject
 	/**
 	 * Create the detail of the expedition line. Create 1 record into expeditiondet for each warehouse and n record for each lot in this warehouse into expeditiondet_batch.
 	 *
-	 * @param 	object		$line_ext			Objet with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
+	 * @param 	object		$line_ext			Object with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
 	 * @param	array		$array_options		extrafields array
 	 * @return	int								Return integer <0 if KO, >0 if OK
 	 */
@@ -630,7 +630,7 @@ class Expedition extends CommonObject
 				$this->date                 = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_expedition      = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
+				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planned
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->model_pdf            = $obj->model_pdf;
 				$this->shipping_method_id   = $obj->fk_shipping_method;
@@ -674,7 +674,7 @@ class Expedition extends CommonObject
 				// Retrieve extrafields
 				$this->fetch_optionals();
 
-				// Fix Get multicurrency param for transmited
+				// Fix Get multicurrency param for transmitted
 				if (isModEnabled('multicurrency')) {
 					if (!empty($this->multicurrency_code)) {
 						$this->multicurrency_code = $this->thirdparty->multicurrency_code;
@@ -770,7 +770,7 @@ class Expedition extends CommonObject
 			$error++;
 		}
 
-		// If stock increment is done on sending (recommanded choice)
+		// If stock increment is done on sending (recommended choice)
 		if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 			$result = $this->manageStockMvtOnEvt($user, "ShipmentValidatedInDolibarr");
 			if ($result < 0) {
@@ -1275,7 +1275,7 @@ class Expedition extends CommonObject
 							}
 						}
 						if ($error) {
-							break; // break for loop incase of error
+							break; // break for loop in case of error
 						}
 					}
 				}
@@ -1464,7 +1464,7 @@ class Expedition extends CommonObject
 							}
 						}
 						if ($error) {
-							break; // break for loop incase of error
+							break; // break for loop in case of error
 						}
 					}
 				}
@@ -2011,7 +2011,7 @@ class Expedition extends CommonObject
 		$order = new Commande($this->db);
 		$order->initAsSpecimen();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -2070,7 +2070,7 @@ class Expedition extends CommonObject
 	/**
 	 *	Set the planned delivery date
 	 *
-	 *	@param      User			$user        		Objet user that modify
+	 *	@param      User			$user        		Object user that modify
 	 *	@param      integer 		$delivery_date     Date of delivery
 	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
@@ -2361,7 +2361,7 @@ class Expedition extends CommonObject
 	}
 
 	/**
-	 *	Classify the shipping as invoiced (used for exemple by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
+	 *	Classify the shipping as invoiced (used for example by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
 	 *
 	 *	@return     int     Return integer <0 if ko, >0 if ok
 	 */
@@ -2589,7 +2589,7 @@ class Expedition extends CommonObject
 
 
 /**
- * Classe to manage lines of shipment
+ * Class to manage lines of shipment
  */
 class ExpeditionLigne extends CommonObjectLine
 {
@@ -3040,7 +3040,7 @@ class ExpeditionLigne extends CommonObjectLine
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			} else {
-				// caculate new total line qty
+				// calculate new total line qty
 				foreach ($lotArray as $lot) {
 					if ($expedition_batch_id != $lot->id) {
 						$remainingQty += $lot->qty;
diff --git a/htdocs/expedition/class/expeditionlinebatch.class.php b/htdocs/expedition/class/expeditionlinebatch.class.php
index 4c8ee08e5a1..032ab9aff34 100644
--- a/htdocs/expedition/class/expeditionlinebatch.class.php
+++ b/htdocs/expedition/class/expeditionlinebatch.class.php
@@ -44,7 +44,7 @@ class ExpeditionLineBatch extends CommonObject
 	public $qty;
 	public $dluo_qty; // deprecated, use qty
 	public $entrepot_id;
-	public $fk_origin_stock;		// rowid in llx_product_batch table (not usefull)
+	public $fk_origin_stock;		// rowid in llx_product_batch table (not useful)
 	public $fk_warehouse;			// warehouse ID
 	public $fk_expeditiondet;
 
@@ -52,7 +52,7 @@ class ExpeditionLineBatch extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index e670bacda30..425cd4a7e1b 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -21,7 +21,7 @@
 /**
  *  \file       htdocs/expedition/class/expeditionstats.class.php
  *  \ingroup    expedition
- *  \brief      File of class fo tmanage shipment statistics
+ *  \brief      File of class to manage shipment statistics
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b8a07790426..2f58d6cd36a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -265,7 +265,7 @@ if ($search_all || $search_user > 0) {
 }
 $sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
 if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
-	// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
+	// Link for delivery fields ref and date. Does not duplicate the line because we should always have only 1 link or 0 per shipment
 	$sql .= " l.date_delivery as date_reception,";
 }
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
@@ -299,7 +299,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
-	// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
+	// Link for delivery fields ref and date. Does not duplicate the line because we should always have only 1 link or 0 per shipment
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 }
@@ -1080,7 +1080,7 @@ while ($i < $imaxinloop) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Date delivery planed
+		// Date delivery planned
 		if (!empty($arrayfields['e.date_delivery']['checked'])) {
 			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->delivery_date), "dayhour");
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 2a370e5c04a..1ff81cbe7d0 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -322,8 +322,8 @@ if ($id > 0 || !empty($ref)) {
 
 		// Discounts for third party
 		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index dbef6e011df..605b1979fd3 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -315,7 +315,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				$db->commit();
-				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -2077,7 +2077,7 @@ if ($action == 'create') {
 				print '<td>';
 				print '</td>';
 
-				// Information if theres a rule restriction
+				// Information if there's a rule restriction
 				print '<td>';
 				print '</td>';
 
@@ -2179,7 +2179,7 @@ if ($action == 'create') {
 								$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
 								$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
 								if (image_format_supported($fileinfo['basename']) > 0) {
-									$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+									$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case however) than original
 									if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
 										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 									}
@@ -2203,7 +2203,7 @@ if ($action == 'create') {
 
 										$pdfexists = file_exists($filepdf);
 										if ($pdfexists) {
-											// Conversion du PDF en image png si fichier png non existant
+											// Conversion du PDF en image png si fichier png non existent
 											if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
 												if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 													include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2389,7 +2389,7 @@ if ($action == 'create') {
 						print '<td class="center">';
 						//print $line->fk_ecm_files;
 						print '</td>';
-						// Information if theres a rule restriction
+						// Information if there's a rule restriction
 						print '<td class="center">';
 						print '</td>';
 
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 7372f9f98f8..124e591a97f 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -55,7 +55,7 @@ class ExpenseReports extends DolibarrApi
 	/**
 	 * Get properties of a Expense Report object
 	 *
-	 * Return an array with Expense Report informations
+	 * Return an array with Expense Report information
 	 *
 	 * @param   int         $id         ID of Expense Report
 	 * @return  Object					Object with cleaned properties
@@ -92,7 +92,7 @@ class ExpenseReports extends DolibarrApi
 	 * @param int		$page		Page number
 	 * @param string	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of Expense Report objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '', $properties = '')
@@ -172,7 +172,7 @@ class ExpenseReports extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->expensereport->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -384,7 +384,7 @@ class ExpenseReports extends DolibarrApi
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	  }
 
-	  // TODO Check the lineid $lineid is a line of ojbect
+	  // TODO Check the lineid $lineid is a line of object
 
 	  $updateRes = $this->expensereport->deleteline($lineid);
 	  if ($updateRes == 1) {
@@ -425,7 +425,7 @@ class ExpenseReports extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->expensereport->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 231e7774e2a..337e60410f8 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -278,7 +278,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param  DoliDB  $db     Handler acces base de donnees
+	 *  @param  DoliDB  $db     Handler access base de donnees
 	 */
 	public function __construct($db)
 	{
@@ -884,7 +884,7 @@ class ExpenseReport extends CommonObject
 
 		$now = dol_now();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -1135,10 +1135,10 @@ class ExpenseReport extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param   User|null   $user       User that delete
-	 * @param 	bool 		$notrigger  false=launch triggers after, true=disable triggers
+	 * @param 	int 		$notrigger  0=launch triggers after, 1=disable triggers
 	 * @return  int         	        Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user = null, $notrigger = false)
+	public function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1269,7 +1269,7 @@ class ExpenseReport extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -2033,7 +2033,7 @@ class ExpenseReport extends CommonObject
 					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationWarning', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency));
 				}
 
-				// No break, we sould test if another rule is violated
+				// No break, we should test if another rule is violated
 			}
 		}
 
@@ -2240,7 +2240,7 @@ class ExpenseReport extends CommonObject
 				$this->db->free($resql);
 			}
 
-			// Select des informations du projet
+			// Select des information du projet
 			$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 			$sql .= " WHERE p.rowid = ".((int) $projet_id);
@@ -2417,10 +2417,10 @@ class ExpenseReport extends CommonObject
 	}
 
 	/**
-	 *  Create a document onto disk accordign to template module.
+	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param      string      $modele         Force le mnodele a utiliser ('' to not force)
-	 *  @param      Translate   $outputlangs    objet lang a utiliser pour traduction
+	 *  @param      Translate   $outputlangs    object lang a utiliser pour traduction
 	 *  @param      int         $hidedetails    Hide details of lines
 	 *  @param      int         $hidedesc       Hide description
 	 *  @param      int         $hideref        Hide ref
@@ -2481,7 +2481,7 @@ class ExpenseReport extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge indicateurs this->nb pour le tableau de bord
+	 *      Load the indicators this->nb for the state board
 	 *
 	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
@@ -2520,7 +2520,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @param	User	$user   		Objet user
+	 *      @param	User	$user   		Object user
 	 *      @param  string  $option         'topay' or 'toapprove'
 	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
@@ -2671,9 +2671,9 @@ class ExpenseReport extends CommonObject
 	}
 
 	/**
-	 *  \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicule category
+	 *  \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicle category
 	 *
-	 *  @param     int		$fk_cat           Category of the vehicule used
+	 *  @param     int		$fk_cat           Category of the vehicle used
 	 *  @param     float	$qty              Number of kilometers
 	 *  @param     float	$tva              VAT rate
 	 *  @return    int              		  Return integer <0 if KO, total ttc if OK
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 4507e8ff11f..45b8785066d 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -97,10 +97,10 @@ class ExpenseReportIk extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -130,10 +130,10 @@ class ExpenseReportIk extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -141,11 +141,11 @@ class ExpenseReportIk extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User $user       	User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -198,7 +198,7 @@ class ExpenseReportIk extends CommonObject
 		$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
 		// prevent out of range -1 indice
 		$indice = $default_range  - 1;
-		// substract 1 because array start from 0
+		// subtract 1 because array start from 0
 		if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
 			return false;
 		} else {
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index d298a60ea90..5966ba2399a 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -141,10 +141,10 @@ class ExpenseReportRule extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -188,10 +188,10 @@ class ExpenseReportRule extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -199,11 +199,11 @@ class ExpenseReportRule extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -214,11 +214,11 @@ class ExpenseReportRule extends CommonObject
 	 * Return all rules or filtered by something
 	 *
 	 * @param int	     $fk_c_type_fees	type of expense
-	 * @param integer	 $date			    date of expense
+	 * @param int|string $date			    date of expense
 	 * @param int        $fk_user		    user of expense
 	 * @return array                        Array with ExpenseReportRule
 	 */
-	public function getAllRule($fk_c_type_fees = '', $date = '', $fk_user = '')
+	public function getAllRule($fk_c_type_fees = 0, $date = '', $fk_user = 0)
 	{
 		$rules = array();
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index eb21fa63fd1..58feef9531c 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -20,13 +20,13 @@
 /**
  *       \file       htdocs/expensereport/class/expensereportstats.class.php
  *       \ingroup    expensereport
- *       \brief      Fichier de la classe de gestion des stats des expensereport et notes de frais
+ *       \brief      File of lass to manage the statistics of the expensereports et expense notes
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
 /**
- *  Classe permettant la gestion des stats des expensereports et notes de frais
+ *  Class to manage the statistics of the expensereports and expense notes
  */
 class ExpenseReportStats extends Stats
 {
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index e4e46088221..2447f521620 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -559,7 +559,7 @@ class PaymentExpenseReport extends CommonObject
 			);
 
 			// Update fk_bank in llx_paiement.
-			// So we wil know the payment that have generated the bank transaction
+			// So we will know the payment that has generated the bank transaction
 			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
 				if ($result <= 0) {
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 2046a2d3acf..c0a513e4587 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -136,7 +136,7 @@ foreach ($listoftype as $code => $label) {
 // Sort array with most important first
 $dataseries = dol_sort_array($dataseries, 1, 'desc');
 
-// Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
+// Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
 $KEEPNFIRST = 7;	// Keep first $KEEPNFIRST one + 1 with the remain
 $i = 0;
 if (count($dataseries) > ($KEEPNFIRST + 1)) {
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 3adae85b1c3..0c7b7d9bdca 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -62,7 +62,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 					$pdfexists = file_exists($filepdf);
 
 					if ($pdfexists) {
-						// Conversion du PDF en image png si fichier png non existant
+						// Conversion du PDF en image png si fichier png non existent
 						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
 							if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 2a741b7a18f..97b79ea1b6d 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -204,11 +204,11 @@ class Export
 									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Table of fields to export / Tableau des champ a exporter (cle=champ, valeur=libelle)
 									$this->array_export_fields[$i] = $module->export_fields_array[$r];
-									// Table of fields to be filtered / Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
+									// Table of fields to be filtered (key=field, value1=data type) Verifies that the module has filters
 									$this->array_export_TypeFields[$i] = (isset($module->export_TypeFields_array[$r]) ? $module->export_TypeFields_array[$r] : '');
-									// Table of entities for export / Tableau des entites a exporter (cle=champ, valeur=entite)
+									// Table of entities to export (key=field, value=entity)
 									$this->array_export_entities[$i] = $module->export_entities_array[$r];
-									// Table of entities requiring DISTINCT abandonment / Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
+									// Table of entities requiring to abandon DISTINCT (key=entity, valeur=field id child records)
 									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Table of special field operations / Tableau des operations speciales sur champ
 									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
@@ -313,7 +313,7 @@ class Export
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Build the conditionnal string from filter the query
+	 *      Build the conditional string from filter the query
 	 *
 	 *      @param		string	$TypeField		Type of Field to filter
 	 *      @param		string	$NameField		Name of the field to filter
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 48039b936e6..54d003f3a71 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -429,7 +429,7 @@ if ($step == 1 || !$datatoexport) {
 	print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
 
 	// Affiche les modules d'exports
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Module").'</td>';
@@ -527,7 +527,7 @@ if ($step == 2 && $datatoexport) {
 	print '</form>';
 
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Object").'</td>';
@@ -708,7 +708,7 @@ if ($step == 3 && $datatoexport) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -907,7 +907,7 @@ if ($step == 4 && $datatoexport) {
 
 	print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';
@@ -1009,7 +1009,7 @@ if ($step == 4 && $datatoexport) {
 		print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
 
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ExportModelName").'</td>';
@@ -1095,7 +1095,7 @@ if ($step == 5 && $datatoexport) {
 	$head[$h][1] = $langs->trans("Step")." 2";
 	$h++;
 
-	// si le filtrage est parametre pour l'export ou pas
+	// si le filtrage est parameter pour l'export ou pas
 	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
 		$head[$h][1] = $langs->trans("Step")." 3";
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 53490e4d85c..d7ede2988cc 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -62,7 +62,7 @@ print '<br>';
 
 // List of available export formats
 
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index a51a1b9dafa..f5707cfe9c5 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -49,7 +49,7 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-// Sauvegardes parametres
+// Sauvegardes parameters
 if ($action == 'update') {
 	$i = 0;
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index ff7a656c8eb..5f0fb215159 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -189,10 +189,10 @@ if ($action == 'add') {
 } elseif ($action == 'createfrommodel') {
 	$newinter = new Fichinter($db);
 
-	// on récupère les enregistrements
+	// Fetch the stored data
 	$object->fetch($id);
 	$res = $object->fetch_lines();
-	// on transfert les données de l'un vers l'autre
+	// Transfer the data from one to the other
 	if ($object->socid > 0) {
 		$newinter->socid = $object->socid;
 		$newinter->fk_project = $object->fk_project;
@@ -606,7 +606,7 @@ if ($action == 'create') {
 
 			print '<table class="border centpercent">';
 
-			// if "frequency" is empty or = 0, the reccurence is disabled
+			// if "frequency" is empty or = 0, the recurrence is disabled
 			print '<tr><td class="titlefield">';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('Frequency');
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 0444922f8b3..9b91f6bed23 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1121,7 +1121,7 @@ if ($action == 'create') {
 
 	// Confirm validation
 	if ($action == 'validate') {
-		// on verifie si l'objet est en numerotation provisoire
+		// Verify if the object's number os temporary
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV') {
 			$numref = $object->getNextNumRef($soc);
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 41c806b5113..f3a6a96f1cc 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -105,7 +105,7 @@ class Interventions extends DolibarrApi
 	 * @param int		   $page				Page number
 	 * @param string		   $thirdparty_ids			Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                                   Array of order objects
 	 *
 	 * @throws RestException
@@ -199,7 +199,7 @@ class Interventions extends DolibarrApi
 		$result = $this->_validate($request_data);
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->fichinter->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -268,7 +268,7 @@ class Interventions extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->fichinter->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2e240e5878b..018c2e3f076 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -26,7 +26,7 @@
 /**
  * 	\file       htdocs/fichinter/class/fichinter.class.php
  * 	\ingroup    fichinter
- * 	\brief      Fichier de la classe des gestion des fiches interventions
+ * 	\brief      File for class to manage interventions
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
@@ -248,7 +248,7 @@ class Fichinter extends CommonObject
 	/**
 	 *	Create an intervention into data base
 	 *
-	 *  @param		User	$user 		Objet user that make creation
+	 *  @param		User	$user 		Object user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
@@ -383,7 +383,7 @@ class Fichinter extends CommonObject
 	/**
 	 *	Update an intervention
 	 *
-	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		User	$user 		Object user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
@@ -690,7 +690,7 @@ class Fichinter extends CommonObject
 	/**
 	 *  Close intervention
 	 *
-	 * 	@param      User	$user       Objet user that close
+	 * 	@param      User	$user       Object user that close
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
@@ -1410,7 +1410,7 @@ class Fichinter extends CommonObject
 
 		$now = dol_now();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->ref_client = 'SPECIMEN CLIENT';
@@ -1705,7 +1705,7 @@ class FichinterLigne extends CommonObjectLine
 	/**
 	 *	Insert the line into database
 	 *
-	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		User	$user 		Object user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		Return integer <0 if ko, >0 if ok
 	 */
@@ -1794,7 +1794,7 @@ class FichinterLigne extends CommonObjectLine
 	/**
 	 *	Update intervention into database
 	 *
-	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		User	$user 		Object user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		Return integer <0 if ko, >0 if ok
 	 */
@@ -1905,7 +1905,7 @@ class FichinterLigne extends CommonObjectLine
 	/**
 	 *	Delete a intervention line
 	 *
-	 *	@param		User	$user 		Objet user that make creation
+	 *	@param		User	$user 		Object user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return     int		>0 if ok, <0 if ko
 	 */
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index c983380b2fd..671c566009d 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -25,7 +25,7 @@
 /**
  *  \file       htdocs/fichinter/class/fichinterrec.class.php
  *  \ingroup    fichinter
- *  \brief      Fichier de la classe des factures recurentes
+ *  \brief      File for class to manage recurring invoices/templates (models)
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
 
 /**
- *	Classe de gestion des factures recurrentes/Modeles
+ * Class to manage recurring invoices/templates (models)
  */
 class FichinterRec extends Fichinter
 {
@@ -768,7 +768,7 @@ class FichinterRec extends Fichinter
 	public function setNextDate($date, $increment_nb_gen_done = 0)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
+			dol_syslog(get_class($this)."::setNextDate was called on object with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
@@ -800,7 +800,7 @@ class FichinterRec extends Fichinter
 	public function setMaxPeriod($nb)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
+			dol_syslog(get_class($this)."::setMaxPeriod was called on object with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 2f220f9f878..e82ea5da72d 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -324,7 +324,7 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
 
 /*
  * Define PATH to external libraries
- * To use other version than embeded libraries, define here constant to path. Use '' to use include class path autodetect.
+ * To use other version than embedded libraries, define here constant to path. Use '' to use include class path autodetect.
  */
 // Path to root libraries
 if (!defined('TCPDF_PATH')) {
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index fe82e8d6f1e..ccd50b505e3 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -94,7 +94,7 @@ class SupplierInvoices extends DolibarrApi
 	 * @param string	$thirdparty_ids	  Thirdparty ids to filter invoices of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string	$status			  Filter by invoice status : draft | unpaid | paid | cancelled
 	 * @param string    $sqlfilters       Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-	 * @param string    $properties		  Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties		  Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                      Array of invoice objects
 	 *
 	 * @throws RestException
@@ -209,7 +209,7 @@ class SupplierInvoices extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->invoice->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -257,7 +257,7 @@ class SupplierInvoices extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->invoice->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -698,7 +698,7 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
 		}
 
-		// TODO Check the lineid $lineid is a line of ojbect
+		// TODO Check the lineid $lineid is a line of object
 
 		$updateRes = $this->invoice->deleteline($lineid);
 		if ($updateRes > 0) {
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index e2de25659f4..c878b910159 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -94,7 +94,7 @@ class SupplierOrders extends DolibarrApi
 	 * @param string	$status			  Filter by order status : draft | validated | approved | running | received_start | received_end | cancelled | refused
 	 * @param string    $sqlfilters       Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
 	 * @param string    $sqlfilterlines   Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
-	 * @param string    $properties		  Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties		  Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                      Array of order objects
 	 *
 	 * @throws RestException
@@ -229,7 +229,7 @@ class SupplierOrders extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->order->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -281,7 +281,7 @@ class SupplierOrders extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->order->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -299,7 +299,7 @@ class SupplierOrders extends DolibarrApi
 	/**
 	 * Get contacts of given supplier order
 	 *
-	 * Return an array with contact informations
+	 * Return an array with contact information
 	 *
 	 * @param	int		$id			ID of supplier order
 	 * @param	string	$source		Source of the contact (internal, external, all).
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f87c9463d69..81570e7e320 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -115,8 +115,8 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 * @var int
 	 */
-	public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
-	//                                                                                          -> 7=Canceled/Never received -> (reopen) 3=Process runing
+	public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process running -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
+	//                                                                                          -> 7=Canceled/Never received -> (reopen) 3=Process running
 	//									                            -> 6=Canceled -> (reopen) 2=Approved
 	//  		                                      -> 9=Refused  -> (reopen) 1=Validated
 	//  Note: billed or not is on another field "billed"
@@ -239,7 +239,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -1534,7 +1534,7 @@ class CommandeFournisseur extends CommonOrder
 						$line->special_code
 					);
 					if ($result < 0) {
-						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
+						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functional error
 						$this->db->rollback();
 						return -1;
 					}
@@ -1821,7 +1821,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@param		float	$pu_ttc					Unit price TTC (used if $price_base_type is 'TTC')
 	 *	@param		int		$type					Type of line (0=product, 1=service)
 	 *	@param		int		$info_bits				More information
-	 *  @param		bool	$notrigger				Disable triggers
+	 *  @param		int		$notrigger				Disable triggers
 	 *  @param		int		$date_start				Date start of service
 	 *  @param		int		$date_end				Date end of service
 	 *  @param		array	$array_options			extrafields array
@@ -1833,7 +1833,7 @@ class CommandeFournisseur extends CommonOrder
 	 * 	@param		int		$special_code			Special code
 	 *	@return     int             				Return integer <=0 if KO, >0 if OK
 	 */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $fk_prod_fourn_price = 0, $ref_supplier = '', $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $type = 0, $info_bits = 0, $notrigger = false, $date_start = null, $date_end = null, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $origin = '', $origin_id = 0, $rang = -1, $special_code = 0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $fk_prod_fourn_price = 0, $ref_supplier = '', $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $type = 0, $info_bits = 0, $notrigger = 0, $date_start = null, $date_end = null, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $origin = '', $origin_id = 0, $rang = -1, $special_code = 0)
 	{
 		global $langs, $mysoc, $conf;
 
@@ -2081,7 +2081,7 @@ class CommandeFournisseur extends CommonOrder
 					}
 				}
 
-				// Mise a jour informations denormalisees au niveau de la commande meme
+				// Mise a jour information denormalisees au niveau de la commande meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
 				if ($result > 0) {
 					$this->db->commit();
@@ -2563,7 +2563,7 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Set the planned delivery date
 	 *
-	 *	@param      User			$user        		Objet user making change
+	 *	@param      User			$user        		Object user making change
 	 *	@param      integer  		$delivery_date     Planned delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         						Return integer <0 if KO, >0 if OK
@@ -2620,7 +2620,7 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Set the id projet
 	 *
-	 *	@param      User			$user        		Objet utilisateur qui modifie
+	 *	@param      User			$user        		Object utilisateur qui modifie
 	 *	@param      int				$id_projet    	 	Delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         						Return integer <0 si ko, >0 si ok
@@ -2783,7 +2783,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param     	double		$txlocaltax1	    Localtax1 tax
 	 *  @param     	double		$txlocaltax2   		Localtax2 tax
 	 *  @param     	double		$price_base_type 	Type of price base
-	 *	@param		int			$info_bits			Miscellaneous informations
+	 *	@param		int			$info_bits			Miscellaneous information
 	 *	@param		int			$type				Type of line (0=product, 1=service)
 	 *  @param		int			$notrigger			Disable triggers
 	 *  @param      integer     $date_start     	Date start of service
@@ -3006,7 +3006,7 @@ class CommandeFournisseur extends CommonOrder
 			$prodid = $obj->rowid;
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -3060,7 +3060,7 @@ class CommandeFournisseur extends CommonOrder
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet facture
+	 *	Charge les information d'ordre info dans l'objet facture
 	 *
 	 *	@param  int		$id       	Id de la facture a charger
 	 *	@return	void
@@ -3099,7 +3099,7 @@ class CommandeFournisseur extends CommonOrder
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Charge indicateurs this->nb de tableau de bord
+	 *	Load the indicators this->nb for the state board
 	 *
 	 *	@return     int         Return integer <0 si ko, >0 si ok
 	 */
@@ -3139,7 +3139,7 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *	@param          User	$user   Objet user
+	 *	@param          User	$user   Object user
 	 *  @param          int		$mode   "opened", "awaiting" for orders awaiting reception
 	 *	@return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
@@ -3467,7 +3467,7 @@ class CommandeFournisseur extends CommonOrder
 					//var_dump($keysindeliverednotinwished);
 					//exit;
 
-					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everythings is received
+					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everything is received
 						if ($closeopenorder) {
 							//$ret=$this->setStatus($user,5);
 							$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 1143dbac139..044a14119c9 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -20,7 +20,7 @@
  *  \file       htdocs/fourn/class/fournisseur.commande.dispatch.class.php
  *  \ingroup    fournisseur stock
  *  \brief      This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *              Initialy built by build_class_from_table on 2015-02-24 10:38
+ *              Initially built by build_class_from_table on 2015-02-24 10:38
  */
 
 // Put here all includes required by your class file
@@ -122,7 +122,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index ca5b93994e8..1d47ada460f 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -25,7 +25,7 @@
 /**
  *	\file       htdocs/fourn/facture/class/fournisseur.facture-rec.class.php
  *	\ingroup    facture
- *	\brief      Fichier de la classe des factures fournisseursrecurentes
+ *	\brief      File for class to manage invoice templates
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
@@ -171,7 +171,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -1255,7 +1255,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *  Create all recurrents supplier invoices (for all entities if multicompany is used).
 	 *  A result may also be provided into this->output.
 	 *
-	 *  WARNING: This method change temporarly context $conf->entity to be in correct context for each recurring invoice found.
+	 *  WARNING: This method changes temporarily the context $conf->entity to be in correct context for each recurring invoice found.
 	 *
 	 *  @param	int		$restrictioninvoiceid		0=All qualified template invoices found. > 0 = restrict action on invoice ID
 	 *  @param	int		$forcevalidation		1=Force validation of invoice whatever is template auto_validate flag.
@@ -1794,12 +1794,12 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
 		if (!empty($frequency) && empty($unit)) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
+			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with params frequency defined but unit not defined', LOG_ERR);
 			return -2;
 		}
 
@@ -1834,7 +1834,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setNextDate($date, $increment_nb_gen_done = 0)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this).'::setNextDate was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setNextDate was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -1867,7 +1867,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setMaxPeriod($nb)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this).'::setMaxPeriod was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setMaxPeriod was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
@@ -1899,7 +1899,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setAutoValidate($validate)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this).'::setAutoValidate was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setAutoValidate was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
@@ -1927,7 +1927,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setGeneratePdf($validate)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this).'::setGeneratePdf was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setGeneratePdf was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
@@ -1955,7 +1955,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public function setModelPdf($model)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this).'::setModelPdf was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setModelPdf was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 9d56552b07a..f710a5e409c 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -199,8 +199,8 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $tva;
 
-	// Warning: Do not set default value into property defintion. it must stay null.
-	// For example to avoid to have substition done when object is generic and not yet defined.
+	// Warning: Do not set default value into property definition. it must stay null.
+	// For example to avoid to have substitution done when object is generic and not yet defined.
 	public $localtax1;
 	public $localtax2;
 	public $total_ht;
@@ -344,7 +344,7 @@ class FactureFournisseur extends CommonInvoice
 	 * If paid partially, $this->close_code can be:
 	 * - CLOSECODE_DISCOUNTVAT
 	 * - CLOSECODE_BADCREDIT
-	 * If paid completelly, this->close_code will be null
+	 * If paid completely, this->close_code will be null
 	 */
 	const STATUS_CLOSED = 2;
 
@@ -1552,8 +1552,8 @@ class FactureFournisseur extends CommonInvoice
 	 *	@deprecated
 	 *  @see setPaid()
 	 *	@param  User	$user       Object user
-	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
-	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
+	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implemented yet.
+	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implemented yet.
 	 *	@return int         		Return integer <0 si ko, >0 si ok
 	 */
 	public function set_paid($user, $close_code = '', $close_note = '')
@@ -1567,8 +1567,8 @@ class FactureFournisseur extends CommonInvoice
 	 *  Tag invoice as a paid invoice
 	 *
 	 *	@param  User	$user       Object user
-	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
-	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
+	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implemented yet.
+	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implemented yet.
 	 *	@return int         		Return integer <0 si ko, >0 si ok
 	 */
 	public function setPaid($user, $close_code = '', $close_note = '')
@@ -1813,7 +1813,7 @@ class FactureFournisseur extends CommonInvoice
 				} else {
 					if ($key == 'EMAIL') {
 						// Check for mandatory
-						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEMail($this->thirdparty->email)) {
+						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEmail($this->thirdparty->email)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorBadEMail", $this->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -2069,7 +2069,7 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param    	int		$fk_remise_except	Id discount used
 	 *	@return    	int             			>0 if OK, <0 if KO
 	 */
-	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
 		global $langs, $mysoc, $conf;
 
@@ -2286,7 +2286,7 @@ class FactureFournisseur extends CommonInvoice
 					}
 				}
 
-				// Mise a jour informations denormalisees au niveau de la facture meme
+				// Mise a jour information denormalisees au niveau de la facture meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
 				if ($result > 0) {
 					$this->db->commit();
@@ -2319,7 +2319,7 @@ class FactureFournisseur extends CommonInvoice
 	 * @param     	double		$qty           		Quantity
 	 * @param     	int			$idproduct			Id produit
 	 * @param	  	double		$price_base_type	HT or TTC
-	 * @param	  	int			$info_bits			Miscellaneous informations of line
+	 * @param	  	int			$info_bits			Miscellaneous information of line
 	 * @param		int			$type				Type of line (0=product, 1=service)
 	 * @param     	double		$remise_percent  	Percentage discount of the line
 	 * @param		int			$notrigger			Disable triggers
@@ -2332,7 +2332,7 @@ class FactureFournisseur extends CommonInvoice
 	 * @param	integer	$rang	line rank
 	 * @return    	int           					Return integer <0 if KO, >0 if OK
 	 */
-	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_devise = 0, $ref_supplier = '', $rang = 0)
+	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_devise = 0, $ref_supplier = '', $rang = 0)
 	{
 		global $mysoc, $langs;
 
@@ -2595,7 +2595,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " AND f.entity = ".$conf->entity;
 		$sql .= " AND f.paye = 0"; // Pas classee payee completement
 		$sql .= " AND pf.fk_paiementfourn IS NULL"; // Aucun paiement deja fait
-		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
+		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de replacement
 		if ($socid > 0) {
 			$sql .= " AND f.fk_soc = ".((int) $socid);
 		}
@@ -3022,7 +3022,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
@@ -3376,7 +3376,7 @@ class FactureFournisseur extends CommonInvoice
 	public function setVATReverseCharge($vatreversecharge)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this)."::setVATReverseCharge was called on objet with property table_element not defined", LOG_ERR);
+			dol_syslog(get_class($this)."::setVATReverseCharge was called on object with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
@@ -3715,8 +3715,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 * Deletes a line
 	 *
-	 * @param     bool|int   $notrigger     1=Does not execute triggers, 0= execute triggers
-	 * @return    int                       0 if KO, 1 if OK
+	 * @param     int   $notrigger     1=Does not execute triggers, 0=execute triggers
+	 * @return    int                  0 if KO, 1 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index fd9e0245ad8..9ccb347080d 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012		Christophe Battarel	  <christophe.battarel@altairis.fr>
  * Copyright (C) 2015		Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2016-2023	Charlene Benke         <charlene@patas-monkey.com>
- * Copyright (C) 2019-2021  Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France       <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Pierre Ardoin         <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,7 @@ class ProductFournisseur extends Product
 	 *    @param  	int			$availability		            Product availability
 	 *    @param	string		$ref_fourn			            Supplier ref
 	 *    @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
-	 *    @param  	string		$charges			            costs affering to product
+	 *    @param  	string|float $charges			            costs affering to product
 	 *    @param  	float		$remise_percent		            Discount  regarding qty (percent)
 	 *    @param  	float		$remise				            Discount  regarding qty (amount)
 	 *    @param  	int			$newnpr				            Set NPR or not
@@ -273,8 +273,32 @@ class ProductFournisseur extends Product
 	 *    @param  	array		$options		     	       	Extrafields of product fourn price
 	 *    @return	int											Return integer <0 if KO, >=0 if OK
 	 */
-	public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '', $options = array())
-	{
+	public function update_buyprice(
+		$qty,
+		$buyprice,
+		$user,
+		$price_base_type,
+		$fourn,
+		$availability,
+		$ref_fourn,
+		$tva_tx,
+		$charges = 0,
+		$remise_percent = 0,
+		$remise = 0,
+		$newnpr = 0,
+		$delivery_time_days = 0,
+		$supplier_reputation = '',
+		$localtaxes_array = array(),
+		$newdefaultvatcode = '',
+		$multicurrency_buyprice = 0,
+		$multicurrency_price_base_type = 'HT',
+		$multicurrency_tx = 1,
+		$multicurrency_code = '',
+		$desc_fourn = '',
+		$barcode = '',
+		$fk_barcode_type = 0,
+		$options = array()
+	) {
 		// phpcs:enable
 		global $conf, $langs;
 		//global $mysoc;
@@ -346,7 +370,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 retrieve type
+		} else { // old method. deprecated because it can't retrieve type
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
 			$localtaxtype2 = '0';
@@ -1148,7 +1172,7 @@ class ProductFournisseur extends Product
 
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto).
+	 *  Return a link to the object card (with optionally the picto).
 	 *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index d821cb91db0..1a4e917134b 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -159,7 +159,7 @@ class PaiementFourn extends Paiement
 	 *	Create payment in database
 	 *
 	 *	@param		User	   $user        		Object of creating user
-	 *	@param		int		   $closepaidinvoices   1=Also close payed invoices to paid, 0=Do nothing more
+	 *	@param		int		   $closepaidinvoices   1=Also close paid invoices to paid, 0=Do nothing more
 	 *  @param      Societe    $thirdparty          Thirdparty
 	 *	@return     int         					id of created payment, < 0 if error
 	 */
@@ -515,7 +515,7 @@ class PaiementFourn extends Paiement
 	/**
 	 *	Information on object
 	 *
-	 *	@param	int		$id      Id du paiement dont il faut afficher les infos
+	 *	@param	int		$id      Id du paiement don't il faut afficher les infos
 	 *	@return	void
 	 */
 	public function info($id)
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 28c196e0361..aa68f7a9da6 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -350,8 +350,8 @@ if (empty($reshook)) {
 				$newstatus = 3;
 			} elseif ($object->statut == 5) {
 				//$newstatus=2;    // Ordered
-				// TODO Can we set it to submited ?
-				//$newstatus=3;  // Submited
+				// TODO Can we set it to submitted ?
+				//$newstatus=3;  // Submitted
 				// TODO If there is at least one reception, we can set to Received->Received partially
 				$newstatus = 4; // Received partially
 			} elseif ($object->statut == 6) {
@@ -551,7 +551,7 @@ if (empty($reshook)) {
 					$desc = $productsupplier->desc_supplier;
 				}
 
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
@@ -1714,7 +1714,7 @@ if ($action == 'create') {
 		} else {
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
-			// reload page to retrieve customer informations
+			// reload page to retrieve customer information
 			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
@@ -2139,8 +2139,8 @@ if ($action == 'create') {
 
 		// Relative and absolute discounts
 		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
@@ -2273,7 +2273,7 @@ if ($action == 'create') {
 		print '<td>'.$object->getMaxDeliveryTimeDay($langs).'</td>';
 		print '</tr>';
 
-		// Delivery date planed
+		// Delivery date planned
 		print '<tr><td>';
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('DateDeliveryPlanned');
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index e0f40383999..caaa44666ec 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -94,8 +94,8 @@ if ($resql) {
 	$total = 0;
 	$dataseries = array();
 	$vals = array();
-	//	0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
-	//	-> 7=Canceled/Never received -> (reopen) 3=Process runing
+	//	0=Draft -> 1=Validated -> 2=Approved -> 3=Process running -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
+	//	-> 7=Canceled/Never received -> (reopen) 3=Process running
 	//	-> 6=Canceled -> (reopen) 2=Approved
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index b6468448f3a..63cd3cd45d5 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -38,7 +38,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
-// Get Paramters
+// Get Parameters
 $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5a4f6c07e45..39e6aac7e84 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -441,7 +441,7 @@ if (empty($reshook)) {
 				$sql .= ")";
 
 				if (!$db->query($sql)) {
-					$erorr++;
+					$error++;
 				}
 
 				if (!$error) {
@@ -519,7 +519,7 @@ if (empty($reshook)) {
 								$lines[$i]->info_bits,
 								'HT',
 								$product_type,
-								// we dont use the rank from orderline because we may have lines from several orders
+								// we don't use the rank from orderline because we may have lines from several orders
 								-1,
 								false,
 								$lines[$i]->array_options,
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index d508a32abc5..d196d562ba6 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -567,7 +567,7 @@ if (empty($reshook)) {
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				} elseif ($tmpvat != $tmpprodvat) {
 					// On reevalue prix selon taux tva car taux tva transaction peut etre different
-					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+					// de ceux du produit par default (par example si pays different entre vendeur et acheteur).
 					if ($price_base_type != 'HT') {
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					} else {
@@ -1414,7 +1414,7 @@ if ($action == 'create') {
 
 		print '<tr><td colspan="2">' . img_picto('', 'recurring', 'class="pictofixedwidth"') . $title . '</td></tr>';
 
-		// if "frequency" is empty or = 0, the reccurence is disabled
+		// if "frequency" is empty or = 0, the recurrence is disabled
 		print '<tr><td style="width: 50%">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Frequency');
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 89218880e8c..72f4b19f4f2 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -348,7 +348,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_paid_partially' && $confirm == 'yes') {
-		// Classif "paid partialy"
+		// Classif "paid partially"
 		$object->fetch($id);
 		$close_code = GETPOST("close_code", 'restricthtml');
 		$close_note = GETPOST("close_note", 'restricthtml');
@@ -724,7 +724,7 @@ if (empty($reshook)) {
 
 			if (empty($error)) {
 				if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
-					// Classe facture
+					// Set invoice as paid
 					$result = $object->setPaid($user);
 					if ($result >= 0) {
 						$db->commit();
@@ -829,7 +829,7 @@ if (empty($reshook)) {
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
-				// Proprietes particulieres a facture de remplacement
+				// Proprietes particulieres a facture de replacement
 				$object->fk_facture_source = GETPOST('fac_replacement', 'int');
 				$object->type = FactureFournisseur::TYPE_REPLACEMENT;
 
@@ -1671,7 +1671,7 @@ if (empty($reshook)) {
 					$desc = $productsupplier->desc_supplier;
 				}
 
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc = '';
 				}
@@ -1875,7 +1875,7 @@ if (empty($reshook)) {
 		$ventilExportCompta = $object->getVentilExportCompta();
 
 		if (!$ventilExportCompta) {
-			// On verifie si aucun paiement n'a ete effectue
+			// We verify that no payment was done
 			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED) {
 				$idwarehouse = GETPOST('idwarehouse');
 
@@ -2293,7 +2293,7 @@ if ($action == 'create') {
 		} else {
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
-			// reload page to retrieve supplier informations
+			// reload page to retrieve supplier information
 			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
 					$(document).ready(function() {
@@ -2359,7 +2359,7 @@ if ($action == 'create') {
 						$i++;
 					}
 					print '</select>';
-					// Option to reload page to retrieve customer informations. Note, this clear other input
+					// Option to reload page to retrieve customer information. Note, this clear other input
 					if (!getDolGlobalString('RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED')) {
 						print '<script type="text/javascript">
 						$(document).ready(function() {
@@ -2918,8 +2918,8 @@ if ($action == 'create') {
 		$resteapayeraffiche = $resteapayer;
 
 		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Never use this
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
@@ -4005,7 +4005,7 @@ if ($action == 'create') {
 			if (empty($reshook)) {
 				// Modify a validated invoice with no payments
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate) {
-					// We check if lines of invoice are not already transfered into accountancy
+					// We check if lines of invoice are not already transferred into accountancy
 					$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
 
 					if ($ventilExportCompta == 0) {
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 284c18cbb81..cdb15850ebe 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -22,7 +22,7 @@
 /**
  *      \file       htdocs/fourn/facture/info.php
  *      \ingroup    facture, fournisseur
- *		\brief      Page des informations d'une facture fournisseur
+ *		\brief      Page des information d'une facture fournisseur
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 701cf35814d..0e63293a334 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -572,7 +572,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a65fca4d55c..fef9a1288f3 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -429,7 +429,7 @@ $sql .= " country.code as country_code,";
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
-// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
+// TODO Better solution to be able to sort on already paid or remain to pay is to store amount_payed in a denormalized field.
 if (!$search_all) {
 	$sql .= ', SUM(pf.amount) as dynamount_payed';
 }
@@ -1560,7 +1560,7 @@ while ($i < $imaxinloop) {
 
 	$object = $facturestatic;
 
-	//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
+	//If invoice has been converted and the conversion has been used, we don't have remain to pay on invoice
 	if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 		if ($facturestatic->isCreditNoteUsed()) {
 			$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index de1e9ae45ae..1c56799d7f3 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -348,7 +348,7 @@ if (empty($reshook)) {
 					$facid = $key;
 					if (is_numeric($amount) && $amount != 0) {
 						if ($invoiceid != 0) {
-							$invoiceid = -1; // There is more than one invoice payed by this payment
+							$invoiceid = -1; // There is more than one invoice paid by this payment
 						} else {
 							$invoiceid = $facid;
 						}
@@ -759,10 +759,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 								}
 								print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-								print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
+								print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is required to be used by javascript callForResult();
 							} else {
 								print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-								print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
+								print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is required to be used by javascript callForResult();
 							}
 							print "</td>";
 
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 2849c73135d..f1bccfcad6d 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -56,7 +56,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 				$sign = -1;
 			}
 			if ($objectlink->statut != 3) {
-				// If not abandonned
+				// If not abandoned
 				$total = $total + $sign * $objectlink->total_ht;
 				echo price($objectlink->total_ht);
 			} else {
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index b14f5841c6f..81a72b609b9 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -391,7 +391,7 @@ if (!function_exists('ftp_connect')) {
 		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
 		print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SSL')).'</b><br>';
-		print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SFTP')).'</b><br>';
+		print $langs->trans("SFTP (FTP as a subsystem of SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SFTP')).'</b><br>';
 		print $langs->trans("Directory").': ';
 		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index aa2d3590a9e..5b9c527a019 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -358,7 +358,7 @@ if (empty($reshook)) {
 
 		// If under validation
 		if ($object->statut == Holiday::STATUS_DRAFT) {
-			// If this is the requestor or has read/write rights
+			// If this is the requester or has read/write rights
 			if ($cancreate) {
 				$approverid = GETPOST('valideur', 'int');
 				// TODO Check this approver user id has the permission for approval
@@ -616,7 +616,7 @@ if (empty($reshook)) {
 
 			// If no SQL error, we redirect to the request form
 			if (!$error) {
-				// Calculcate number of days consumed
+				// Calculate number of days consumed
 				$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 				$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
 				$newSolde = ($soldeActuel - $nbopenedday);
@@ -840,7 +840,7 @@ if (empty($reshook)) {
 					$error++;
 				}
 
-				// Calculcate number of days consumed
+				// Calculate number of days consumed
 				$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
 				$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 24ccab79ffa..8b793d3b471 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -114,12 +114,12 @@ class Holiday extends CommonObject
 	public $fk_user_refuse;
 
 	/**
-	 * @var int 	Date for cancelation
+	 * @var int 	Date for cancellation
 	 */
 	public $date_cancel = '';
 
 	/**
-	 * @var int 	ID for cancelation
+	 * @var int 	ID for cancellation
 	 */
 	public $fk_user_cancel;
 
@@ -1276,7 +1276,7 @@ class Holiday extends CommonObject
 				while ($i < $num_rows) {
 					$obj = $this->db->fetch_object($resql);
 
-					// Note: $obj->halfday is  0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
+					// Note: $obj->halfday is  0:Full days, 2:Start afternoon end morning, -1:Start afternoon, 1:End morning
 					$arrayofrecord[$obj->rowid] = array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
 					$i++;
 				}
@@ -2062,9 +2062,9 @@ class Holiday extends CommonObject
 		$sql .= " WHERE u.statut > 0";
 
 		$result = $this->db->query($sql);
-		$objet = $this->db->fetch_object($result);
+		$object = $this->db->fetch_object($result);
 
-		return $objet->compteur;
+		return $object->compteur;
 	}
 	/**
 	 *	Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
@@ -2078,9 +2078,9 @@ class Holiday extends CommonObject
 		$sql .= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
 
 		$result = $this->db->query($sql);
-		$objet = $this->db->fetch_object($result);
+		$object = $this->db->fetch_object($result);
 
-		return $objet->compteur;
+		return $object->compteur;
 	}
 
 	/**
@@ -2403,7 +2403,7 @@ class Holiday extends CommonObject
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @param	User	$user   		Objet user
+	 *      @param	User	$user   		Object user
 	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 29f8e4a9368..98cc43c2faa 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -291,7 +291,7 @@ print "</div><br>\n";
 
 $filters = '';
 
-// Filter on array of ids of all childs
+// Filter on array of ids of all children
 $userchilds = array();
 if (!$user->hasRight('holiday', 'readall')) {
 	$userchilds = $user->getAllChildIds(1);
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 7ac443caf33..6e11b214bc8 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -147,7 +147,7 @@ $permissiontoread = $user->hasRight('holiday', 'read');
 $permissiontodelete = $user->hasRight('holiday', 'delete');
 $permissiontoapprove = $user->hasRight('holiday', 'approve');
 
-if (!ismodEnabled('holiday')) {
+if (!isModEnabled('holiday')) {
 	accessforbidden('Module holiday not enabled');
 }
 
@@ -590,7 +590,7 @@ if (!$user->hasRight('holiday', 'readall')) {
 	$include = 'hierarchyme'; // Can see only its hierarchyl
 }
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
@@ -691,7 +691,7 @@ if (!empty($arrayfields['cp.date_valid']['checked'])) {
 	print '</td>';
 }
 
-// Date appoval
+// Date approval
 if (!empty($arrayfields['cp.date_approval']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
 	print '</td>';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index e15e7485cc5..9c0a8dad19a 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -127,7 +127,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index c9d03da8924..291546f253b 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -423,7 +423,7 @@ class Establishment extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index e2d9feefa04..6ac49d0291f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -86,7 +86,7 @@ class Evaluation extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -178,7 +178,7 @@ class Evaluation extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -222,10 +222,10 @@ class Evaluation extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -467,10 +467,10 @@ class Evaluation extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -478,11 +478,11 @@ class Evaluation extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -493,10 +493,10 @@ class Evaluation extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -524,7 +524,7 @@ class Evaluation extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -716,7 +716,7 @@ class Evaluation extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -999,7 +999,7 @@ class Evaluation extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 661202521ef..d5989b0f71e 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -85,7 +85,7 @@ class EvaluationLine extends CommonObjectLine
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -166,7 +166,7 @@ class EvaluationLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -210,10 +210,10 @@ class EvaluationLine extends CommonObjectLine
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -433,10 +433,10 @@ class EvaluationLine extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -444,11 +444,11 @@ class EvaluationLine extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		if ($this->fk_rank) {
 			$skillRank = new SkillRank($this->db);
@@ -464,10 +464,10 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -495,7 +495,7 @@ class EvaluationLine extends CommonObjectLine
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -684,7 +684,7 @@ class EvaluationLine extends CommonObjectLine
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -967,7 +967,7 @@ class EvaluationLine extends CommonObjectLine
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 09c0a81605b..82f0affcd34 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -84,7 +84,7 @@ class Job extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -167,7 +167,7 @@ class Job extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -211,10 +211,10 @@ class Job extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -436,10 +436,10 @@ class Job extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -447,11 +447,11 @@ class Job extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -462,10 +462,10 @@ class Job extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -493,7 +493,7 @@ class Job extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -719,7 +719,7 @@ class Job extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1006,7 +1006,7 @@ class Job extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1158,7 +1158,7 @@ class JobLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 57a267c5264..de76565d035 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -84,7 +84,7 @@ class Position extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -177,7 +177,7 @@ class Position extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -220,11 +220,11 @@ class Position extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param User $user User that creates
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, Id of created object if OK
+	 * @param User 	$user 		User that creates
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -445,11 +445,11 @@ class Position extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param User $user User that modifies
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user 		User that modifies
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -457,11 +457,11 @@ class Position extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user 		User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -470,12 +470,12 @@ class Position extends CommonObject
 	/**
 	 *  Delete a line of object in database
 	 *
-	 * @param User $user User that delete
-	 * @param int $idline Id of line to delete
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int                >0 if OK, <0 if KO
+	 * @param User 	$user 		User that delete
+	 * @param int 	$idline 	Id of line to delete
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int              Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -503,7 +503,7 @@ class Position extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this) . "::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -692,7 +692,7 @@ class Position extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 * @param 	int 		$withpicto 				Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 * @param 	string 		$option 				On what the link point to ('nolink', ...)
@@ -905,7 +905,7 @@ class Position extends CommonObject
 	 * @param  array   $val		       Array of properties of field to show
 	 * @param  string  $key            Key of attribute
 	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      To add more parametes on html input tag
+	 * @param  string  $moreparam      To add more parameters on html input tag
 	 * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  mixed   $morecss        Value for css to define size. May also be a numeric.
@@ -1064,7 +1064,7 @@ class Position extends CommonObject
 	 * Create a document onto disk according to template module.
 	 *
 	 * @param string $modele Force template to use ('' to not force)
-	 * @param Translate $outputlangs objet lang a utiliser pour traduction
+	 * @param Translate $outputlangs object lang a utiliser pour traduction
 	 * @param int $hidedetails Hide details of lines
 	 * @param int $hidedesc Hide description
 	 * @param int $hideref Hide ref
@@ -1187,7 +1187,7 @@ class PositionLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index d9c6fc6772b..aa731a9e487 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -90,7 +90,7 @@ class Skill extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -178,7 +178,7 @@ class Skill extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -222,10 +222,10 @@ class Skill extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs,$conf;
 
@@ -243,7 +243,7 @@ class Skill extends CommonObject
 	/**
 	 * createSkills
 	 *
-	 * @param int 	$i 		Rank from which we want to create skilldets (level $i to HRM_MAXRANK wil be created)
+	 * @param int 	$i 		Rank from which we want to create skilldets (level $i to HRM_MAXRANK will be created)
 	 * @return int          Return integer <0 if KO, Id of created object if OK
 	 */
 	public function createSkills($i = 1)
@@ -505,10 +505,10 @@ class Skill extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -516,11 +516,11 @@ class Skill extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
@@ -530,10 +530,10 @@ class Skill extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -561,7 +561,7 @@ class Skill extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -750,7 +750,7 @@ class Skill extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -760,7 +760,7 @@ class Skill extends CommonObject
 	 *  @return	string                              String with URL
 	 */
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1048,7 +1048,7 @@ class Skill extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index aff9292cac4..ee5deedac9a 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -84,7 +84,7 @@ class Skilldet extends CommonObjectLine
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -158,7 +158,7 @@ class Skilldet extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -202,10 +202,10 @@ class Skilldet extends CommonObjectLine
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -427,10 +427,10 @@ class Skilldet extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -438,11 +438,11 @@ class Skilldet extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int            	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -453,10 +453,10 @@ class Skilldet extends CommonObjectLine
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -484,7 +484,7 @@ class Skilldet extends CommonObjectLine
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -673,7 +673,7 @@ class Skilldet extends CommonObjectLine
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -935,7 +935,7 @@ class Skilldet extends CommonObjectLine
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 07e3b47d189..c43318b59ef 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -86,7 +86,7 @@ class SkillRank extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -167,7 +167,7 @@ class SkillRank extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -211,10 +211,10 @@ class SkillRank extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -476,10 +476,10 @@ class SkillRank extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -487,11 +487,11 @@ class SkillRank extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -502,10 +502,10 @@ class SkillRank extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -533,7 +533,7 @@ class SkillRank extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -722,7 +722,7 @@ class SkillRank extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1009,7 +1009,7 @@ class SkillRank extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 135e93671de..a75965f797e 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -318,7 +318,7 @@ function diff(&$TMergedSkills)
 }
 
 /**
- * 	Return a html list with rank informations
+ * 	Return a html list with rank information
  * 		@param array $TMergedSkills skill list for display
  * 		@param string $field which column of comparison we are working with
  * 		@return string
@@ -379,7 +379,7 @@ function skillList(&$TMergedSkills)
 }
 
 /**
- *  create an array of lines [ skillLabel,dscription, maxrank on group1 , minrank needed for this skill ]
+ *  create an array of lines [ skillLabel,description, maxrank on group1 , minrank needed for this skill ]
  *
  * @param array $TSkill1 skill list of first column
  * @param array $TSkill2 skill list of second column
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 0c5353ef7cd..e7681e75b6c 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -64,7 +64,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index c49e60c030b..78e8681216e 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -91,7 +91,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -498,7 +498,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index d9f432fd7f2..e0cfb3636bf 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -61,7 +61,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 1d2ed7ab515..aa66d55dd4a 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -90,7 +90,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -473,7 +473,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/hrm/lib/hrm_evaluation.lib.php b/htdocs/hrm/lib/hrm_evaluation.lib.php
index 3b2606e3f4a..d4b99471087 100644
--- a/htdocs/hrm/lib/hrm_evaluation.lib.php
+++ b/htdocs/hrm/lib/hrm_evaluation.lib.php
@@ -135,6 +135,7 @@ function GetLegendSkills()
 function getRankOrderResults($obj)
 {
 	global $langs;
+
 	$results = array(
 		'greater' => array(
 			'title' => $langs->trans('MaxlevelGreaterThanShort'),
@@ -157,7 +158,7 @@ function getRankOrderResults($obj)
 	} elseif ($obj->rankorder < $obj->required_rank) {
 		$key = 'lesser';
 	}
-	return '<span title="'.strtoupper($obj->label).': ' .$results[$key]['title']. '" class="radio_js_bloc_number TNote_1" style="' . htmlspecialchars($results[$key]['style'], ENT_QUOTES) . '">' . strtoupper(substr($obj->label, 0, 3)) .(strlen($obj->label) > 3 ? '..' : '').'</span>';
+	return '<span title="'.dol_escape_htmltag($obj->label).': ' .$results[$key]['title']. '" class="radio_js_bloc_number TNote_1" style="' . dol_escape_htmltag($results[$key]['style']) . '">' . dol_trunc($obj->label, 4).'</span>';
 }
 
 /**
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 40f5d747011..7ef6bf1c24c 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -97,7 +97,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($objectposition->fields as $key => $val) {
@@ -542,7 +542,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
 
 	// Fields title search
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 1a8ec59f936..b1534dc9787 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -231,7 +231,7 @@ if ($object->id > 0) {
 		$filters['search_agenda_label'] = $search_agenda_label;
 		$filters['search_rowid'] = $search_rowid;
 
-		$object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
+		$object->fields['label']=array(); // Useful to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
 
 		// TODO Replace this with same code than into list.php
 		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index 4d12c002748..0dda7f0bea1 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -104,7 +104,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 461e0259a82..bb9c888f93a 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -91,7 +91,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -484,7 +484,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index df0a9c26add..434b6b49979 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -62,7 +62,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -540,7 +540,7 @@ if ($action != "create" && $action != "edit") {
 		$sortorder = "ASC";
 	}
 
-	// Initialize array of search criterias
+	// Initialize array of search criteria
 	$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 	$search = array();
 	foreach ($objectline->fields as $key => $val) {
@@ -671,7 +671,7 @@ if ($action != "create" && $action != "edit") {
 	//  $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	//  $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
 
 
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 7d562077b59..604a288843a 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -91,7 +91,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -486,7 +486,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 1d9f16b55e4..4a1026a475d 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -474,7 +474,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$resql = $db->query($sql);
 		$num = $db->num_rows($resql);
 
-		print_barre_liste($langs->trans("Evaluations"), $page, $_SERVER["PHP_SELF"], '', '', '', '', $num, $num, $evaltmp->picto, 0);
+		//num of evaluations for each user
+		$sqlEval = "SELECT rowid FROM ".MAIN_DB_PREFIX."hrm_evaluation as e";
+		$sqlEval .= " WHERE e.fk_user = ".((int) $id);
+		$rslt = $db->query($sqlEval);
+		$numEval = $db->num_rows($sqlEval);
+
+		print_barre_liste($langs->trans("Evaluations"), $page, $_SERVER["PHP_SELF"], '', '', '', '', $numEval, $numEval, $evaltmp->picto, 0);
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder centpercent" width="100%">';
@@ -524,6 +530,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print $evaltmp->getLibStatut(2);
 				print '</td>';
 				print '<td class="linecolrank tdoverflowmax300">';
+
 				if (!is_array($object)) {
 					print $object->result;
 				} else {
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 28bf51fa4e0..0687650ce8a 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -186,9 +186,9 @@ class Import
 						$this->array_import_fields[$i] = $module->import_fields_array[$r];
 						// Array of hidden fields to import (key=field, value=label)
 						$this->array_import_fieldshidden[$i] = (isset($module->import_fieldshidden_array[$r]) ? $module->import_fieldshidden_array[$r] : '');
-						// Tableau des entites a exporter (cle=champ, valeur=entite)
+						// Array of entiteis to export (key=field, value=entity)
 						$this->array_import_entities[$i] = $module->import_entities_array[$r];
-						// Tableau des alias a exporter (cle=champ, valeur=alias)
+						// Array of aliases to export (key=field, value=alias)
 						$this->array_import_regex[$i] = (isset($module->import_regex_array[$r]) ? $module->import_regex_array[$r] : '');
 						// Array of columns allowed as UPDATE options
 						$this->array_import_updatekeys[$i] = (isset($module->import_updatekeys_array[$r]) ? $module->import_updatekeys_array[$r] : '');
@@ -235,7 +235,7 @@ class Import
 
 		dol_syslog(get_class($this)."::build_example_file ".$model);
 
-		// Creation de la classe d'import du model Import_XXX
+		// Create the import class for the model Import_XXX
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 		$file = "import_".$model.".modules.php";
 		$classname = "Import".$model;
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 0117a3cfd38..4eb466dbf76 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -292,7 +292,7 @@ if ($step == 3 && $datatoimport) {
 		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 		}
-		Header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param);
+		header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param);
 		exit;
 	}
 }
@@ -379,7 +379,7 @@ if ($step == 1 || !$datatoimport) {
 	print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
 
 	// Affiche les modules d'imports
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Module").'</td>';
@@ -486,12 +486,12 @@ if ($step == 2 && $datatoimport) {
 
 	print '<br>';
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent" cellpadding="4">';
 
 	$filetoimport = '';
 
-	// Add format informations and link to download example
+	// Add format information and link to download example
 	print '<tr class="liste_titre"><td colspan="5">';
 	print $langs->trans("FileMustHaveOneOfFollowingFormat");
 	print '</td></tr>';
@@ -701,7 +701,7 @@ if ($step == 3 && $datatoimport) {
 	// Search available imports
 	$filearray = dol_dir_list($conf->import->dir_temp, 'files', 0, '', '', 'name', SORT_DESC);
 	if (count($filearray) > 0) {
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="noborder centpercent" width="100%" cellpadding="4">';
 
 		$dir = $conf->import->dir_temp;
@@ -803,7 +803,7 @@ if ($step == 4 && $datatoimport) {
 	// The value to use
 	$separator_used = str_replace('\t', "\t", $separator);
 
-	// Create classe to use for import
+	// Create class to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 	$file = "import_".$model.".modules.php";
 	$classname = "Import".ucfirst($model);
@@ -1061,7 +1061,7 @@ if ($step == 4 && $datatoimport) {
 	print '</form>';
 
 	// Title of array with fields
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("FieldsInSourceFile").'</td>';
@@ -1084,10 +1084,9 @@ if ($step == 4 && $datatoimport) {
 
 	// List of source fields
 
-	$var = false;
 	$lefti = 1;
 	foreach ($fieldssource as $key => $val) {
-		show_elem($fieldssource, $key, $val, $var); // key is field number in source file
+		show_elem($fieldssource, $key, $val); // key is field number in source file
 		$listofkeys[$key] = 1;
 		$fieldsplaced[$key] = 1;
 		$valforsourcefieldnb[$lefti] = $key;
@@ -1190,7 +1189,7 @@ if ($step == 4 && $datatoimport) {
 
 			$filecolumn = ($i + 1);
 			// Source field info
-			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need convertion
+			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need conversion
 				$filecolumntoshow = num2Alpha($i);
 			} else {
 				if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromref') {
@@ -1203,7 +1202,7 @@ if ($step == 4 && $datatoimport) {
 			// Source required
 			$example = !empty($objimport->array_import_examplevalues[0][$tmpcode]) ? $objimport->array_import_examplevalues[0][$tmpcode] : "";
 			// Example
-			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need convertion
+			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need conversion
 				if ($example) {
 					$htmltext .= $langs->trans("SourceExample").': <b>'.str_replace('"', '', $example).'</b><br>';
 				}
@@ -1481,7 +1480,7 @@ if ($step == 4 && $datatoimport) {
 		print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
 		print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table summary="selectofimportprofil" class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ImportModelName").'</td>';
@@ -1490,7 +1489,7 @@ if ($step == 4 && $datatoimport) {
 		print '</tr>';
 
 		$nameofimportprofile = str_replace(' ', '-', $langs->trans("ImportProfile").' '.$titleofmodule.' '.dol_print_date(dol_now('gmt'), 'dayxcard'));
-		if (GETPOST('import_name')) {	// If we have submited a form, we take value used fot the update try
+		if (GETPOST('import_name')) {	// If we have submitted a form, we take value used for the update try
 			$nameofimportprofile = $import_name;
 		}
 
@@ -1564,7 +1563,7 @@ if ($step == 5 && $datatoimport) {
 	$model = $format;
 	$list = $objmodelimport->listOfAvailableImportFormat($db);
 
-	// Create classe to use for import
+	// Create class to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 	$file = "import_".$model.".modules.php";
 	$classname = "Import".ucfirst($model);
@@ -2054,7 +2053,7 @@ if ($step == 6 && $datatoimport) {
 	$importid = GETPOST("importid", 'alphanohtml');
 
 
-	// Create classe to use for import
+	// Create class to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 	$file = "import_".$model.".modules.php";
 	$classname = "Import".ucfirst($model);
@@ -2406,11 +2405,9 @@ $db->close();
  * @param	array	$fieldssource	List of source fields
  * @param	int		$pos			Pos
  * @param	string	$key			Key
- * @param	boolean	$var			Line style (odd or not). No more used.
- * @param	int		$nostyle		Hide style
  * @return	void
  */
-function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
+function show_elem($fieldssource, $pos, $key)
 {
 	global $conf, $langs;
 
@@ -2451,7 +2448,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		// Print field of source file
 		print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
-		// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
+		// The image must have the class 'boxhandle' because it's value used in DOM draggable objects to define the area used to catch the full object
 		//print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
 		print img_picto($langs->trans("Column").' '.num2Alpha($pos - 1), 'file', 'class="pictofixedwith"');
 		print '</td>';
@@ -2520,7 +2517,7 @@ function getnewkey(&$fieldssource, &$listofkey)
  * Return array with element inserted in it at position $position
  *
  * @param 	array	$array			Array of field source
- * @param	mixed	$position		key of postion to insert to
+ * @param	mixed	$position		key of position to insert to
  * @param	array	$insertArray	Array to insert
  * @return	array
  */
diff --git a/htdocs/includes/jstz/jstz.js b/htdocs/includes/jstz/jstz.js
deleted file mode 100644
index 89edbde6c25..00000000000
--- a/htdocs/includes/jstz/jstz.js
+++ /dev/null
@@ -1,1433 +0,0 @@
-(function (root) {/*global exports, Intl*/
-/**
- * This script gives you the zone info key representing your device's time zone setting.
- *
- * @name jsTimezoneDetect
- * @version 1.0.6
- * @author Jon Nylander
- * @license MIT License - https://bitbucket.org/pellepim/jstimezonedetect/src/default/LICENCE.txt
- *
- * For usage and examples, visit:
- * http://pellepim.bitbucket.org/jstz/
- *
- * Copyright (c) Jon Nylander
- */
-
-
-/**
- * Namespace to hold all the code for timezone detection.
- */
-var jstz = (function () {
-    'use strict';
-    var HEMISPHERE_SOUTH = 's',
-
-        consts = {
-            DAY: 86400000,
-            HOUR: 3600000,
-            MINUTE: 60000,
-            SECOND: 1000,
-            BASELINE_YEAR: 2014,
-            MAX_SCORE: 864000000, // 10 days
-            AMBIGUITIES: {
-                'America/Denver':       ['America/Mazatlan'],
-                'Europe/London':        ['Africa/Casablanca'],
-                'America/Chicago':      ['America/Mexico_City'],
-                'America/Asuncion':     ['America/Campo_Grande', 'America/Santiago'],
-                'America/Montevideo':   ['America/Sao_Paulo', 'America/Santiago'],
-                // Europe/Minsk should not be in this list... but Windows.
-                'Asia/Beirut':          ['Asia/Amman', 'Asia/Jerusalem', 'Europe/Helsinki', 'Asia/Damascus', 'Africa/Cairo', 'Asia/Gaza', 'Europe/Minsk'],
-                'Pacific/Auckland':     ['Pacific/Fiji'],
-                'America/Los_Angeles':  ['America/Santa_Isabel'],
-                'America/New_York':     ['America/Havana'],
-                'America/Halifax':      ['America/Goose_Bay'],
-                'America/Godthab':      ['America/Miquelon'],
-                'Asia/Dubai':           ['Asia/Yerevan'],
-                'Asia/Jakarta':         ['Asia/Krasnoyarsk'],
-                'Asia/Shanghai':        ['Asia/Irkutsk', 'Australia/Perth'],
-                'Australia/Sydney':     ['Australia/Lord_Howe'],
-                'Asia/Tokyo':           ['Asia/Yakutsk'],
-                'Asia/Dhaka':           ['Asia/Omsk'],
-                // In the real world Yerevan is not ambigous for Baku... but Windows.
-                'Asia/Baku':            ['Asia/Yerevan'],
-                'Australia/Brisbane':   ['Asia/Vladivostok'],
-                'Pacific/Noumea':       ['Asia/Vladivostok'],
-                'Pacific/Majuro':       ['Asia/Kamchatka', 'Pacific/Fiji'],
-                'Pacific/Tongatapu':    ['Pacific/Apia'],
-                'Asia/Baghdad':         ['Europe/Minsk', 'Europe/Moscow'],
-                'Asia/Karachi':         ['Asia/Yekaterinburg'],
-                'Africa/Johannesburg':  ['Asia/Gaza', 'Africa/Cairo']
-            }
-        },
-
-        /**
-         * Gets the offset in minutes from UTC for a certain date.
-         * @param {Date} date
-         * @returns {Number}
-         */
-        get_date_offset = function get_date_offset(date) {
-            var offset = -date.getTimezoneOffset();
-            return (offset !== null ? offset : 0);
-        },
-
-        /**
-         * This function does some basic calculations to create information about
-         * the user's timezone. It uses REFERENCE_YEAR as a solid year for which
-         * the script has been tested rather than depend on the year set by the
-         * client device.
-         *
-         * Returns a key that can be used to do lookups in jstz.olson.timezones.
-         * eg: "720,1,2".
-         *
-         * @returns {String}
-         */
-        lookup_key = function lookup_key() {
-            var january_offset = get_date_offset(new Date(consts.BASELINE_YEAR, 0, 2)),
-                june_offset = get_date_offset(new Date(consts.BASELINE_YEAR, 5, 2)),
-                diff = january_offset - june_offset;
-
-            if (diff < 0) {
-                return january_offset + ",1";
-            } else if (diff > 0) {
-                return june_offset + ",1," + HEMISPHERE_SOUTH;
-            }
-
-            return january_offset + ",0";
-        },
-
-
-        /**
-         * Tries to get the time zone key directly from the operating system for those
-         * environments that support the ECMAScript Internationalization API.
-         */
-        get_from_internationalization_api = function get_from_internationalization_api() {
-            var format, timezone;
-            if (typeof Intl === "undefined" || typeof Intl.DateTimeFormat === "undefined") {
-                return;
-            }
-
-            format = Intl.DateTimeFormat();
-
-            if (typeof format === "undefined" || typeof format.resolvedOptions === "undefined") {
-                return;
-            }
-
-            timezone = format.resolvedOptions().timeZone;
-
-            if (timezone && (timezone.indexOf("/") > -1 || timezone === 'UTC')) {
-                return timezone;
-            }
-
-        },
-
-        /**
-         * Starting point for getting all the DST rules for a specific year
-         * for the current timezone (as described by the client system).
-         *
-         * Returns an object with start and end attributes, or false if no
-         * DST rules were found for the year.
-         *
-         * @param year
-         * @returns {Object} || {Boolean}
-         */
-        dst_dates = function dst_dates(year) {
-            var yearstart = new Date(year, 0, 1, 0, 0, 1, 0).getTime();
-            var yearend = new Date(year, 12, 31, 23, 59, 59).getTime();
-            var current = yearstart;
-            var offset = (new Date(current)).getTimezoneOffset();
-            var dst_start = null;
-            var dst_end = null;
-
-            while (current < yearend - 86400000) {
-                var dateToCheck = new Date(current);
-                var dateToCheckOffset = dateToCheck.getTimezoneOffset();
-
-                if (dateToCheckOffset !== offset) {
-                    if (dateToCheckOffset < offset) {
-                        dst_start = dateToCheck;
-                    }
-                    if (dateToCheckOffset > offset) {
-                        dst_end = dateToCheck;
-                    }
-                    offset = dateToCheckOffset;
-                }
-
-                current += 86400000;
-            }
-
-            if (dst_start && dst_end) {
-                return {
-                    s: find_dst_fold(dst_start).getTime(),
-                    e: find_dst_fold(dst_end).getTime()
-                };
-            }
-
-            return false;
-        },
-
-        /**
-         * Probably completely unnecessary function that recursively finds the
-         * exact (to the second) time when a DST rule was changed.
-         *
-         * @param a_date - The candidate Date.
-         * @param padding - integer specifying the padding to allow around the candidate
-         *                  date for finding the fold.
-         * @param iterator - integer specifying how many milliseconds to iterate while
-         *                   searching for the fold.
-         *
-         * @returns {Date}
-         */
-        find_dst_fold = function find_dst_fold(a_date, padding, iterator) {
-            if (typeof padding === 'undefined') {
-                padding = consts.DAY;
-                iterator = consts.HOUR;
-            }
-
-            var date_start = new Date(a_date.getTime() - padding).getTime();
-            var date_end = a_date.getTime() + padding;
-            var offset = new Date(date_start).getTimezoneOffset();
-
-            var current = date_start;
-
-            var dst_change = null;
-            while (current < date_end - iterator) {
-                var dateToCheck = new Date(current);
-                var dateToCheckOffset = dateToCheck.getTimezoneOffset();
-
-                if (dateToCheckOffset !== offset) {
-                    dst_change = dateToCheck;
-                    break;
-                }
-                current += iterator;
-            }
-
-            if (padding === consts.DAY) {
-                return find_dst_fold(dst_change, consts.HOUR, consts.MINUTE);
-            }
-
-            if (padding === consts.HOUR) {
-                return find_dst_fold(dst_change, consts.MINUTE, consts.SECOND);
-            }
-
-            return dst_change;
-        },
-
-        windows7_adaptations = function windows7_adaptions(rule_list, preliminary_timezone, score, sample) {
-            if (score !== 'N/A') {
-                return score;
-            }
-            if (preliminary_timezone === 'Asia/Beirut') {
-                if (sample.name === 'Africa/Cairo') {
-                    if (rule_list[6].s === 1398376800000 && rule_list[6].e === 1411678800000) {
-                        return 0;
-                    }
-                }
-                if (sample.name === 'Asia/Jerusalem') {
-                    if (rule_list[6].s === 1395964800000 && rule_list[6].e === 1411858800000) {
-                        return 0;
-                }
-            }
-            } else if (preliminary_timezone === 'America/Santiago') {
-                if (sample.name === 'America/Asuncion') {
-                    if (rule_list[6].s === 1412481600000 && rule_list[6].e === 1397358000000) {
-                        return 0;
-                    }
-                }
-                if (sample.name === 'America/Campo_Grande') {
-                    if (rule_list[6].s === 1413691200000 && rule_list[6].e === 1392519600000) {
-                        return 0;
-                    }
-                }
-            } else if (preliminary_timezone === 'America/Montevideo') {
-                if (sample.name === 'America/Sao_Paulo') {
-                    if (rule_list[6].s === 1413687600000 && rule_list[6].e === 1392516000000) {
-                        return 0;
-                    }
-                }
-            } else if (preliminary_timezone === 'Pacific/Auckland') {
-                if (sample.name === 'Pacific/Fiji') {
-                    if (rule_list[6].s === 1414245600000 && rule_list[6].e === 1396101600000) {
-                        return 0;
-                    }
-                }
-            }
-
-            return score;
-        },
-
-        /**
-         * Takes the DST rules for the current timezone, and proceeds to find matches
-         * in the jstz.olson.dst_rules.zones array.
-         *
-         * Compares samples to the current timezone on a scoring basis.
-         *
-         * Candidates are ruled immediately if either the candidate or the current zone
-         * has a DST rule where the other does not.
-         *
-         * Candidates are ruled out immediately if the current zone has a rule that is
-         * outside the DST scope of the candidate.
-         *
-         * Candidates are included for scoring if the current zones rules fall within the
-         * span of the samples rules.
-         *
-         * Low score is best, the score is calculated by summing up the differences in DST
-         * rules and if the consts.MAX_SCORE is overreached the candidate is ruled out.
-         *
-         * Yah follow? :)
-         *
-         * @param rule_list
-         * @param preliminary_timezone
-         * @returns {*}
-         */
-        best_dst_match = function best_dst_match(rule_list, preliminary_timezone) {
-            var score_sample = function score_sample(sample) {
-                var score = 0;
-
-                for (var j = 0; j < rule_list.length; j++) {
-
-                    // Both sample and current time zone report DST during the year.
-                    if (!!sample.rules[j] && !!rule_list[j]) {
-
-                        // The current time zone's DST rules are inside the sample's. Include.
-                        if (rule_list[j].s >= sample.rules[j].s && rule_list[j].e <= sample.rules[j].e) {
-                            score = 0;
-                            score += Math.abs(rule_list[j].s - sample.rules[j].s);
-                            score += Math.abs(sample.rules[j].e - rule_list[j].e);
-
-                        // The current time zone's DST rules are outside the sample's. Discard.
-                        } else {
-                            score = 'N/A';
-                            break;
-                        }
-
-                        // The max score has been reached. Discard.
-                        if (score > consts.MAX_SCORE) {
-                            score = 'N/A';
-                            break;
-                        }
-                    }
-                }
-
-                score = windows7_adaptations(rule_list, preliminary_timezone, score, sample);
-
-                return score;
-            };
-            var scoreboard = {};
-            var dst_zones = jstz.olson.dst_rules.zones;
-            var dst_zones_length = dst_zones.length;
-            var ambiguities = consts.AMBIGUITIES[preliminary_timezone];
-
-            for (var i = 0; i < dst_zones_length; i++) {
-                var sample = dst_zones[i];
-                var score = score_sample(dst_zones[i]);
-
-                if (score !== 'N/A') {
-                    scoreboard[sample.name] = score;
-                }
-            }
-
-            for (var tz in scoreboard) {
-                if (scoreboard.hasOwnProperty(tz)) {
-                    for (var j = 0; j < ambiguities.length; j++) {
-                        if (ambiguities[j] === tz) {
-                            return tz;
-                        }
-                    }
-                }
-            }
-
-            return preliminary_timezone;
-        },
-
-        /**
-         * Takes the preliminary_timezone as detected by lookup_key().
-         *
-         * Builds up the current timezones DST rules for the years defined
-         * in the jstz.olson.dst_rules.years array.
-         *
-         * If there are no DST occurences for those years, immediately returns
-         * the preliminary timezone. Otherwise proceeds and tries to solve
-         * ambiguities.
-         *
-         * @param preliminary_timezone
-         * @returns {String} timezone_name
-         */
-        get_by_dst = function get_by_dst(preliminary_timezone) {
-            var get_rules = function get_rules() {
-                var rule_list = [];
-                for (var i = 0; i < jstz.olson.dst_rules.years.length; i++) {
-                    var year_rules = dst_dates(jstz.olson.dst_rules.years[i]);
-                    rule_list.push(year_rules);
-                }
-                return rule_list;
-            };
-            var check_has_dst = function check_has_dst(rules) {
-                for (var i = 0; i < rules.length; i++) {
-                    if (rules[i] !== false) {
-                        return true;
-                    }
-                }
-                return false;
-            };
-            var rules = get_rules();
-            var has_dst = check_has_dst(rules);
-
-            if (has_dst) {
-                return best_dst_match(rules, preliminary_timezone);
-            }
-
-            return preliminary_timezone;
-        },
-
-        /**
-         * Uses get_timezone_info() to formulate a key to use in the olson.timezones dictionary.
-         *
-         * Returns an object with one function ".name()"
-         *
-         * @returns Object
-         */
-        determine = function determine() {
-            var preliminary_tz = get_from_internationalization_api();
-
-            if (!preliminary_tz) {
-                preliminary_tz = jstz.olson.timezones[lookup_key()];
-
-                if (typeof consts.AMBIGUITIES[preliminary_tz] !== 'undefined') {
-                    preliminary_tz = get_by_dst(preliminary_tz);
-                }
-            }
-
-            return {
-                name: function () {
-                    return preliminary_tz;
-                }
-            };
-        };
-
-    return {
-        determine: determine
-    };
-}());
-
-
-jstz.olson = jstz.olson || {};
-
-/**
- * The keys in this dictionary are comma separated as such:
- *
- * First the offset compared to UTC time in minutes.
- *
- * Then a flag which is 0 if the timezone does not take daylight savings into account and 1 if it
- * does.
- *
- * Thirdly an optional 's' signifies that the timezone is in the southern hemisphere,
- * only interesting for timezones with DST.
- *
- * The mapped arrays is used for constructing the jstz.TimeZone object from within
- * jstz.determine();
- */
-jstz.olson.timezones = {
-    '-720,0': 'Etc/GMT+12',
-    '-660,0': 'Pacific/Pago_Pago',
-    '-660,1,s': 'Pacific/Apia', // Why? Because windows... cry!
-    '-600,1': 'America/Adak',
-    '-600,0': 'Pacific/Honolulu',
-    '-570,0': 'Pacific/Marquesas',
-    '-540,0': 'Pacific/Gambier',
-    '-540,1': 'America/Anchorage',
-    '-480,1': 'America/Los_Angeles',
-    '-480,0': 'Pacific/Pitcairn',
-    '-420,0': 'America/Phoenix',
-    '-420,1': 'America/Denver',
-    '-360,0': 'America/Guatemala',
-    '-360,1': 'America/Chicago',
-    '-360,1,s': 'Pacific/Easter',
-    '-300,0': 'America/Bogota',
-    '-300,1': 'America/New_York',
-    '-270,0': 'America/Caracas',
-    '-240,1': 'America/Halifax',
-    '-240,0': 'America/Santo_Domingo',
-    '-240,1,s': 'America/Asuncion',
-    '-210,1': 'America/St_Johns',
-    '-180,1': 'America/Godthab',
-    '-180,0': 'America/Argentina/Buenos_Aires',
-    '-180,1,s': 'America/Montevideo',
-    '-120,0': 'America/Noronha',
-    '-120,1': 'America/Noronha',
-    '-60,1': 'Atlantic/Azores',
-    '-60,0': 'Atlantic/Cape_Verde',
-    '0,0': 'UTC',
-    '0,1': 'Europe/London',
-    '60,1': 'Europe/Berlin',
-    '60,0': 'Africa/Lagos',
-    '60,1,s': 'Africa/Windhoek',
-    '120,1': 'Asia/Beirut',
-    '120,0': 'Africa/Johannesburg',
-    '180,0': 'Asia/Baghdad',
-    '180,1': 'Europe/Moscow',
-    '210,1': 'Asia/Tehran',
-    '240,0': 'Asia/Dubai',
-    '240,1': 'Asia/Baku',
-    '270,0': 'Asia/Kabul',
-    '300,1': 'Asia/Yekaterinburg',
-    '300,0': 'Asia/Karachi',
-    '330,0': 'Asia/Kolkata',
-    '345,0': 'Asia/Kathmandu',
-    '360,0': 'Asia/Dhaka',
-    '360,1': 'Asia/Omsk',
-    '390,0': 'Asia/Rangoon',
-    '420,1': 'Asia/Krasnoyarsk',
-    '420,0': 'Asia/Jakarta',
-    '480,0': 'Asia/Shanghai',
-    '480,1': 'Asia/Irkutsk',
-    '525,0': 'Australia/Eucla',
-    '525,1,s': 'Australia/Eucla',
-    '540,1': 'Asia/Yakutsk',
-    '540,0': 'Asia/Tokyo',
-    '570,0': 'Australia/Darwin',
-    '570,1,s': 'Australia/Adelaide',
-    '600,0': 'Australia/Brisbane',
-    '600,1': 'Asia/Vladivostok',
-    '600,1,s': 'Australia/Sydney',
-    '630,1,s': 'Australia/Lord_Howe',
-    '660,1': 'Asia/Kamchatka',
-    '660,0': 'Pacific/Noumea',
-    '690,0': 'Pacific/Norfolk',
-    '720,1,s': 'Pacific/Auckland',
-    '720,0': 'Pacific/Majuro',
-    '765,1,s': 'Pacific/Chatham',
-    '780,0': 'Pacific/Tongatapu',
-    '780,1,s': 'Pacific/Apia',
-    '840,0': 'Pacific/Kiritimati'
-};
-
-/* Build time: 2015-11-02 13:01:00Z Build by invoking python utilities/dst.py generate */
-jstz.olson.dst_rules = {
-    "years": [
-        2008,
-        2009,
-        2010,
-        2011,
-        2012,
-        2013,
-        2014
-    ],
-    "zones": [
-        {
-            "name": "Africa/Cairo",
-            "rules": [
-                {
-                    "e": 1219957200000,
-                    "s": 1209074400000
-                },
-                {
-                    "e": 1250802000000,
-                    "s": 1240524000000
-                },
-                {
-                    "e": 1285880400000,
-                    "s": 1284069600000
-                },
-                false,
-                false,
-                false,
-                {
-                    "e": 1411678800000,
-                    "s": 1406844000000
-                }
-            ]
-        },
-        {
-            "name": "Africa/Casablanca",
-            "rules": [
-                {
-                    "e": 1220223600000,
-                    "s": 1212278400000
-                },
-                {
-                    "e": 1250809200000,
-                    "s": 1243814400000
-                },
-                {
-                    "e": 1281222000000,
-                    "s": 1272758400000
-                },
-                {
-                    "e": 1312066800000,
-                    "s": 1301788800000
-                },
-                {
-                    "e": 1348970400000,
-                    "s": 1345428000000
-                },
-                {
-                    "e": 1382839200000,
-                    "s": 1376100000000
-                },
-                {
-                    "e": 1414288800000,
-                    "s": 1406944800000
-                }
-            ]
-        },
-        {
-            "name": "America/Asuncion",
-            "rules": [
-                {
-                    "e": 1205031600000,
-                    "s": 1224388800000
-                },
-                {
-                    "e": 1236481200000,
-                    "s": 1255838400000
-                },
-                {
-                    "e": 1270954800000,
-                    "s": 1286078400000
-                },
-                {
-                    "e": 1302404400000,
-                    "s": 1317528000000
-                },
-                {
-                    "e": 1333854000000,
-                    "s": 1349582400000
-                },
-                {
-                    "e": 1364094000000,
-                    "s": 1381032000000
-                },
-                {
-                    "e": 1395543600000,
-                    "s": 1412481600000
-                }
-            ]
-        },
-        {
-            "name": "America/Campo_Grande",
-            "rules": [
-                {
-                    "e": 1203217200000,
-                    "s": 1224388800000
-                },
-                {
-                    "e": 1234666800000,
-                    "s": 1255838400000
-                },
-                {
-                    "e": 1266721200000,
-                    "s": 1287288000000
-                },
-                {
-                    "e": 1298170800000,
-                    "s": 1318737600000
-                },
-                {
-                    "e": 1330225200000,
-                    "s": 1350792000000
-                },
-                {
-                    "e": 1361070000000,
-                    "s": 1382241600000
-                },
-                {
-                    "e": 1392519600000,
-                    "s": 1413691200000
-                }
-            ]
-        },
-        {
-            "name": "America/Goose_Bay",
-            "rules": [
-                {
-                    "e": 1225594860000,
-                    "s": 1205035260000
-                },
-                {
-                    "e": 1257044460000,
-                    "s": 1236484860000
-                },
-                {
-                    "e": 1289098860000,
-                    "s": 1268539260000
-                },
-                {
-                    "e": 1320555600000,
-                    "s": 1299988860000
-                },
-                {
-                    "e": 1352005200000,
-                    "s": 1331445600000
-                },
-                {
-                    "e": 1383454800000,
-                    "s": 1362895200000
-                },
-                {
-                    "e": 1414904400000,
-                    "s": 1394344800000
-                }
-            ]
-        },
-        {
-            "name": "America/Havana",
-            "rules": [
-                {
-                    "e": 1224997200000,
-                    "s": 1205643600000
-                },
-                {
-                    "e": 1256446800000,
-                    "s": 1236488400000
-                },
-                {
-                    "e": 1288501200000,
-                    "s": 1268542800000
-                },
-                {
-                    "e": 1321160400000,
-                    "s": 1300597200000
-                },
-                {
-                    "e": 1352005200000,
-                    "s": 1333256400000
-                },
-                {
-                    "e": 1383454800000,
-                    "s": 1362891600000
-                },
-                {
-                    "e": 1414904400000,
-                    "s": 1394341200000
-                }
-            ]
-        },
-        {
-            "name": "America/Mazatlan",
-            "rules": [
-                {
-                    "e": 1225008000000,
-                    "s": 1207472400000
-                },
-                {
-                    "e": 1256457600000,
-                    "s": 1238922000000
-                },
-                {
-                    "e": 1288512000000,
-                    "s": 1270371600000
-                },
-                {
-                    "e": 1319961600000,
-                    "s": 1301821200000
-                },
-                {
-                    "e": 1351411200000,
-                    "s": 1333270800000
-                },
-                {
-                    "e": 1382860800000,
-                    "s": 1365325200000
-                },
-                {
-                    "e": 1414310400000,
-                    "s": 1396774800000
-                }
-            ]
-        },
-        {
-            "name": "America/Mexico_City",
-            "rules": [
-                {
-                    "e": 1225004400000,
-                    "s": 1207468800000
-                },
-                {
-                    "e": 1256454000000,
-                    "s": 1238918400000
-                },
-                {
-                    "e": 1288508400000,
-                    "s": 1270368000000
-                },
-                {
-                    "e": 1319958000000,
-                    "s": 1301817600000
-                },
-                {
-                    "e": 1351407600000,
-                    "s": 1333267200000
-                },
-                {
-                    "e": 1382857200000,
-                    "s": 1365321600000
-                },
-                {
-                    "e": 1414306800000,
-                    "s": 1396771200000
-                }
-            ]
-        },
-        {
-            "name": "America/Miquelon",
-            "rules": [
-                {
-                    "e": 1225598400000,
-                    "s": 1205038800000
-                },
-                {
-                    "e": 1257048000000,
-                    "s": 1236488400000
-                },
-                {
-                    "e": 1289102400000,
-                    "s": 1268542800000
-                },
-                {
-                    "e": 1320552000000,
-                    "s": 1299992400000
-                },
-                {
-                    "e": 1352001600000,
-                    "s": 1331442000000
-                },
-                {
-                    "e": 1383451200000,
-                    "s": 1362891600000
-                },
-                {
-                    "e": 1414900800000,
-                    "s": 1394341200000
-                }
-            ]
-        },
-        {
-            "name": "America/Santa_Isabel",
-            "rules": [
-                {
-                    "e": 1225011600000,
-                    "s": 1207476000000
-                },
-                {
-                    "e": 1256461200000,
-                    "s": 1238925600000
-                },
-                {
-                    "e": 1288515600000,
-                    "s": 1270375200000
-                },
-                {
-                    "e": 1319965200000,
-                    "s": 1301824800000
-                },
-                {
-                    "e": 1351414800000,
-                    "s": 1333274400000
-                },
-                {
-                    "e": 1382864400000,
-                    "s": 1365328800000
-                },
-                {
-                    "e": 1414314000000,
-                    "s": 1396778400000
-                }
-            ]
-        },
-        {
-            "name": "America/Santiago",
-            "rules": [
-                {
-                    "e": 1206846000000,
-                    "s": 1223784000000
-                },
-                {
-                    "e": 1237086000000,
-                    "s": 1255233600000
-                },
-                {
-                    "e": 1270350000000,
-                    "s": 1286683200000
-                },
-                {
-                    "e": 1304823600000,
-                    "s": 1313899200000
-                },
-                {
-                    "e": 1335668400000,
-                    "s": 1346558400000
-                },
-                {
-                    "e": 1367118000000,
-                    "s": 1378612800000
-                },
-                {
-                    "e": 1398567600000,
-                    "s": 1410062400000
-                }
-            ]
-        },
-        {
-            "name": "America/Sao_Paulo",
-            "rules": [
-                {
-                    "e": 1203213600000,
-                    "s": 1224385200000
-                },
-                {
-                    "e": 1234663200000,
-                    "s": 1255834800000
-                },
-                {
-                    "e": 1266717600000,
-                    "s": 1287284400000
-                },
-                {
-                    "e": 1298167200000,
-                    "s": 1318734000000
-                },
-                {
-                    "e": 1330221600000,
-                    "s": 1350788400000
-                },
-                {
-                    "e": 1361066400000,
-                    "s": 1382238000000
-                },
-                {
-                    "e": 1392516000000,
-                    "s": 1413687600000
-                }
-            ]
-        },
-        {
-            "name": "Asia/Amman",
-            "rules": [
-                {
-                    "e": 1225404000000,
-                    "s": 1206655200000
-                },
-                {
-                    "e": 1256853600000,
-                    "s": 1238104800000
-                },
-                {
-                    "e": 1288303200000,
-                    "s": 1269554400000
-                },
-                {
-                    "e": 1319752800000,
-                    "s": 1301608800000
-                },
-                false,
-                false,
-                {
-                    "e": 1414706400000,
-                    "s": 1395957600000
-                }
-            ]
-        },
-        {
-            "name": "Asia/Damascus",
-            "rules": [
-                {
-                    "e": 1225486800000,
-                    "s": 1207260000000
-                },
-                {
-                    "e": 1256850000000,
-                    "s": 1238104800000
-                },
-                {
-                    "e": 1288299600000,
-                    "s": 1270159200000
-                },
-                {
-                    "e": 1319749200000,
-                    "s": 1301608800000
-                },
-                {
-                    "e": 1351198800000,
-                    "s": 1333058400000
-                },
-                {
-                    "e": 1382648400000,
-                    "s": 1364508000000
-                },
-                {
-                    "e": 1414702800000,
-                    "s": 1395957600000
-                }
-            ]
-        },
-        {
-            "name": "Asia/Dubai",
-            "rules": [
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Gaza",
-            "rules": [
-                {
-                    "e": 1219957200000,
-                    "s": 1206655200000
-                },
-                {
-                    "e": 1252015200000,
-                    "s": 1238104800000
-                },
-                {
-                    "e": 1281474000000,
-                    "s": 1269640860000
-                },
-                {
-                    "e": 1312146000000,
-                    "s": 1301608860000
-                },
-                {
-                    "e": 1348178400000,
-                    "s": 1333058400000
-                },
-                {
-                    "e": 1380229200000,
-                    "s": 1364508000000
-                },
-                {
-                    "e": 1414098000000,
-                    "s": 1395957600000
-                }
-            ]
-        },
-        {
-            "name": "Asia/Irkutsk",
-            "rules": [
-                {
-                    "e": 1224957600000,
-                    "s": 1206813600000
-                },
-                {
-                    "e": 1256407200000,
-                    "s": 1238263200000
-                },
-                {
-                    "e": 1288461600000,
-                    "s": 1269712800000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Jerusalem",
-            "rules": [
-                {
-                    "e": 1223161200000,
-                    "s": 1206662400000
-                },
-                {
-                    "e": 1254006000000,
-                    "s": 1238112000000
-                },
-                {
-                    "e": 1284246000000,
-                    "s": 1269561600000
-                },
-                {
-                    "e": 1317510000000,
-                    "s": 1301616000000
-                },
-                {
-                    "e": 1348354800000,
-                    "s": 1333065600000
-                },
-                {
-                    "e": 1382828400000,
-                    "s": 1364515200000
-                },
-                {
-                    "e": 1414278000000,
-                    "s": 1395964800000
-                }
-            ]
-        },
-        {
-            "name": "Asia/Kamchatka",
-            "rules": [
-                {
-                    "e": 1224943200000,
-                    "s": 1206799200000
-                },
-                {
-                    "e": 1256392800000,
-                    "s": 1238248800000
-                },
-                {
-                    "e": 1288450800000,
-                    "s": 1269698400000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Krasnoyarsk",
-            "rules": [
-                {
-                    "e": 1224961200000,
-                    "s": 1206817200000
-                },
-                {
-                    "e": 1256410800000,
-                    "s": 1238266800000
-                },
-                {
-                    "e": 1288465200000,
-                    "s": 1269716400000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Omsk",
-            "rules": [
-                {
-                    "e": 1224964800000,
-                    "s": 1206820800000
-                },
-                {
-                    "e": 1256414400000,
-                    "s": 1238270400000
-                },
-                {
-                    "e": 1288468800000,
-                    "s": 1269720000000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Vladivostok",
-            "rules": [
-                {
-                    "e": 1224950400000,
-                    "s": 1206806400000
-                },
-                {
-                    "e": 1256400000000,
-                    "s": 1238256000000
-                },
-                {
-                    "e": 1288454400000,
-                    "s": 1269705600000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Yakutsk",
-            "rules": [
-                {
-                    "e": 1224954000000,
-                    "s": 1206810000000
-                },
-                {
-                    "e": 1256403600000,
-                    "s": 1238259600000
-                },
-                {
-                    "e": 1288458000000,
-                    "s": 1269709200000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Yekaterinburg",
-            "rules": [
-                {
-                    "e": 1224968400000,
-                    "s": 1206824400000
-                },
-                {
-                    "e": 1256418000000,
-                    "s": 1238274000000
-                },
-                {
-                    "e": 1288472400000,
-                    "s": 1269723600000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Asia/Yerevan",
-            "rules": [
-                {
-                    "e": 1224972000000,
-                    "s": 1206828000000
-                },
-                {
-                    "e": 1256421600000,
-                    "s": 1238277600000
-                },
-                {
-                    "e": 1288476000000,
-                    "s": 1269727200000
-                },
-                {
-                    "e": 1319925600000,
-                    "s": 1301176800000
-                },
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Australia/Lord_Howe",
-            "rules": [
-                {
-                    "e": 1207407600000,
-                    "s": 1223134200000
-                },
-                {
-                    "e": 1238857200000,
-                    "s": 1254583800000
-                },
-                {
-                    "e": 1270306800000,
-                    "s": 1286033400000
-                },
-                {
-                    "e": 1301756400000,
-                    "s": 1317483000000
-                },
-                {
-                    "e": 1333206000000,
-                    "s": 1349537400000
-                },
-                {
-                    "e": 1365260400000,
-                    "s": 1380987000000
-                },
-                {
-                    "e": 1396710000000,
-                    "s": 1412436600000
-                }
-            ]
-        },
-        {
-            "name": "Australia/Perth",
-            "rules": [
-                {
-                    "e": 1206813600000,
-                    "s": 1224957600000
-                },
-                false,
-                false,
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Europe/Helsinki",
-            "rules": [
-                {
-                    "e": 1224982800000,
-                    "s": 1206838800000
-                },
-                {
-                    "e": 1256432400000,
-                    "s": 1238288400000
-                },
-                {
-                    "e": 1288486800000,
-                    "s": 1269738000000
-                },
-                {
-                    "e": 1319936400000,
-                    "s": 1301187600000
-                },
-                {
-                    "e": 1351386000000,
-                    "s": 1332637200000
-                },
-                {
-                    "e": 1382835600000,
-                    "s": 1364691600000
-                },
-                {
-                    "e": 1414285200000,
-                    "s": 1396141200000
-                }
-            ]
-        },
-        {
-            "name": "Europe/Minsk",
-            "rules": [
-                {
-                    "e": 1224979200000,
-                    "s": 1206835200000
-                },
-                {
-                    "e": 1256428800000,
-                    "s": 1238284800000
-                },
-                {
-                    "e": 1288483200000,
-                    "s": 1269734400000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Europe/Moscow",
-            "rules": [
-                {
-                    "e": 1224975600000,
-                    "s": 1206831600000
-                },
-                {
-                    "e": 1256425200000,
-                    "s": 1238281200000
-                },
-                {
-                    "e": 1288479600000,
-                    "s": 1269730800000
-                },
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "name": "Pacific/Apia",
-            "rules": [
-                false,
-                false,
-                false,
-                {
-                    "e": 1301752800000,
-                    "s": 1316872800000
-                },
-                {
-                    "e": 1333202400000,
-                    "s": 1348927200000
-                },
-                {
-                    "e": 1365256800000,
-                    "s": 1380376800000
-                },
-                {
-                    "e": 1396706400000,
-                    "s": 1411826400000
-                }
-            ]
-        },
-        {
-            "name": "Pacific/Fiji",
-            "rules": [
-                false,
-                false,
-                {
-                    "e": 1269698400000,
-                    "s": 1287842400000
-                },
-                {
-                    "e": 1327154400000,
-                    "s": 1319292000000
-                },
-                {
-                    "e": 1358604000000,
-                    "s": 1350741600000
-                },
-                {
-                    "e": 1390050000000,
-                    "s": 1382796000000
-                },
-                {
-                    "e": 1421503200000,
-                    "s": 1414850400000
-                }
-            ]
-        },
-        {
-            "name": "Europe/London",
-            "rules": [
-                {
-                    "e": 1224982800000,
-                    "s": 1206838800000
-                },
-                {
-                    "e": 1256432400000,
-                    "s": 1238288400000
-                },
-                {
-                    "e": 1288486800000,
-                    "s": 1269738000000
-                },
-                {
-                    "e": 1319936400000,
-                    "s": 1301187600000
-                },
-                {
-                    "e": 1351386000000,
-                    "s": 1332637200000
-                },
-                {
-                    "e": 1382835600000,
-                    "s": 1364691600000
-                },
-                {
-                    "e": 1414285200000,
-                    "s": 1396141200000
-                }
-            ]
-        }
-    ]
-};
-if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-    module.exports = jstz;
-} else if ((typeof define !== 'undefined' && define !== null) && (define.amd != null)) {
-    define([], function() {
-        return jstz;
-    });
-} else {
-    if (typeof root === 'undefined') {
-        window.jstz = jstz;
-    } else {
-        root.jstz = jstz;
-    }
-}
-}());
\ No newline at end of file
diff --git a/htdocs/includes/jstz/jstz.min.js b/htdocs/includes/jstz/jstz.min.js
deleted file mode 100644
index a6be0f665e2..00000000000
--- a/htdocs/includes/jstz/jstz.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* jstz.min.js Version: 1.0.6 Build date: 2015-11-04 */
-!function(e){var a=function(){"use strict";var e="s",s={DAY:864e5,HOUR:36e5,MINUTE:6e4,SECOND:1e3,BASELINE_YEAR:2014,MAX_SCORE:864e6,AMBIGUITIES:{"America/Denver":["America/Mazatlan"],"Europe/London":["Africa/Casablanca"],"America/Chicago":["America/Mexico_City"],"America/Asuncion":["America/Campo_Grande","America/Santiago"],"America/Montevideo":["America/Sao_Paulo","America/Santiago"],"Asia/Beirut":["Asia/Amman","Asia/Jerusalem","Europe/Helsinki","Asia/Damascus","Africa/Cairo","Asia/Gaza","Europe/Minsk"],"Pacific/Auckland":["Pacific/Fiji"],"America/Los_Angeles":["America/Santa_Isabel"],"America/New_York":["America/Havana"],"America/Halifax":["America/Goose_Bay"],"America/Godthab":["America/Miquelon"],"Asia/Dubai":["Asia/Yerevan"],"Asia/Jakarta":["Asia/Krasnoyarsk"],"Asia/Shanghai":["Asia/Irkutsk","Australia/Perth"],"Australia/Sydney":["Australia/Lord_Howe"],"Asia/Tokyo":["Asia/Yakutsk"],"Asia/Dhaka":["Asia/Omsk"],"Asia/Baku":["Asia/Yerevan"],"Australia/Brisbane":["Asia/Vladivostok"],"Pacific/Noumea":["Asia/Vladivostok"],"Pacific/Majuro":["Asia/Kamchatka","Pacific/Fiji"],"Pacific/Tongatapu":["Pacific/Apia"],"Asia/Baghdad":["Europe/Minsk","Europe/Moscow"],"Asia/Karachi":["Asia/Yekaterinburg"],"Africa/Johannesburg":["Asia/Gaza","Africa/Cairo"]}},i=function(e){var a=-e.getTimezoneOffset();return null!==a?a:0},r=function(){var a=i(new Date(s.BASELINE_YEAR,0,2)),r=i(new Date(s.BASELINE_YEAR,5,2)),n=a-r;return 0>n?a+",1":n>0?r+",1,"+e:a+",0"},n=function(){var e,a;if("undefined"!=typeof Intl&&"undefined"!=typeof Intl.DateTimeFormat&&(e=Intl.DateTimeFormat(),"undefined"!=typeof e&&"undefined"!=typeof e.resolvedOptions))return a=e.resolvedOptions().timeZone,a&&(a.indexOf("/")>-1||"UTC"===a)?a:void 0},o=function(e){for(var a=new Date(e,0,1,0,0,1,0).getTime(),s=new Date(e,12,31,23,59,59).getTime(),i=a,r=new Date(i).getTimezoneOffset(),n=null,o=null;s-864e5>i;){var t=new Date(i),A=t.getTimezoneOffset();A!==r&&(r>A&&(n=t),A>r&&(o=t),r=A),i+=864e5}return n&&o?{s:u(n).getTime(),e:u(o).getTime()}:!1},u=function l(e,a,i){"undefined"==typeof a&&(a=s.DAY,i=s.HOUR);for(var r=new Date(e.getTime()-a).getTime(),n=e.getTime()+a,o=new Date(r).getTimezoneOffset(),u=r,t=null;n-i>u;){var A=new Date(u),c=A.getTimezoneOffset();if(c!==o){t=A;break}u+=i}return a===s.DAY?l(t,s.HOUR,s.MINUTE):a===s.HOUR?l(t,s.MINUTE,s.SECOND):t},t=function(e,a,s,i){if("N/A"!==s)return s;if("Asia/Beirut"===a){if("Africa/Cairo"===i.name&&13983768e5===e[6].s&&14116788e5===e[6].e)return 0;if("Asia/Jerusalem"===i.name&&13959648e5===e[6].s&&14118588e5===e[6].e)return 0}else if("America/Santiago"===a){if("America/Asuncion"===i.name&&14124816e5===e[6].s&&1397358e6===e[6].e)return 0;if("America/Campo_Grande"===i.name&&14136912e5===e[6].s&&13925196e5===e[6].e)return 0}else if("America/Montevideo"===a){if("America/Sao_Paulo"===i.name&&14136876e5===e[6].s&&1392516e6===e[6].e)return 0}else if("Pacific/Auckland"===a&&"Pacific/Fiji"===i.name&&14142456e5===e[6].s&&13961016e5===e[6].e)return 0;return s},A=function(e,i){for(var r=function(a){for(var r=0,n=0;n<e.length;n++)if(a.rules[n]&&e[n]){if(!(e[n].s>=a.rules[n].s&&e[n].e<=a.rules[n].e)){r="N/A";break}if(r=0,r+=Math.abs(e[n].s-a.rules[n].s),r+=Math.abs(a.rules[n].e-e[n].e),r>s.MAX_SCORE){r="N/A";break}}return r=t(e,i,r,a)},n={},o=a.olson.dst_rules.zones,u=o.length,A=s.AMBIGUITIES[i],c=0;u>c;c++){var m=o[c],l=r(o[c]);"N/A"!==l&&(n[m.name]=l)}for(var f in n)if(n.hasOwnProperty(f))for(var d=0;d<A.length;d++)if(A[d]===f)return f;return i},c=function(e){var s=function(){for(var e=[],s=0;s<a.olson.dst_rules.years.length;s++){var i=o(a.olson.dst_rules.years[s]);e.push(i)}return e},i=function(e){for(var a=0;a<e.length;a++)if(e[a]!==!1)return!0;return!1},r=s(),n=i(r);return n?A(r,e):e},m=function(){var e=n();return e||(e=a.olson.timezones[r()],"undefined"!=typeof s.AMBIGUITIES[e]&&(e=c(e))),{name:function(){return e}}};return{determine:m}}();a.olson=a.olson||{},a.olson.timezones={"-720,0":"Etc/GMT+12","-660,0":"Pacific/Pago_Pago","-660,1,s":"Pacific/Apia","-600,1":"America/Adak","-600,0":"Pacific/Honolulu","-570,0":"Pacific/Marquesas","-540,0":"Pacific/Gambier","-540,1":"America/Anchorage","-480,1":"America/Los_Angeles","-480,0":"Pacific/Pitcairn","-420,0":"America/Phoenix","-420,1":"America/Denver","-360,0":"America/Guatemala","-360,1":"America/Chicago","-360,1,s":"Pacific/Easter","-300,0":"America/Bogota","-300,1":"America/New_York","-270,0":"America/Caracas","-240,1":"America/Halifax","-240,0":"America/Santo_Domingo","-240,1,s":"America/Asuncion","-210,1":"America/St_Johns","-180,1":"America/Godthab","-180,0":"America/Argentina/Buenos_Aires","-180,1,s":"America/Montevideo","-120,0":"America/Noronha","-120,1":"America/Noronha","-60,1":"Atlantic/Azores","-60,0":"Atlantic/Cape_Verde","0,0":"UTC","0,1":"Europe/London","60,1":"Europe/Berlin","60,0":"Africa/Lagos","60,1,s":"Africa/Windhoek","120,1":"Asia/Beirut","120,0":"Africa/Johannesburg","180,0":"Asia/Baghdad","180,1":"Europe/Moscow","210,1":"Asia/Tehran","240,0":"Asia/Dubai","240,1":"Asia/Baku","270,0":"Asia/Kabul","300,1":"Asia/Yekaterinburg","300,0":"Asia/Karachi","330,0":"Asia/Kolkata","345,0":"Asia/Kathmandu","360,0":"Asia/Dhaka","360,1":"Asia/Omsk","390,0":"Asia/Rangoon","420,1":"Asia/Krasnoyarsk","420,0":"Asia/Jakarta","480,0":"Asia/Shanghai","480,1":"Asia/Irkutsk","525,0":"Australia/Eucla","525,1,s":"Australia/Eucla","540,1":"Asia/Yakutsk","540,0":"Asia/Tokyo","570,0":"Australia/Darwin","570,1,s":"Australia/Adelaide","600,0":"Australia/Brisbane","600,1":"Asia/Vladivostok","600,1,s":"Australia/Sydney","630,1,s":"Australia/Lord_Howe","660,1":"Asia/Kamchatka","660,0":"Pacific/Noumea","690,0":"Pacific/Norfolk","720,1,s":"Pacific/Auckland","720,0":"Pacific/Majuro","765,1,s":"Pacific/Chatham","780,0":"Pacific/Tongatapu","780,1,s":"Pacific/Apia","840,0":"Pacific/Kiritimati"},a.olson.dst_rules={years:[2008,2009,2010,2011,2012,2013,2014],zones:[{name:"Africa/Cairo",rules:[{e:12199572e5,s:12090744e5},{e:1250802e6,s:1240524e6},{e:12858804e5,s:12840696e5},!1,!1,!1,{e:14116788e5,s:1406844e6}]},{name:"Africa/Casablanca",rules:[{e:12202236e5,s:12122784e5},{e:12508092e5,s:12438144e5},{e:1281222e6,s:12727584e5},{e:13120668e5,s:13017888e5},{e:13489704e5,s:1345428e6},{e:13828392e5,s:13761e8},{e:14142888e5,s:14069448e5}]},{name:"America/Asuncion",rules:[{e:12050316e5,s:12243888e5},{e:12364812e5,s:12558384e5},{e:12709548e5,s:12860784e5},{e:13024044e5,s:1317528e6},{e:1333854e6,s:13495824e5},{e:1364094e6,s:1381032e6},{e:13955436e5,s:14124816e5}]},{name:"America/Campo_Grande",rules:[{e:12032172e5,s:12243888e5},{e:12346668e5,s:12558384e5},{e:12667212e5,s:1287288e6},{e:12981708e5,s:13187376e5},{e:13302252e5,s:1350792e6},{e:136107e7,s:13822416e5},{e:13925196e5,s:14136912e5}]},{name:"America/Goose_Bay",rules:[{e:122559486e4,s:120503526e4},{e:125704446e4,s:123648486e4},{e:128909886e4,s:126853926e4},{e:13205556e5,s:129998886e4},{e:13520052e5,s:13314456e5},{e:13834548e5,s:13628952e5},{e:14149044e5,s:13943448e5}]},{name:"America/Havana",rules:[{e:12249972e5,s:12056436e5},{e:12564468e5,s:12364884e5},{e:12885012e5,s:12685428e5},{e:13211604e5,s:13005972e5},{e:13520052e5,s:13332564e5},{e:13834548e5,s:13628916e5},{e:14149044e5,s:13943412e5}]},{name:"America/Mazatlan",rules:[{e:1225008e6,s:12074724e5},{e:12564576e5,s:1238922e6},{e:1288512e6,s:12703716e5},{e:13199616e5,s:13018212e5},{e:13514112e5,s:13332708e5},{e:13828608e5,s:13653252e5},{e:14143104e5,s:13967748e5}]},{name:"America/Mexico_City",rules:[{e:12250044e5,s:12074688e5},{e:1256454e6,s:12389184e5},{e:12885084e5,s:1270368e6},{e:1319958e6,s:13018176e5},{e:13514076e5,s:13332672e5},{e:13828572e5,s:13653216e5},{e:14143068e5,s:13967712e5}]},{name:"America/Miquelon",rules:[{e:12255984e5,s:12050388e5},{e:1257048e6,s:12364884e5},{e:12891024e5,s:12685428e5},{e:1320552e6,s:12999924e5},{e:13520016e5,s:1331442e6},{e:13834512e5,s:13628916e5},{e:14149008e5,s:13943412e5}]},{name:"America/Santa_Isabel",rules:[{e:12250116e5,s:1207476e6},{e:12564612e5,s:12389256e5},{e:12885156e5,s:12703752e5},{e:13199652e5,s:13018248e5},{e:13514148e5,s:13332744e5},{e:13828644e5,s:13653288e5},{e:1414314e6,s:13967784e5}]},{name:"America/Santiago",rules:[{e:1206846e6,s:1223784e6},{e:1237086e6,s:12552336e5},{e:127035e7,s:12866832e5},{e:13048236e5,s:13138992e5},{e:13356684e5,s:13465584e5},{e:1367118e6,s:13786128e5},{e:13985676e5,s:14100624e5}]},{name:"America/Sao_Paulo",rules:[{e:12032136e5,s:12243852e5},{e:12346632e5,s:12558348e5},{e:12667176e5,s:12872844e5},{e:12981672e5,s:1318734e6},{e:13302216e5,s:13507884e5},{e:13610664e5,s:1382238e6},{e:1392516e6,s:14136876e5}]},{name:"Asia/Amman",rules:[{e:1225404e6,s:12066552e5},{e:12568536e5,s:12381048e5},{e:12883032e5,s:12695544e5},{e:13197528e5,s:13016088e5},!1,!1,{e:14147064e5,s:13959576e5}]},{name:"Asia/Damascus",rules:[{e:12254868e5,s:120726e7},{e:125685e7,s:12381048e5},{e:12882996e5,s:12701592e5},{e:13197492e5,s:13016088e5},{e:13511988e5,s:13330584e5},{e:13826484e5,s:1364508e6},{e:14147028e5,s:13959576e5}]},{name:"Asia/Dubai",rules:[!1,!1,!1,!1,!1,!1,!1]},{name:"Asia/Gaza",rules:[{e:12199572e5,s:12066552e5},{e:12520152e5,s:12381048e5},{e:1281474e6,s:126964086e4},{e:1312146e6,s:130160886e4},{e:13481784e5,s:13330584e5},{e:13802292e5,s:1364508e6},{e:1414098e6,s:13959576e5}]},{name:"Asia/Irkutsk",rules:[{e:12249576e5,s:12068136e5},{e:12564072e5,s:12382632e5},{e:12884616e5,s:12697128e5},!1,!1,!1,!1]},{name:"Asia/Jerusalem",rules:[{e:12231612e5,s:12066624e5},{e:1254006e6,s:1238112e6},{e:1284246e6,s:12695616e5},{e:131751e7,s:1301616e6},{e:13483548e5,s:13330656e5},{e:13828284e5,s:13645152e5},{e:1414278e6,s:13959648e5}]},{name:"Asia/Kamchatka",rules:[{e:12249432e5,s:12067992e5},{e:12563928e5,s:12382488e5},{e:12884508e5,s:12696984e5},!1,!1,!1,!1]},{name:"Asia/Krasnoyarsk",rules:[{e:12249612e5,s:12068172e5},{e:12564108e5,s:12382668e5},{e:12884652e5,s:12697164e5},!1,!1,!1,!1]},{name:"Asia/Omsk",rules:[{e:12249648e5,s:12068208e5},{e:12564144e5,s:12382704e5},{e:12884688e5,s:126972e7},!1,!1,!1,!1]},{name:"Asia/Vladivostok",rules:[{e:12249504e5,s:12068064e5},{e:12564e8,s:1238256e6},{e:12884544e5,s:12697056e5},!1,!1,!1,!1]},{name:"Asia/Yakutsk",rules:[{e:1224954e6,s:120681e7},{e:12564036e5,s:12382596e5},{e:1288458e6,s:12697092e5},!1,!1,!1,!1]},{name:"Asia/Yekaterinburg",rules:[{e:12249684e5,s:12068244e5},{e:1256418e6,s:1238274e6},{e:12884724e5,s:12697236e5},!1,!1,!1,!1]},{name:"Asia/Yerevan",rules:[{e:1224972e6,s:1206828e6},{e:12564216e5,s:12382776e5},{e:1288476e6,s:12697272e5},{e:13199256e5,s:13011768e5},!1,!1,!1]},{name:"Australia/Lord_Howe",rules:[{e:12074076e5,s:12231342e5},{e:12388572e5,s:12545838e5},{e:12703068e5,s:12860334e5},{e:13017564e5,s:1317483e6},{e:1333206e6,s:13495374e5},{e:13652604e5,s:1380987e6},{e:139671e7,s:14124366e5}]},{name:"Australia/Perth",rules:[{e:12068136e5,s:12249576e5},!1,!1,!1,!1,!1,!1]},{name:"Europe/Helsinki",rules:[{e:12249828e5,s:12068388e5},{e:12564324e5,s:12382884e5},{e:12884868e5,s:1269738e6},{e:13199364e5,s:13011876e5},{e:1351386e6,s:13326372e5},{e:13828356e5,s:13646916e5},{e:14142852e5,s:13961412e5}]},{name:"Europe/Minsk",rules:[{e:12249792e5,s:12068352e5},{e:12564288e5,s:12382848e5},{e:12884832e5,s:12697344e5},!1,!1,!1,!1]},{name:"Europe/Moscow",rules:[{e:12249756e5,s:12068316e5},{e:12564252e5,s:12382812e5},{e:12884796e5,s:12697308e5},!1,!1,!1,!1]},{name:"Pacific/Apia",rules:[!1,!1,!1,{e:13017528e5,s:13168728e5},{e:13332024e5,s:13489272e5},{e:13652568e5,s:13803768e5},{e:13967064e5,s:14118264e5}]},{name:"Pacific/Fiji",rules:[!1,!1,{e:12696984e5,s:12878424e5},{e:13271544e5,s:1319292e6},{e:1358604e6,s:13507416e5},{e:139005e7,s:1382796e6},{e:14215032e5,s:14148504e5}]},{name:"Europe/London",rules:[{e:12249828e5,s:12068388e5},{e:12564324e5,s:12382884e5},{e:12884868e5,s:1269738e6},{e:13199364e5,s:13011876e5},{e:1351386e6,s:13326372e5},{e:13828356e5,s:13646916e5},{e:14142852e5,s:13961412e5}]}]},"undefined"!=typeof module&&"undefined"!=typeof module.exports?module.exports=a:"undefined"!=typeof define&&null!==define&&null!=define.amd?define([],function(){return a}):"undefined"==typeof e?window.jstz=a:e.jstz=a}();
\ No newline at end of file
diff --git a/htdocs/includes/mike42/escpos-php/.coveralls.yml b/htdocs/includes/mike42/escpos-php/.coveralls.yml
index b33373af905..3b85ca4f1e6 100644
--- a/htdocs/includes/mike42/escpos-php/.coveralls.yml
+++ b/htdocs/includes/mike42/escpos-php/.coveralls.yml
@@ -1,4 +1,3 @@
 service_name: travis-ci
 coverage_clover: build/logs/clover.xml
 json_path: build/logs/coveralls-upload.json
-
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docker-compose.yml b/htdocs/includes/mobiledetect/mobiledetectlib/docker-compose.yml
index 58ce75e879c..31206c79bf4 100644
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docker-compose.yml
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/docker-compose.yml
@@ -13,4 +13,4 @@ composer:
   image: composer/composer:php7
   command: install
   volumes:
-    - .:/app
\ No newline at end of file
+    - .:/app
diff --git a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php
index 89bddc27c5b..debbf438ce1 100644
--- a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php
+++ b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php
@@ -71,7 +71,7 @@ return [
     'Mid-Atlantic' => 'America/Noronha',
     'Brasilia' => 'America/Sao_Paulo', // Best guess
     'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-    'Greenland' => 'America/Godthab',
+    'Greenland' => 'America/Nuuk',
     'Newfoundland' => 'America/St_Johns',
     'Atlantic Time (Canada)' => 'America/Halifax',
     'Caracas, La Paz' => 'America/Caracas',
diff --git a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php
index 4b50808f908..9740f6aa8d7 100644
--- a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php
+++ b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php
@@ -34,7 +34,7 @@ return [
     'Newfoundland' => 'America/St_Johns',
     'Argentina' => 'America/Argentina/Buenos_Aires',
     'E. South America' => 'America/Belem',
-    'Greenland' => 'America/Godthab',
+    'Greenland' => 'America/Nuuk',
     'Montevideo' => 'America/Montevideo',
     'SA Eastern' => 'America/Belem',
     // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
diff --git a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php
index 3116c6868e6..ea2366cf66c 100644
--- a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php
+++ b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php
@@ -16,67 +16,319 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Africa/Asmera',
-    'Africa/Timbuktu',
-    'America/Argentina/ComodRivadavia',
-    'America/Atka',
-    'America/Buenos_Aires',
-    'America/Catamarca',
-    'America/Coral_Harbour',
-    'America/Cordoba',
-    'America/Ensenada',
-    'America/Fort_Wayne',
-    'America/Indianapolis',
-    'America/Jujuy',
-    'America/Knox_IN',
-    'America/Louisville',
-    'America/Mendoza',
-    'America/Montreal',
-    'America/Porto_Acre',
-    'America/Rosario',
-    'America/Shiprock',
-    'America/Virgin',
-    'Antarctica/South_Pole',
-    'Asia/Ashkhabad',
+    'Africa/Abidjan',
+    'Africa/Accra',
+    'Africa/Addis_Ababa',
+    'Africa/Algiers',
+    'Africa/Asmara',
+    'Africa/Bamako',
+    'Africa/Bangui',
+    'Africa/Banjul',
+    'Africa/Bissau',
+    'Africa/Blantyre',
+    'Africa/Brazzaville',
+    'Africa/Bujumbura',
+    'Africa/Cairo',
+    'Africa/Casablanca',
+    'Africa/Ceuta',
+    'Africa/Conakry',
+    'Africa/Dakar',
+    'Africa/Dar_es_Salaam',
+    'Africa/Djibouti',
+    'Africa/Douala',
+    'Africa/El_Aaiun',
+    'Africa/Freetown',
+    'Africa/Gaborone',
+    'Africa/Harare',
+    'Africa/Johannesburg',
+    'Africa/Juba',
+    'Africa/Kampala',
+    'Africa/Khartoum',
+    'Africa/Kigali',
+    'Africa/Kinshasa',
+    'Africa/Lagos',
+    'Africa/Libreville',
+    'Africa/Lome',
+    'Africa/Luanda',
+    'Africa/Lubumbashi',
+    'Africa/Lusaka',
+    'Africa/Malabo',
+    'Africa/Maputo',
+    'Africa/Maseru',
+    'Africa/Mbabane',
+    'Africa/Mogadishu',
+    'Africa/Monrovia',
+    'Africa/Nairobi',
+    'Africa/Ndjamena',
+    'Africa/Niamey',
+    'Africa/Nouakchott',
+    'Africa/Ouagadougou',
+    'Africa/Porto-Novo',
+    'Africa/Sao_Tome',
+    'Africa/Tripoli',
+    'Africa/Tunis',
+    'Africa/Windhoek',
+    'America/Adak',
+    'America/Anchorage',
+    'America/Anguilla',
+    'America/Antigua',
+    'America/Araguaina',
+    'America/Argentina/Buenos_Aires',
+    'America/Argentina/Catamarca',
+    'America/Argentina/Cordoba',
+    'America/Argentina/Jujuy',
+    'America/Argentina/La_Rioja',
+    'America/Argentina/Mendoza',
+    'America/Argentina/Rio_Gallegos',
+    'America/Argentina/Salta',
+    'America/Argentina/San_Juan',
+    'America/Argentina/San_Luis',
+    'America/Argentina/Tucuman',
+    'America/Argentina/Ushuaia',
+    'America/Aruba',
+    'America/Asuncion',
+    'America/Atikokan',
+    'America/Bahia',
+    'America/Bahia_Banderas',
+    'America/Barbados',
+    'America/Belem',
+    'America/Belize',
+    'America/Blanc-Sablon',
+    'America/Boa_Vista',
+    'America/Bogota',
+    'America/Boise',
+    'America/Cambridge_Bay',
+    'America/Campo_Grande',
+    'America/Cancun',
+    'America/Caracas',
+    'America/Cayenne',
+    'America/Cayman',
+    'America/Chicago',
+    'America/Chihuahua',
+    'America/Ciudad_Juarez',
+    'America/Costa_Rica',
+    'America/Creston',
+    'America/Cuiaba',
+    'America/Curacao',
+    'America/Danmarkshavn',
+    'America/Dawson',
+    'America/Dawson_Creek',
+    'America/Denver',
+    'America/Detroit',
+    'America/Dominica',
+    'America/Edmonton',
+    'America/Eirunepe',
+    'America/El_Salvador',
+    'America/Fort_Nelson',
+    'America/Fortaleza',
+    'America/Glace_Bay',
+    'America/Goose_Bay',
+    'America/Grand_Turk',
+    'America/Grenada',
+    'America/Guadeloupe',
+    'America/Guatemala',
+    'America/Guayaquil',
+    'America/Guyana',
+    'America/Halifax',
+    'America/Havana',
+    'America/Hermosillo',
+    'America/Indiana/Indianapolis',
+    'America/Indiana/Knox',
+    'America/Indiana/Marengo',
+    'America/Indiana/Petersburg',
+    'America/Indiana/Tell_City',
+    'America/Indiana/Vevay',
+    'America/Indiana/Vincennes',
+    'America/Indiana/Winamac',
+    'America/Inuvik',
+    'America/Iqaluit',
+    'America/Jamaica',
+    'America/Juneau',
+    'America/Kentucky/Louisville',
+    'America/Kentucky/Monticello',
+    'America/Kralendijk',
+    'America/La_Paz',
+    'America/Lima',
+    'America/Los_Angeles',
+    'America/Lower_Princes',
+    'America/Maceio',
+    'America/Managua',
+    'America/Manaus',
+    'America/Marigot',
+    'America/Martinique',
+    'America/Matamoros',
+    'America/Mazatlan',
+    'America/Menominee',
+    'America/Merida',
+    'America/Metlakatla',
+    'America/Mexico_City',
+    'America/Miquelon',
+    'America/Moncton',
+    'America/Monterrey',
+    'America/Montevideo',
+    'America/Montserrat',
+    'America/Nassau',
+    'America/New_York',
+    'America/Nome',
+    'America/Noronha',
+    'America/North_Dakota/Beulah',
+    'America/North_Dakota/Center',
+    'America/North_Dakota/New_Salem',
+    'America/Nuuk',
+    'America/Ojinaga',
+    'America/Panama',
+    'America/Paramaribo',
+    'America/Phoenix',
+    'America/Port-au-Prince',
+    'America/Port_of_Spain',
+    'America/Porto_Velho',
+    'America/Puerto_Rico',
+    'America/Punta_Arenas',
+    'America/Rankin_Inlet',
+    'America/Recife',
+    'America/Regina',
+    'America/Resolute',
+    'America/Rio_Branco',
+    'America/Santarem',
+    'America/Santiago',
+    'America/Santo_Domingo',
+    'America/Sao_Paulo',
+    'America/Scoresbysund',
+    'America/Sitka',
+    'America/St_Barthelemy',
+    'America/St_Johns',
+    'America/St_Kitts',
+    'America/St_Lucia',
+    'America/St_Thomas',
+    'America/St_Vincent',
+    'America/Swift_Current',
+    'America/Tegucigalpa',
+    'America/Thule',
+    'America/Tijuana',
+    'America/Toronto',
+    'America/Tortola',
+    'America/Vancouver',
+    'America/Whitehorse',
+    'America/Winnipeg',
+    'America/Yakutat',
+    'Antarctica/Casey',
+    'Antarctica/Davis',
+    'Antarctica/DumontDUrville',
+    'Antarctica/Macquarie',
+    'Antarctica/Mawson',
+    'Antarctica/McMurdo',
+    'Antarctica/Palmer',
+    'Antarctica/Rothera',
+    'Antarctica/Syowa',
+    'Antarctica/Troll',
+    'Antarctica/Vostok',
+    'Arctic/Longyearbyen',
+    'Asia/Aden',
+    'Asia/Almaty',
+    'Asia/Amman',
+    'Asia/Anadyr',
+    'Asia/Aqtau',
+    'Asia/Aqtobe',
+    'Asia/Ashgabat',
+    'Asia/Atyrau',
+    'Asia/Baghdad',
+    'Asia/Bahrain',
+    'Asia/Baku',
+    'Asia/Bangkok',
+    'Asia/Barnaul',
+    'Asia/Beirut',
+    'Asia/Bishkek',
+    'Asia/Brunei',
     'Asia/Calcutta',
-    'Asia/Chungking',
-    'Asia/Dacca',
-    'Asia/Istanbul',
+    'Asia/Chita',
+    'Asia/Choibalsan',
+    'Asia/Colombo',
+    'Asia/Damascus',
+    'Asia/Dhaka',
+    'Asia/Dili',
+    'Asia/Dubai',
+    'Asia/Dushanbe',
+    'Asia/Famagusta',
+    'Asia/Gaza',
+    'Asia/Hebron',
+    'Asia/Ho_Chi_Minh',
+    'Asia/Hong_Kong',
+    'Asia/Hovd',
+    'Asia/Irkutsk',
+    'Asia/Jakarta',
+    'Asia/Jayapura',
+    'Asia/Jerusalem',
+    'Asia/Kabul',
+    'Asia/Kamchatka',
+    'Asia/Karachi',
+    'Asia/Kathmandu',
     'Asia/Katmandu',
-    'Asia/Macao',
-    'Asia/Saigon',
-    'Asia/Tel_Aviv',
-    'Asia/Thimbu',
-    'Asia/Ujung_Pandang',
-    'Asia/Ulan_Bator',
-    'Atlantic/Faeroe',
-    'Atlantic/Jan_Mayen',
-    'Australia/ACT',
-    'Australia/Canberra',
-    'Australia/LHI',
-    'Australia/North',
-    'Australia/NSW',
-    'Australia/Queensland',
-    'Australia/South',
-    'Australia/Tasmania',
-    'Australia/Victoria',
-    'Australia/West',
-    'Australia/Yancowinna',
-    'Brazil/Acre',
-    'Brazil/DeNoronha',
-    'Brazil/East',
-    'Brazil/West',
-    'Canada/Atlantic',
-    'Canada/Central',
-    'Canada/Eastern',
-    'Canada/Mountain',
-    'Canada/Newfoundland',
-    'Canada/Pacific',
-    'Canada/Saskatchewan',
-    'Canada/Yukon',
-    'CET',
-    'Chile/Continental',
-    'Chile/EasterIsland',
+    'Asia/Khandyga',
+    'Asia/Kolkata',
+    'Asia/Krasnoyarsk',
+    'Asia/Kuala_Lumpur',
+    'Asia/Kuching',
+    'Asia/Kuwait',
+    'Asia/Macau',
+    'Asia/Magadan',
+    'Asia/Makassar',
+    'Asia/Manila',
+    'Asia/Muscat',
+    'Asia/Nicosia',
+    'Asia/Novokuznetsk',
+    'Asia/Novosibirsk',
+    'Asia/Omsk',
+    'Asia/Oral',
+    'Asia/Phnom_Penh',
+    'Asia/Pontianak',
+    'Asia/Pyongyang',
+    'Asia/Qatar',
+    'Asia/Qostanay',
+    'Asia/Qyzylorda',
+    'Asia/Riyadh',
+    'Asia/Sakhalin',
+    'Asia/Samarkand',
+    'Asia/Seoul',
+    'Asia/Shanghai',
+    'Asia/Singapore',
+    'Asia/Srednekolymsk',
+    'Asia/Taipei',
+    'Asia/Tashkent',
+    'Asia/Tbilisi',
+    'Asia/Tehran',
+    'Asia/Thimphu',
+    'Asia/Tokyo',
+    'Asia/Tomsk',
+    'Asia/Ulaanbaatar',
+    'Asia/Urumqi',
+    'Asia/Ust-Nera',
+    'Asia/Vientiane',
+    'Asia/Vladivostok',
+    'Asia/Yakutsk',
+    'Asia/Yangon',
+    'Asia/Yekaterinburg',
+    'Asia/Yerevan',
+    'Atlantic/Azores',
+    'Atlantic/Bermuda',
+    'Atlantic/Canary',
+    'Atlantic/Cape_Verde',
+    'Atlantic/Faroe',
+    'Atlantic/Madeira',
+    'Atlantic/Reykjavik',
+    'Atlantic/South_Georgia',
+    'Atlantic/St_Helena',
+    'Atlantic/Stanley',
+    'Australia/Adelaide',
+    'Australia/Brisbane',
+    'Australia/Broken_Hill',
+    'Australia/Darwin',
+    'Australia/Eucla',
+    'Australia/Hobart',
+    'Australia/Lindeman',
+    'Australia/Lord_Howe',
+    'Australia/Melbourne',
+    'Australia/Perth',
+    'Australia/Sydney',
     'EET',
     'EST',
     'Etc/GMT',
@@ -111,42 +363,127 @@ return [
     'Etc/GMT0',
     'Etc/Greenwich',
     'Etc/UCT',
-    'Etc/Universal',
     'Etc/UTC',
+    'Etc/Universal',
     'Etc/Zulu',
-    'Europe/Belfast',
-    'Europe/Nicosia',
-    'Europe/Tiraspol',
+    'Europe/Amsterdam',
+    'Europe/Andorra',
+    'Europe/Astrakhan',
+    'Europe/Athens',
+    'Europe/Belgrade',
+    'Europe/Berlin',
+    'Europe/Bratislava',
+    'Europe/Brussels',
+    'Europe/Bucharest',
+    'Europe/Budapest',
+    'Europe/Busingen',
+    'Europe/Chisinau',
+    'Europe/Copenhagen',
+    'Europe/Dublin',
+    'Europe/Gibraltar',
+    'Europe/Guernsey',
+    'Europe/Helsinki',
+    'Europe/Isle_of_Man',
+    'Europe/Istanbul',
+    'Europe/Jersey',
+    'Europe/Kaliningrad',
+    'Europe/Kirov',
+    'Europe/Kyiv',
+    'Europe/Lisbon',
+    'Europe/Ljubljana',
+    'Europe/London',
+    'Europe/Luxembourg',
+    'Europe/Madrid',
+    'Europe/Malta',
+    'Europe/Mariehamn',
+    'Europe/Minsk',
+    'Europe/Monaco',
+    'Europe/Moscow',
+    'Europe/Oslo',
+    'Europe/Paris',
+    'Europe/Podgorica',
+    'Europe/Prague',
+    'Europe/Riga',
+    'Europe/Rome',
+    'Europe/Samara',
+    'Europe/San_Marino',
+    'Europe/Sarajevo',
+    'Europe/Saratov',
+    'Europe/Simferopol',
+    'Europe/Skopje',
+    'Europe/Sofia',
+    'Europe/Stockholm',
+    'Europe/Tallinn',
+    'Europe/Tirane',
+    'Europe/Ulyanovsk',
+    'Europe/Vaduz',
+    'Europe/Vatican',
+    'Europe/Vienna',
+    'Europe/Vilnius',
+    'Europe/Volgograd',
+    'Europe/Warsaw',
+    'Europe/Zagreb',
+    'Europe/Zurich',
     'GB',
     'GMT',
     'GMT+0',
     'GMT-0',
     'HST',
+    'Indian/Antananarivo',
+    'Indian/Chagos',
+    'Indian/Christmas',
+    'Indian/Cocos',
+    'Indian/Comoro',
+    'Indian/Kerguelen',
+    'Indian/Mahe',
+    'Indian/Maldives',
+    'Indian/Mauritius',
+    'Indian/Mayotte',
+    'Indian/Reunion',
     'MET',
-    'Mexico/BajaNorte',
-    'Mexico/BajaSur',
-    'Mexico/General',
     'MST',
     'NZ',
-    'Pacific/Ponape',
-    'Pacific/Samoa',
-    'Pacific/Truk',
-    'Pacific/Yap',
     'PRC',
+    'Pacific/Apia',
+    'Pacific/Auckland',
+    'Pacific/Bougainville',
+    'Pacific/Chatham',
+    'Pacific/Chuuk',
+    'Pacific/Easter',
+    'Pacific/Efate',
+    'Pacific/Fakaofo',
+    'Pacific/Fiji',
+    'Pacific/Funafuti',
+    'Pacific/Galapagos',
+    'Pacific/Gambier',
+    'Pacific/Guadalcanal',
+    'Pacific/Guam',
+    'Pacific/Honolulu',
+    'Pacific/Kanton',
+    'Pacific/Kiritimati',
+    'Pacific/Kosrae',
+    'Pacific/Kwajalein',
+    'Pacific/Majuro',
+    'Pacific/Marquesas',
+    'Pacific/Midway',
+    'Pacific/Nauru',
+    'Pacific/Niue',
+    'Pacific/Norfolk',
+    'Pacific/Noumea',
+    'Pacific/Pago_Pago',
+    'Pacific/Palau',
+    'Pacific/Pitcairn',
+    'Pacific/Pohnpei',
+    'Pacific/Port_Moresby',
+    'Pacific/Rarotonga',
+    'Pacific/Saipan',
+    'Pacific/Tahiti',
+    'Pacific/Tarawa',
+    'Pacific/Tongatapu',
+    'Pacific/Wake',
+    'Pacific/Wallis',
     'ROC',
     'ROK',
     'UCT',
-    'US/Alaska',
-    'US/Aleutian',
-    'US/Arizona',
-    'US/Central',
-    'US/East-Indiana',
-    'US/Eastern',
-    'US/Hawaii',
-    'US/Indiana-Starke',
-    'US/Michigan',
-    'US/Mountain',
-    'US/Pacific',
-    'US/Samoa',
     'WET',
 ];
diff --git a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/windowszones.php b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/windowszones.php
index 2049a95c185..be1eceb6520 100644
--- a/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/windowszones.php
+++ b/htdocs/includes/sabre/sabre/vobject/lib/timezonedata/windowszones.php
@@ -20,7 +20,7 @@ return [
   'Arab Standard Time' => 'Asia/Riyadh',
   'Arabian Standard Time' => 'Asia/Dubai',
   'Arabic Standard Time' => 'Asia/Baghdad',
-  'Argentina Standard Time' => 'America/Buenos_Aires',
+  'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',
   'Astrakhan Standard Time' => 'Europe/Astrakhan',
   'Atlantic Standard Time' => 'America/Halifax',
   'Aus Central W. Standard Time' => 'Australia/Eucla',
@@ -60,7 +60,7 @@ return [
   'GMT Standard Time' => 'Europe/London',
   'GTB Standard Time' => 'Europe/Bucharest',
   'Georgian Standard Time' => 'Asia/Tbilisi',
-  'Greenland Standard Time' => 'America/Godthab',
+  'Greenland Standard Time' => 'America/Nuuk',
   'Greenwich Standard Time' => 'Atlantic/Reykjavik',
   'Haiti Standard Time' => 'America/Port-au-Prince',
   'Hawaiian Standard Time' => 'Pacific/Honolulu',
@@ -127,7 +127,7 @@ return [
   'Transbaikal Standard Time' => 'Asia/Chita',
   'Turkey Standard Time' => 'Europe/Istanbul',
   'Turks And Caicos Standard Time' => 'America/Grand_Turk',
-  'US Eastern Standard Time' => 'America/Indianapolis',
+  'US Eastern Standard Time' => 'America/Indiana/Indianapolis',
   'US Mountain Standard Time' => 'America/Phoenix',
   'UTC' => 'Etc/GMT',
   'UTC+12' => 'Etc/GMT-12',
diff --git a/htdocs/includes/webklex/php-imap/CHANGELOG.md b/htdocs/includes/webklex/php-imap/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/README.md b/htdocs/includes/webklex/php-imap/README.md
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Attachment.php b/htdocs/includes/webklex/php-imap/src/Attachment.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Client.php b/htdocs/includes/webklex/php-imap/src/Client.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Folder.php b/htdocs/includes/webklex/php-imap/src/Folder.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Message.php b/htdocs/includes/webklex/php-imap/src/Message.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Query/WhereQuery.php b/htdocs/includes/webklex/php-imap/src/Query/WhereQuery.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/src/Support/Masks/Mask.php b/htdocs/includes/webklex/php-imap/src/Support/Masks/Mask.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Arrayable.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Arrayable.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Jsonable.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Jsonable.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/MessageProvider.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/MessageProvider.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Renderable.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Support/Renderable.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Translation/Loader.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/Translation/Loader.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/View/Engine.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/contracts/View/Engine.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/pagination/PaginationServiceProvider.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/pagination/PaginationServiceProvider.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/pagination/composer.json b/htdocs/includes/webklex/php-imap/vendor/illuminate/pagination/composer.json
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/App.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/App.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Artisan.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Artisan.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Auth.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Auth.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Blade.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Blade.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Cache.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Cache.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Config.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Config.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Cookie.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Cookie.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Crypt.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Crypt.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/DB.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/DB.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Event.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Event.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Facade.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Facade.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/File.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/File.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Hash.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Hash.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Lang.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Lang.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Log.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Log.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Mail.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Mail.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Password.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Password.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Queue.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Queue.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Redirect.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Redirect.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Redis.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Redis.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Request.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Request.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Response.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Response.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Route.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Route.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Schema.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Schema.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Session.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Session.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/URL.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/URL.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Validator.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/Validator.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/View.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Facades/View.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Fluent.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Fluent.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Manager.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Manager.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/MessageBag.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/MessageBag.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/NamespacedItemResolver.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/NamespacedItemResolver.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Pluralizer.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Pluralizer.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/helpers.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/helpers.php
old mode 100755
new mode 100644
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate/containers/page189.tpl.php b/htdocs/install/doctemplates/websites/website_template-corporate/containers/page189.tpl.php
index 8e0d8fbbea5..3dec20c6b08 100644
--- a/htdocs/install/doctemplates/websites/website_template-corporate/containers/page189.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-corporate/containers/page189.tpl.php
@@ -147,7 +147,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
       </section>
 
 
-      <!-- Looking for our sevices -->
+      <!-- Looking for our services -->
       <section id="sectionfirstclass" contenteditable="true" class="section-with-counters bg-accent text-center">
         <div class="container bg-cape-cod context-dark section-60 section-lg-90">
           <h2 class="text-rolling-stone font-weight-bold text-uppercase">Looking for</h2>
@@ -215,7 +215,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
                                                     </ul>
                                                 </div>
                                                 <div class="plan-btn plan-picker">
-                                                    <a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subcribe</a>
+                                                    <a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subscribe</a>
                                                 </div>
                                             </div>  
                                     </div>
@@ -487,7 +487,7 @@ CKEDITOR.inline( 'sectionimage' , { toolbar: ['Bold','Italic'] } );
                           <div class="divider-fullwidth"></div>
                           <div>
                             <span class="fa fa-quote-left"><!-- Keep this comment --></span>
-                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>
+                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 months.</q>
                             <span class="fa fa-quote-right"><!-- Keep this comment --></span>
                           </div>
                         </blockquote>
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate/containers/page192.tpl.php b/htdocs/install/doctemplates/websites/website_template-corporate/containers/page192.tpl.php
index 4f17f5da805..3344e971e80 100644
--- a/htdocs/install/doctemplates/websites/website_template-corporate/containers/page192.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-corporate/containers/page192.tpl.php
@@ -90,7 +90,7 @@ ob_start();
                                                     </ul>
                                                 </div>
                                                 <div class="plan-btn plan-picker">
-                                                    <a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subcribe</a>
+                                                    <a href="plan-a.php" class="btn btn-rect btn-primary d-block d-md-inline-block" id="plana">Subscribe</a>
                                                 </div>
                                             </div>  
                                     </div>
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/page202.tpl.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/page202.tpl.php
index f0c564c2d61..11a32b36968 100644
--- a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/page202.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/page202.tpl.php
@@ -128,7 +128,7 @@ ob_start();
                         <p>
                             Lorem ipsum dolor, sit amet consectetur adipisicing
                             elit. Ab fuga nobis omnis alias, aliquid iste cumque
-                            tempora nam reprehenderit quia itaque debitis,
+                            tempora nim reprehenderit quia itaque debitis,
                             nostrum labore rerum reiciendis laboriosam unde,
                             tempore corporis.
                         </p>
@@ -162,7 +162,7 @@ ob_start();
                         <p>
                             Lorem ipsum dolor, sit amet consectetur adipisicing
                             elit. Ab fuga nobis omnis alias, aliquid iste cumque
-                            tempora nam reprehenderit quia itaque debitis,
+                            tempora nim reprehenderit quia itaque debitis,
                             nostrum labore rerum reiciendis laboriosam unde,
                             tempore corporis.
                         </p>                        
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
index 8742e231c27..faf8513d064 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
@@ -33,7 +33,7 @@ ob_start();
 <!-- File generated by Dolibarr website module editor -->
 <body id="bodywebsite" class="bodywebsite bodywebpage-contact">
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
-<?php 
+<?php
 if (GETPOST('action') == 'sendmail')    {
     include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
     $from = GETPOST('email', 'alpha');
@@ -74,7 +74,7 @@ if (GETPOST('action') == 'sendmail')    {
             </header>
 
             <a id="reservation"></a><br>
-            
+
             <section class="contact section-padding">
                 <div class="container">
                     <div class="row">
@@ -90,8 +90,8 @@ if (GETPOST('action') == 'sendmail')    {
                                 role="form"
                             >
                                 <input type="hidden" name="action" value="sendmail">
-                                <input type="hidden" name="toekn" value="<?php echo newToken(); ?>">
-                                
+                                <input type="hidden" name="token" value="<?php echo newToken(); ?>">
+
                                 <div class="col-lg-6 col-6">
                                     <label for="contact-name" class="form-label"
                                         >Full Name</label
@@ -168,7 +168,7 @@ if (GETPOST('action') == 'sendmail')    {
                             <div class=" mb-lg-3">
                                  <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
                                    foreach ($days as $day){
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
+                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";
                         }
                         ?>
                             </div>
@@ -184,7 +184,7 @@ if (GETPOST('action') == 'sendmail')    {
 
                         <div class="col-12" id="divaddress">
                             <br><br>
-                        
+
                             <h4 class="mt-5 mb-4 center">
                                 <?php echo $mysoc->getFullAddress() ?>
                             </h4>
@@ -201,7 +201,7 @@ if (GETPOST('action') == 'sendmail')    {
         </main>
 
 
-        
+
         <!-- Modal -->
         <div
             class="modal fade"
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
index f088e50d33e..c7a3b4d7d31 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
@@ -3,7 +3,7 @@
 INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(1__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'about', '', 'About us', '', '', '', '', '1', '2022-08-09 16:40:13', '2022-11-20 14:15:19', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php includeContainer(\'header\'); ?>__N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__        <main>__N____N__            <header class=\"site-header site-about-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">About Us</h1>__N____N__                            <strong class=\"text-white\">Get to know us more</strong>__N__                        </div>__N____N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>           __N____N__            <section class=\"about section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-5\">Team Members</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/matthew-hamilton-tNCH0sKSZbA-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <div class=\"team-info\">__N__                                    <h4 class=\"mt-3 mb-0\">Sophia</h4>__N____N__                                    <p>CEO &amp; Founder</p>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 my-lg-0 my-4\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/nicolas-horn-MTZTGvDsHFY-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N____N__                                <h4 class=\"mt-3 mb-0\">Benjamin W.</h4>__N____N__                                <p>Restaurant Manager</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/rc-cf-FMh5o5m5N9E-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <h4 class=\"mt-3 mb-0\">Muchen Jack</h4>__N____N__                                <p>Senior Chef</p>__N__                            </div>__N__                        </div>__N____N__                    </div>__N__                </div>__N__            </section>__N__            __N__        </main>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N____N__', '', 0);
 -- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
 -- Page ID 249 -> 2__+MAX_llx_website_page__ - Aliases contact --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(2__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'contact', '', 'Contact us', '', '', '', '', '1', '2022-08-16 14:40:51', '2022-11-20 14:50:10', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php __N__if (GETPOST(\'action\') == \'sendmail\')    {__N__    include_once DOL_DOCUMENT_ROOT.\'/core/class/CMailFile.class.php\';__N__    $from = GETPOST(\'email\', \'alpha\');__N__    $to = $mysoc->email;__N__    $message = GETPOST(\'message\', \'alpha\');__N__    $cmail = new CMailFile(\'Contact from website\', $to, $from, $message);__N__    if ($cmail->sendfile()) {__N__        ?>__N__        <script>__N__            alert(\"Message sent successfully !\");__N__        </script>__N__        <?php__N__	} else {__N__		echo $langs->trans(\"ErrorFailedToSendMail\", $from, $to).\'. \'.$cmail->error;__N__	}__N__}__N__?>__N____N__<?php includeContainer(\'header\'); ?>__N____N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__    <main>__N__            <header class=\"site-header site-contact-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Say Hi</h1>__N____N__                            <strong class=\"text-white\"__N__                                >We are happy to get in touch with you</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <a id=\"reservation\"></a><br>__N__            __N__            <section class=\"contact section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-4\">Leave a message</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <form__N__                                class=\"custom-form contact-form row\"__N__                                action=\"#\"__N__                                method=\"post\"__N__                                role=\"form\"__N__                            >__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <input type=\"hidden\" name=\"toekn\" value=\"<?php echo newToken(); ?>\">__N__                                __N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label for=\"contact-name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"contact-name\"__N__                                        id=\"contact-name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label__N__                                        for=\"contact-phone\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Phone\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"contact-phone\"__N__                                        id=\"contact-phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label__N__                                        for=\"contact-email\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Email\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"contact-email\"__N__                                        id=\"contact-email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Email\"__N__                                        required=\"\"__N__                                    />__N____N__                                    <label__N__                                        for=\"contact-message\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Message\"); ?></label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"5\"__N__                                        id=\"contact-message\"__N__                                        name=\"contact-message\"__N__                                        placeholder=\"Your Message\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-5 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        <?php echo $weblangs->trans(\"Send\"); ?>__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 mx-auto mt-lg-5 mt-4\">__N__                            <h5>Weekdays</h5>__N____N__                            <div class=\" mb-lg-3\">__N__                                 <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                                   foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N__                            </div>__N____N__                            <h5>Weekends</h5>__N____N__                            <div class=\"d-flex\">__N__                                <p>Saturday and Sunday</p>__N____N__                                <p class=\"ms-5\">to be determined !</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-12\" id=\"divaddress\">__N__                            <br><br>__N__                        __N__                            <h4 class=\"mt-5 mb-4 center\">__N__                                <?php echo $mysoc->getFullAddress() ?>__N__                            </h4>__N____N__                            <!-- Google MAPS -->__N__                            <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>__N__                            </div>__N__                            <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>__N__                            </div></center>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N____N__        __N__        <!-- Modal -->__N__        <div__N__            class=\"modal fade\"__N__            id=\"BookingModal\"__N__            tabindex=\"-1\"__N__            aria-labelledby=\"BookingModal\"__N__            aria-hidden=\"true\"__N__        >__N__            <div class=\"modal-dialog modal-dialog-centered modal-xl\">__N__                <div class=\"modal-content\">__N__                    <div class=\"modal-header\">__N__                        <h3 class=\"mb-0\">Reserve a table</h3>__N____N__                        <button__N__                            type=\"button\"__N__                            class=\"btn-close\"__N__                            data-bs-dismiss=\"modal\"__N__                            aria-label=\"Close\"__N__                        ></button>__N__                    </div>__N____N__                    <div__N__                        class=\"modal-body d-flex flex-column justify-content-center\"__N__                    >__N__                        <div class=\"booking\">__N__                            <form__N__                                class=\"booking-form row\"__N__                                role=\"form\"__N__                                action=\"contact.php\"__N__                                method=\"POST\"__N__                            >__N__                                <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"name\"__N__                                        id=\"name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"email\" class=\"form-label\"__N__                                        >Email Address</label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"email\"__N__                                        id=\"email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"your@email.com\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"phone\" class=\"form-label\"__N__                                        >Phone Number</label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"phone\"__N__                                        id=\"phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"people\" class=\"form-label\"__N__                                        >Number of persons</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"people\"__N__                                        id=\"people\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"12 persons\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"date\" class=\"form-label\"__N__                                        >Date</label__N__                                    >__N____N__                                    <input__N__                                        type=\"date\"__N__                                        name=\"date\"__N__                                        id=\"date\"__N__                                        value=\"\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"time\" class=\"form-label\"__N__                                        >Time</label__N__                                    >__N____N__                                    <select__N__                                        class=\"form-select form-control\"__N__                                        name=\"time\"__N__                                        id=\"time\"__N__                                    >__N__                                        <option value=\"5\" selected>__N__                                            5:00 PM__N__                                        </option>__N__                                        <option value=\"6\">6:00 PM</option>__N__                                        <option value=\"7\">7:00 PM</option>__N__                                        <option value=\"8\">8:00 PM</option>__N__                                        <option value=\"9\">9:00 PM</option>__N__                                    </select>__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label for=\"message\" class=\"form-label\"__N__                                        >Special Request</label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"4\"__N__                                        id=\"message\"__N__                                        name=\"message\"__N__                                        placeholder=\"\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-4 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        Submit Request__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N__                    </div>__N____N__                    <div class=\"modal-footer\"></div>__N__                </div>__N__            </div>__N__        </div>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N____N__', '', 0);
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(2__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'contact', '', 'Contact us', '', '', '', '', '1', '2022-08-16 14:40:51', '2022-11-20 14:50:10', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php __N__if (GETPOST(\'action\') == \'sendmail\')    {__N__    include_once DOL_DOCUMENT_ROOT.\'/core/class/CMailFile.class.php\';__N__    $from = GETPOST(\'email\', \'alpha\');__N__    $to = $mysoc->email;__N__    $message = GETPOST(\'message\', \'alpha\');__N__    $cmail = new CMailFile(\'Contact from website\', $to, $from, $message);__N__    if ($cmail->sendfile()) {__N__        ?>__N__        <script>__N__            alert(\"Message sent successfully !\");__N__        </script>__N__        <?php__N__	} else {__N__		echo $langs->trans(\"ErrorFailedToSendMail\", $from, $to).\'. \'.$cmail->error;__N__	}__N__}__N__?>__N____N__<?php includeContainer(\'header\'); ?>__N____N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__    <main>__N__            <header class=\"site-header site-contact-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Say Hi</h1>__N____N__                            <strong class=\"text-white\"__N__                                >We are happy to get in touch with you</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <a id=\"reservation\"></a><br>__N__            __N__            <section class=\"contact section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-4\">Leave a message</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <form__N__                                class=\"custom-form contact-form row\"__N__                                action=\"#\"__N__                                method=\"post\"__N__                                role=\"form\"__N__                            >__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\">__N__                                __N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label for=\"contact-name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"contact-name\"__N__                                        id=\"contact-name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label__N__                                        for=\"contact-phone\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Phone\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"contact-phone\"__N__                                        id=\"contact-phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label__N__                                        for=\"contact-email\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Email\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"contact-email\"__N__                                        id=\"contact-email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Email\"__N__                                        required=\"\"__N__                                    />__N____N__                                    <label__N__                                        for=\"contact-message\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Message\"); ?></label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"5\"__N__                                        id=\"contact-message\"__N__                                        name=\"contact-message\"__N__                                        placeholder=\"Your Message\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-5 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        <?php echo $weblangs->trans(\"Send\"); ?>__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 mx-auto mt-lg-5 mt-4\">__N__                            <h5>Weekdays</h5>__N____N__                            <div class=\" mb-lg-3\">__N__                                 <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                                   foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N__                            </div>__N____N__                            <h5>Weekends</h5>__N____N__                            <div class=\"d-flex\">__N__                                <p>Saturday and Sunday</p>__N____N__                                <p class=\"ms-5\">to be determined !</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-12\" id=\"divaddress\">__N__                            <br><br>__N__                        __N__                            <h4 class=\"mt-5 mb-4 center\">__N__                                <?php echo $mysoc->getFullAddress() ?>__N__                            </h4>__N____N__                            <!-- Google MAPS -->__N__                            <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>__N__                            </div>__N__                            <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>__N__                            </div></center>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N____N__        __N__        <!-- Modal -->__N__        <div__N__            class=\"modal fade\"__N__            id=\"BookingModal\"__N__            tabindex=\"-1\"__N__            aria-labelledby=\"BookingModal\"__N__            aria-hidden=\"true\"__N__        >__N__            <div class=\"modal-dialog modal-dialog-centered modal-xl\">__N__                <div class=\"modal-content\">__N__                    <div class=\"modal-header\">__N__                        <h3 class=\"mb-0\">Reserve a table</h3>__N____N__                        <button__N__                            type=\"button\"__N__                            class=\"btn-close\"__N__                            data-bs-dismiss=\"modal\"__N__                            aria-label=\"Close\"__N__                        ></button>__N__                    </div>__N____N__                    <div__N__                        class=\"modal-body d-flex flex-column justify-content-center\"__N__                    >__N__                        <div class=\"booking\">__N__                            <form__N__                                class=\"booking-form row\"__N__                                role=\"form\"__N__                                action=\"contact.php\"__N__                                method=\"POST\"__N__                            >__N__                                <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"name\"__N__                                        id=\"name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"email\" class=\"form-label\"__N__                                        >Email Address</label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"email\"__N__                                        id=\"email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"your@email.com\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"phone\" class=\"form-label\"__N__                                        >Phone Number</label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"phone\"__N__                                        id=\"phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"people\" class=\"form-label\"__N__                                        >Number of persons</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"people\"__N__                                        id=\"people\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"12 persons\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"date\" class=\"form-label\"__N__                                        >Date</label__N__                                    >__N____N__                                    <input__N__                                        type=\"date\"__N__                                        name=\"date\"__N__                                        id=\"date\"__N__                                        value=\"\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"time\" class=\"form-label\"__N__                                        >Time</label__N__                                    >__N____N__                                    <select__N__                                        class=\"form-select form-control\"__N__                                        name=\"time\"__N__                                        id=\"time\"__N__                                    >__N__                                        <option value=\"5\" selected>__N__                                            5:00 PM__N__                                        </option>__N__                                        <option value=\"6\">6:00 PM</option>__N__                                        <option value=\"7\">7:00 PM</option>__N__                                        <option value=\"8\">8:00 PM</option>__N__                                        <option value=\"9\">9:00 PM</option>__N__                                    </select>__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label for=\"message\" class=\"form-label\"__N__                                        >Special Request</label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"4\"__N__                                        id=\"message\"__N__                                        name=\"message\"__N__                                        placeholder=\"\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-4 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        Submit Request__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N__                    </div>__N____N__                    <div class=\"modal-footer\"></div>__N__                </div>__N__            </div>__N__        </div>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N____N__', '', 0);
 -- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
 -- Page ID 252 -> 3__+MAX_llx_website_page__ - Aliases footer --;
 INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(3__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'footer', '', 'Footer', '', '', '', '', '1', '2022-11-20 12:51:50', '2022-11-20 14:07:39', null, '', 'other', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<section id=\"footer\" contenteditable=\"true\">__N__            <!-- Footer -->__N__        <footer class=\"site-footer section-padding\">__N__            <div class=\"container\">__N__                <div class=\"row\">__N__                    <div class=\"col-lg-4 col-md-7 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\"><?php echo $weblangs->trans(\"Location\"); ?></h6>__N____N__                        <p><?php echo $mysoc->getFullAddress(); ?></p>__N____N__                        <a href=\"contact.php#divaddress\" class=\"custom-btn btn btn-dark mt-2\"><?php echo $weblangs->trans(\"Map\"); ?></a>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-5 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Opening Hours</h6>__N____N__         __N__                        <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                        foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N____N__                        <p>__N__                            Tel:__N__                            <a href=\"tel: <?php echo $mysoc->phone ?>\" class=\"tel-link\"__N__                                ><?php echo $mysoc->phone ?></a__N__                            >__N__                        </p>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-6 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Social</h6>__N____N__                        <ul class=\"social-icon\">__N__                             <?php foreach($mysoc->socialnetworks as $key => $value) {__N__                                print \'<li> <a class=\"btn btn-perso2 btn-floating m-1\" href=\"\'. (preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\"></i></a> </li>\';__N__                             } ?>__N____N__                       __N__                        </ul>__N____N__                        <p class=\"copyright-text tooplate-mt60\">__N__                            Copyright © <?php echo $mysoc->name; ?>__N__                        </p>__N__                    </div>__N__                </div>__N__                <!-- row ending -->__N__            </div>__N__            <!-- container ending -->__N__        </footer>__N__</section>__N__', '', 0);
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar/containers/page23.tpl.php b/htdocs/install/doctemplates/websites/website_template-stellar/containers/page23.tpl.php
index 43664b7984b..bd1eda51e55 100644
--- a/htdocs/install/doctemplates/websites/website_template-stellar/containers/page23.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-stellar/containers/page23.tpl.php
@@ -126,7 +126,7 @@ ob_start();
 							<strong>1,024</strong> Nullam
 						</li>
 					</ul>
-					<p class="content">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>
+					<p class="content">Nim elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nim a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varias lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>
 					<footer class="major">
 						<ul class="actions special">
 							<li><a href="generic.php" class="buttonwebsite">Learn More</a></li>
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 5a2dcbc0c77..7d211faae21 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -94,7 +94,7 @@ if (@file_exists($forcedfile)) {
  *	View
  */
 
-session_start(); // To be able to keep info into session (used for not losing pass during navigation. pass must not transit through parmaeters)
+session_start(); // To be able to keep info into session (used for not losing pass during navigation. pass must not transit through parameters)
 
 pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY) ? '' : $force_dolibarr_js_JQUERY.'/'), 'main-inside-bis');
 
@@ -322,7 +322,6 @@ if (!empty($force_install_noedit)) {
 					}
 
 					// Version min of database
-					$versionbasemin = explode('.', $class::VERSIONMIN);
 					$note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
 					// Switch to mysql if mysqli is not present
@@ -731,7 +730,7 @@ jQuery(document).ready(function() {	// TODO Test $( window ).load(function() to
 
 <?php
 
-// $db->close();	Not database connexion yet
+// $db->close();	Not database connection yet
 
 dolibarr_install_syslog("- fileconf: end");
 pFooter($err, $setuplang, 'jscheckparam');
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 5080b8c05fb..e488120440b 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -248,7 +248,7 @@ if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) {
 }
 define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
 
-define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
+define('DOL_CLASS_PATH', 'class/'); // Filesystem path to class dir
 define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : DOL_DOCUMENT_ROOT.'/../documents'));
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
diff --git a/htdocs/install/install.forced.sample.php b/htdocs/install/install.forced.sample.php
index 1e986e4a446..a2dfc8f95e9 100644
--- a/htdocs/install/install.forced.sample.php
+++ b/htdocs/install/install.forced.sample.php
@@ -15,7 +15,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/** @var boolean	$force_install_nophpinfo 		Hide PHP informations */
+/** @var boolean	$force_install_nophpinfo 		Hide PHP information */
 $force_install_nophpinfo = true;
 
 /** @var int	$force_install_noedit 				1 = Lock and hide environment variables, 2 = Lock all set variables */
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index e6363ba41eb..c9a280690a3 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -201,3 +201,7 @@ CREATE TABLE llx_c_product_thirdparty_relation_type
 
 ALTER TABLE llx_c_tva ADD COLUMN type_vat smallint NOT NULL DEFAULT 0 AFTER fk_pays;
 
+ALTER TABLE llx_categorie ADD COLUMN position integer DEFAULT 0 AFTER color;
+
+ALTER TABLE llx_product DROP COLUMN onportal; 
+
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
index 29cb5a260e6..9c8f8beb186 100644
--- a/htdocs/install/mysql/tables/llx_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_categorie.sql
@@ -29,6 +29,7 @@ create table llx_categorie
 	type	        integer DEFAULT 1 NOT NULL,			-- category type (product, supplier, customer, member)
 	description 	text,								-- description of the category
     color           varchar(8),                         -- color
+	position        integer DEFAULT 0,                  -- position
 	fk_soc          integer DEFAULT NULL,				-- not used by default. Used when option CATEGORY_ASSIGNED_TO_A_CUSTOMER is set.
 	visible         tinyint DEFAULT 1 NOT NULL,			-- determine if the products are visible or not
     date_creation	datetime,							-- date creation 
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index f63a4145569..0dd84d550f5 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -59,7 +59,6 @@ create table llx_product
   fk_user_modif                 integer,                            -- user making last change
   tosell                        tinyint      DEFAULT 1,             -- Product you sell
   tobuy                         tinyint      DEFAULT 1,             -- Product you buy
-  onportal                      tinyint      DEFAULT 0,	            -- If it is a product you sell and you want to sell it from internal portal (module 'portal')
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
   sell_or_eat_by_mandatory      tinyint      DEFAULT 0 NOT NULL,    -- Make sell-by or eat-by date mandatory
   batch_mask			        varchar(32)  DEFAULT NULL,          -- If the product has batch feature, you may want to use a batch mask per product
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.key.sql b/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.key.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 2b427923e8c..5d7596889fc 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1113,7 +1113,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha')) {
 
 // force_disable_of_modules_not_found
 if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
-	print '<tr><td colspan="2"><br>*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)</td></tr>';
+	print '<tr><td colspan="2"><br>*** Force modules not found physically to be disabled (only modules adding js, css or hooks can be detected as removed physically)</td></tr>';
 
 	$arraylistofkey = array('hooks', 'js', 'css');
 
@@ -1505,7 +1505,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 
 			// s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
 			// on divise la ligne de dispatch en autant de lignes qu’on en a sur la commande pour le produit
-			// et on met la quantité de la ligne dans la limite du "budget" indiqué par dispatch.qty
+			// et on met la quantité de la ligne dans la limit du "budget" indiqué par dispatch.qty
 
 			$remaining_qty = $obj_dispatch->qty;
 			$first_iteration = true;
@@ -1596,7 +1596,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 	echo '<tr><td>'.join('</td></tr><tr><td>', $errors).'</td></tr>';
 }
 
-// Repair llx_commande_fournisseur to eleminate duplicate reference
+// Repair llx_commande_fournisseur to eliminate duplicate reference
 if ($ok && GETPOST('repair_supplier_order_duplicate_ref')) {
 	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
 	include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 4ce9551d246..2c53e2e7e9e 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -426,7 +426,7 @@ if (!$error && $db->connected && $action == "set") {
 				}
 			}
 
-			// Documents are stored above the web pages root to prevent being downloaded without authentification
+			// Documents are stored above the web pages root to prevent being downloaded without authentication
 			$dir = array();
 			$dir[] = $main_data_dir."/mycompany";
 			$dir[] = $main_data_dir."/medias";
@@ -685,7 +685,7 @@ if (!$error && $db->connected && $action == "set") {
 		// We test access with dolibarr database user (not admin)
 		if (!$error) {
 			dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
-			//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
+			//print "connection de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
 
 			$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index f30f1655e3c..1b1cbe8f103 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -192,7 +192,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 			// Create admin user
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
-			// Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
+			// Set default encryption to yes, generate a salt and set default encryption algorithm (but only if there is no user yet into database)
 			$sql = "SELECT u.rowid, u.pass, u.pass_crypted";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 			$resql = $db->query($sql);
@@ -389,7 +389,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
 			$tagdatabase = false;
 			if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) {
-				$tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
+				$tagdatabase = true; // We don't know what it was before, so now we consider we at the chosen version.
 			} else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
 				$targetversionarray = preg_split('/[.-]/', $targetversion);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 0802f57b9f5..b6d07930c33 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -255,7 +255,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			dolibarr_install_syslog("Clean database from bad named constraints");
 
 			// Suppression vieilles contraintes sans noms et en doubles
-			// Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
+			// Les contraintes indesirables ont un nom qui commence par 0_ ou se determine par ibfk_999
 			$listtables = array(
 								MAIN_DB_PREFIX.'adherent_options',
 								MAIN_DB_PREFIX.'bank_class',
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index cd8596f26a0..2ba539d80d9 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -136,7 +136,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		}
 	}
 
-	// $conf is already instanciated inside inc.php
+	// $conf is already instantiated inside inc.php
 	$conf->db->type = $dolibarr_main_db_type;
 	$conf->db->host = $dolibarr_main_db_host;
 	$conf->db->port = $dolibarr_main_db_port;
@@ -2044,7 +2044,7 @@ function migrate_modeles($db, $langs, $conf)
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$modellist = ModelePDFFactures::liste_modeles($db);
 		if (count($modellist) == 0) {
-			// Aucun model par defaut.
+			// Aucun model par default.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
 			$resql = $db->query($sql);
 			if (!$resql) {
@@ -2057,7 +2057,7 @@ function migrate_modeles($db, $langs, $conf)
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 		$modellist = ModelePDFCommandes::liste_modeles($db);
 		if (count($modellist) == 0) {
-			// Aucun model par defaut.
+			// Aucun model par default.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
 			$resql = $db->query($sql);
 			if (!$resql) {
@@ -2070,7 +2070,7 @@ function migrate_modeles($db, $langs, $conf)
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 		$modellist = ModelePdfExpedition::liste_modeles($db);
 		if (count($modellist) == 0) {
-			// Aucun model par defaut.
+			// Aucun model par default.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
 			$resql = $db->query($sql);
 			if (!$resql) {
@@ -2084,7 +2084,7 @@ function migrate_modeles($db, $langs, $conf)
 
 
 /**
- * Correspondance des expeditions et des commandes clients dans la table llx_co_exp
+ * Correspondence des expeditions et des commandes clients dans la table llx_co_exp
  *
  * @param	DoliDB		$db		Database handler
  * @param	Translate	$langs	Object langs
@@ -2149,7 +2149,7 @@ function migrate_commande_expedition($db, $langs, $conf)
 }
 
 /**
- * Correspondance des livraisons et des commandes clients dans la table llx_co_liv
+ * Correspondence des livraisons et des commandes clients dans la table llx_co_liv
  *
  * @param	DoliDB		$db		Database handler
  * @param	Translate	$langs	Object langs
@@ -3433,7 +3433,7 @@ function migrate_clean_association($db, $langs, $conf)
 		$obj = $db->fetch_object($result);
 		if ($obj) {	// It table categorie_association exists
 			$couples = array();
-			$filles = array();
+			$children = array();
 			$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
 			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
 			dolibarr_install_syslog("upgrade: search duplicate");
@@ -3441,9 +3441,9 @@ function migrate_clean_association($db, $langs, $conf)
 			if ($resql) {
 				$num = $db->num_rows($resql);
 				while ($obj = $db->fetch_object($resql)) {
-					if (!isset($filles[$obj->fk_categorie_fille])) {	// Only one record as child (a child has only on parent).
+					if (!isset($children[$obj->fk_categorie_fille])) {	// Only one record as child (a child has only on parent).
 						if ($obj->fk_categorie_mere != $obj->fk_categorie_fille) {
-							$filles[$obj->fk_categorie_fille] = 1; // Set record for this child
+							$children[$obj->fk_categorie_fille] = 1; // Set record for this child
 							$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
 						}
 					}
@@ -3560,7 +3560,7 @@ function migrate_categorie_association($db, $langs, $conf)
 }
 
 /**
- * Migrate event assignement to owner
+ * Migrate event assignment to owner
  *
  * @param	DoliDB		$db				Database handler
  * @param	Translate	$langs			Object langs
@@ -3626,7 +3626,7 @@ function migrate_event_assignement($db, $langs, $conf)
 }
 
 /**
- * Migrate event assignement to owner
+ * Migrate event assignment to owner
  *
  * @param	DoliDB		$db				Database handler
  * @param	Translate	$langs			Object langs
@@ -4247,7 +4247,7 @@ function migrate_delete_old_dir($db, $langs, $conf)
 
 
 /**
- * Disable/Reenable features modules.
+ * Disable/Re-enable features modules.
  * We must do this when internal menu of module or permissions has changed
  * or when triggers have moved.
  *
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 90723a905d3..3d76b5034d2 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
  * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
- * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024  Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -138,7 +138,7 @@ class IntracommReport extends CommonObject
 	/**
 	 * Generate XML file
 	 *
-	 * @param int			$mode 				O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
+	 * @param string		$mode 				'O' for create, R for regenerate (Look always 0 meant toujours 0 within the framework of XML exchanges according to documentation)
 	 * @param string		$type 				Declaration type by default - introduction or expedition (always 'expedition' for Des)
 	 * @param string		$period_reference	Period of reference
 	 * @return SimpleXMLElement|int
@@ -156,21 +156,21 @@ class IntracommReport extends CommonObject
 		/**************Construction du fichier XML***************************/
 		$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" standalone="yes"?><INSTAT></INSTAT>');
 
-		$enveloppe = $e->addChild('Envelope');
-		$enveloppe->addChild('envelopeId', $conf->global->INTRACOMMREPORT_NUM_AGREMENT);
-		$date_time = $enveloppe->addChild('DateTime');
+		$envelope = $e->addChild('Envelope');
+		$envelope->addChild('envelopeId', $conf->global->INTRACOMMREPORT_NUM_AGREMENT);
+		$date_time = $envelope->addChild('DateTime');
 		$date_time->addChild('date', date('Y-m-d'));
 		$date_time->addChild('time', date('H:i:s'));
-		$party = $enveloppe->addChild('Party');
+		$party = $envelope->addChild('Party');
 		$party->addAttribute('partyType', $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
 		$party->addAttribute('partyRole', $conf->global->INTRACOMMREPORT_ROLE_ACTEUR);
 		$party->addChild('partyId', $party_id);
 		$party->addChild('partyName', $declarant);
-		$enveloppe->addChild('softwareUsed', 'Dolibarr');
-		$declaration = $enveloppe->addChild('Declaration');
+		$envelope->addChild('softwareUsed', 'Dolibarr');
+		$declaration = $envelope->addChild('Declaration');
 		$declaration->addChild('declarationId', $id_declaration);
 		$declaration->addChild('referencePeriod', $period_reference);
-		if ($conf->global->INTRACOMMREPORT_TYPE_ACTEUR === 'PSI') {
+		if (getDolGlobalString('INTRACOMMREPORT_TYPE_ACTEUR') === 'PSI') {
 			$psiId = $party_id;
 		} else {
 			$psiId = 'NA';
diff --git a/htdocs/knowledgemanagement/README.md b/htdocs/knowledgemanagement/README.md
index 406e9032154..16454e21114 100644
--- a/htdocs/knowledgemanagement/README.md
+++ b/htdocs/knowledgemanagement/README.md
@@ -3,7 +3,7 @@ Knowledge Management base
 
 
 A complete knowledge database inside your application.
-Store, search and retreive any article to keep your knowledge into a database. It can be used to manage a list of FAQ, or a database
+Store, search and retrieve any article to keep your knowledge into a database. It can be used to manage a list of FAQ, or a database
 of process, or solutions of common problems.
  
 If you are using the Ticket module, you can also link each article of your knowledge management database to the main  
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index b85f363e7d0..0a93db98404 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -58,7 +58,7 @@ class KnowledgeManagement extends DolibarrApi
 	/**
 	 * Get properties of a knowledgerecord object
 	 *
-	 * Return an array with knowledgerecord informations
+	 * Return an array with knowledgerecord information
 	 *
 	 * @param	int		$id				ID of knowledgerecord
 	 * @return  Object					Object with cleaned properties
@@ -127,7 +127,7 @@ class KnowledgeManagement extends DolibarrApi
 	 * @param int				$page				Page number
 	 * @param int				$category			Use this param to filter list by category
 	 * @param string			$sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string			$properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string			$properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -237,7 +237,7 @@ class KnowledgeManagement extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->knowledgerecord->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -285,7 +285,7 @@ class KnowledgeManagement extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->knowledgerecord->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index fc1be7ed0b1..5a44a0d939a 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -80,7 +80,7 @@ class KnowledgeRecord extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -184,7 +184,7 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -228,10 +228,10 @@ class KnowledgeRecord extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -450,10 +450,10 @@ class KnowledgeRecord extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -461,11 +461,11 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		$error = 0;
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement WHERE fk_knowledgemanagement = ".((int) $this->id);
@@ -503,10 +503,10 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -534,7 +534,7 @@ class KnowledgeRecord extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -757,7 +757,7 @@ class KnowledgeRecord extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1048,7 +1048,7 @@ class KnowledgeRecord extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1186,7 +1186,7 @@ class KnowledgeRecordLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index dcb743f5a6a..23f09690b09 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -57,7 +57,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index dac31532f50..1146776872a 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -97,7 +97,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -529,7 +529,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 7939e82498d..1d9215fdedd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -446,8 +446,8 @@ AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modif
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
 ## Closure
-AccountancyClosureStep1=Step 1 : Validate and lock movements
-AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep1=Step 1 : Validate and lock the movements
+AccountancyClosureStep2=Step 2 : Close the fiscal period
 AccountancyClosureStep3=Step 3 : Extract entries (Optional)
 AccountancyClosureClose=Close fiscal period
 AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a1871dd23c8..aa9bb7328e9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2396,7 +2396,7 @@ RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
 WarningDisabled=Warning disabled
 LimitsAndMitigation=Access limits and mitigation
-RecommendMitigationOnURL=It is recommanded to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
+RecommendMitigationOnURL=It is recommended to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
 DesktopsOnly=Desktops only
 DesktopsAndSmartphones=Desktops et smartphones
 AllowOnlineSign=Allow online signing
@@ -2437,4 +2437,4 @@ ExtraFieldsSupplierInvoicesLinesRec=Complementary attributes (template invoice l
 ParametersForTestEnvironment=Parameters for test environment
 TryToKeepOnly=Try to keep only %s
 RecommendedForProduction=Recommended for Production
-RecommendedForDebug=Recommended for Debug
\ No newline at end of file
+RecommendedForDebug=Recommended for Debug
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8c40379b67b..227b546ba74 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1095,7 +1095,7 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Public file shared via link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 7127e4b9a1c..3af40c06384 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -60,10 +60,11 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external">the wiki documentation</a><br>.
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 61627ee39c8..23b7a975312 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -60,10 +60,11 @@ NoPageYet=Pas de page pour l'instant
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet.
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span> Vous pouvez également inclure le contenu d'une autre page / conteneur avec la syntaxe suivante: <br> <strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Vous pouvez créer une redirection vers une autre page / conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection): <br> <strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe: <br> <strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong> , utilisez l'encapsuleur <strong>document.php</strong> : <br> Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier dans des documents/medias (répertoire ouvert pour accès public), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong> : <br> Exemple, pour une image dans des documents/medias (répertoire ouvert), la syntaxe est: <br> <strong>&lt;img src = "/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>
-#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span> Vous pouvez également inclure le contenu d'une autre page / conteneur avec la syntaxe suivante: <br> <strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Vous pouvez créer une redirection vers une autre page / conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection): <br> <strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe: <br> <strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong> , utilisez l'encapsuleur <strong>document.php</strong> : <br> Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier dans des documents/medias (répertoire ouvert pour accès public), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong>.<br>Exemple, pour une image dans des documents/medias (répertoire ouvert), la syntaxe est: <br> <strong>&lt;img src = "/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès ouvert à l'aide de la clé de partage du fichier), la syntaxe est la suivante: <br> <strong> &lt;img src = "/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore= <br> Plus d'exemples de code HTML ou dynamique disponible sur <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentation wiki </a> <br> .
+YouCanEditHtmlSource3=Pour afficher l'image d'un object dans du code PHP, utilisez<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore= <br> Plus d'exemples de code HTML ou dynamique disponible sur <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible"> la documentation wiki </a>.<br>
 ClonePage=Cloner la page/container
 CloneSite=Cloner le site
 SiteAdded=Site web ajouté
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 1f167bab403..3a19d530054 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -668,7 +668,7 @@ if ($id > 0) {
 			$total_interest = 0;
 			$total_capital = 0;
 
-			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 			print '<table class="noborder paymenttable">';
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("RefPayment").'</td>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 4830cca6d2e..099db8e418c 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -475,7 +475,7 @@ class Loan extends CommonObject
 	 *  Return label of loan status (unpaid, paid)
 	 *
 	 *  @param  int		$mode			0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label
-	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
 	 *  @return string					Label
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -489,7 +489,7 @@ class Loan extends CommonObject
 	 *
 	 *  @param  int		$status			Id status
 	 *  @param  int		$mode			0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto
-	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
 	 *  @return string					Label
 	 */
 	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 7ade6bb92af..d7487780413 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -323,7 +323,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 2310dfb89a6..da6159fb493 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -39,7 +39,7 @@ $confirm = GETPOST('confirm');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-// TODO ajouter regle pour restreindre acces paiement
+// TODO ajouter regle pour restreindre access paiement
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $payment = new PaymentLoan($db);
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 1285b09c9cc..fd66843f7b5 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -70,7 +70,7 @@ if ($res > 0) {
 	}
 }
 
-// Set current line with last unpaid line (only if shedule is used)
+// Set current line with last unpaid line (only if schedule is used)
 if (!empty($line_id)) {
 	$line = new LoanSchedule($db);
 	$res = $line->fetch($line_id);
@@ -125,7 +125,7 @@ if ($action == 'add_payment') {
 		$remaindertopay = price2num(GETPOST('remaindertopay'));
 		$amount = $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
 
-		// This term is allready paid
+		// This term is already paid
 		if (!empty($line) && !empty($line->fk_bank)) {
 			setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
 			$error++;
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index fda8d22c792..e4a9424c21c 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -198,7 +198,7 @@ $(document).ready(function() {
 		var idcap=echeance-1;
 		idcap = '#hi_capital'+idcap;
 		var capital=price2numjs($(idcap).val());
-		console.log("Change montly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
+		console.log("Change monthly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
 		$.ajax({
 			  method: "GET",
 			  dataType: 'json',
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 8fe6da4726f..b7ef7d99eb9 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -238,7 +238,7 @@ class MailmanSpip
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Fonction qui dit si cet utilisateur est un redacteur existant dans spip
+	 *  Indicate if the user is an existing editor in spip
 	 *
 	 *	@param	object	$object		Object with data (->login)
 	 *  @return int     			1=exists, 0=does not exists, -1=error
@@ -257,11 +257,11 @@ class MailmanSpip
 
 					if ($result) {
 						if ($mydb->num_rows($result)) {
-							// nous avons au moins une reponse
+							// At least one result for the login query
 							$mydb->close();
 							return 1;
 						} else {
-							// nous n'avons pas de reponse => n'existe pas
+							// No result for the login query
 							$mydb->close();
 							return 0;
 						}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7fc2ca7777d..1fe210bd0a6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -80,7 +80,7 @@ function realCharForNumericEntities($matches)
 /**
  * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
  * Warning: Such a protection can't be enough. It is not reliable as it will always be possible to bypass this. Good protection can
- * only be guaranted by escaping data during output.
+ * only be guaranteed by escaping data during output.
  *
  * @param		string		$val		Brute value found into $_GET, $_POST or PHP_SELF
  * @param		string		$type		0=POST, 1=GET, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)
@@ -176,6 +176,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)[a-z]*\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)[a-z]*\s*=/i', $val);
 	// More not into the previous list
+
 	$inj += preg_match('/on(repeat|begin|finish|beforeinput)[a-z]*\s*=/i', $val);
 
 	// We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: <img on<a>error=alert(1) to bypass test on onerror
@@ -746,7 +747,7 @@ if (!defined('NOLOGIN')) {
 
 			// Check code
 			if (!$ok) {
-				dol_syslog('Bad value for code, connexion refused', LOG_NOTICE);
+				dol_syslog('Bad value for code, connection refused', LOG_NOTICE);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -854,7 +855,7 @@ if (!defined('NOLOGIN')) {
 			}
 
 			if (!$login) {
-				dol_syslog('Bad password, connexion refused (see a previous notice message for more info)', LOG_NOTICE);
+				dol_syslog('Bad password, connection refused (see a previous notice message for more info)', LOG_NOTICE);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -888,12 +889,12 @@ if (!defined('NOLOGIN')) {
 		}
 
 		// End test login / passwords
-		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) {	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) {	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connection is a success.
 			// No data to test login, so we show the login page.
 			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit", LOG_NOTICE);
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
 				// When used with NOREDIRECTBYMAINTOLOGIN set, the http header must already be set when including the main.
-				// See example with selectsearchbox.php. This case is reserverd for the selectesearchbox.php so we can
+				// See example with selectsearchbox.php. This case is reserved for the selectesearchbox.php so we can
 				// report a message to ask to login when search ajax component is used after a timeout.
 				//top_httphead();
 				return 'ERROR_NOT_LOGGED';
@@ -908,7 +909,7 @@ if (!defined('NOLOGIN')) {
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password.
 		if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) {
-			dol_syslog('User not found or not valid, connexion refused');
+			dol_syslog('User not found or not valid, connection refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
@@ -994,7 +995,7 @@ if (!defined('NOLOGIN')) {
 				dol_syslog("The user login is disabled");
 			} else {
 				// User validity dates are no more valid
-				dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
+				dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now());
 			}
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
@@ -1109,7 +1110,7 @@ if (!defined('NOLOGIN')) {
 	}
 
 	// Is it a new session that has started ?
-	// If we are here, this means authentication was successfull.
+	// If we are here, this means authentication was successful.
 	if (!isset($_SESSION["dol_login"])) {
 		// New session for this login has started.
 		$error = 0;
@@ -1165,7 +1166,7 @@ if (!defined('NOLOGIN')) {
 		}
 		// End call triggers
 
-		// Hooks on successfull login
+		// Hooks on successful login
 		$action = '';
 		$hookmanager->initHooks(array('login'));
 		$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
@@ -1296,7 +1297,7 @@ if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
 	$conf->dol_no_mouse_hover = 1;
 }
 
-// If on smartphone or optmized for small screen
+// If on smartphone or optimized for small screen
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 			|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 			|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400
@@ -1440,7 +1441,7 @@ if (!function_exists("llxHeader")) {
 	/**
 	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
 	 *
-	 * @param 	string 			$head				Optionnal head lines
+	 * @param 	string 			$head				Optional head lines
 	 * @param 	string 			$title				HTML title
 	 * @param	string			$help_url			Url links to help page
 	 * 		                            			Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage|DE:GermanPage
@@ -1651,10 +1652,10 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 }
 
 /**
- * Ouput html header of a page. It calls also top_httphead()
+ * Output html header of a page. It calls also top_httphead()
  * This code is also duplicated into security2.lib.php::dol_loginfunction
  *
- * @param 	string 	$head			 Optionnal head lines
+ * @param 	string 	$head			 Optional head lines
  * @param 	string 	$title			 HTML title
  * @param 	int    	$disablejs		 Disable js output
  * @param 	int    	$disablehead	 Disable head output
@@ -1719,6 +1720,13 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		// Mobile appli like icon
 		$manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
+		$parameters = array('manifest'=>$manifest);
+		$resHook = $hookmanager->executeHooks('hookSetManifest', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($resHook > 0) {
+			$manifest = $hookmanager->resPrint; // Replace manifest.json
+		} else {
+			$manifest .= $hookmanager->resPrint; // Concat to actual manifest declaration
+		}
 		if (!empty($manifest)) {
 			print '<link rel="manifest" href="'.$manifest.'" />'."\n";
 		}
@@ -1763,7 +1771,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print "\n";
 
 		if (GETPOST('version', 'int')) {
-			$ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+			$ext = 'version='.GETPOST('version', 'int'); // useful to force no cache on css/js
 		}
 		// Refresh value of MAIN_IHM_PARAMS_REV before forging the parameter line.
 		if (GETPOST('dol_resetcache')) {
@@ -2179,14 +2187,25 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
-		// Link to print main content area
+		// Link to print main content area (optioncss=print)
 		if (!getDolGlobalString('MAIN_PRINT_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (isset($_POST) && is_array($_POST)) {
 				foreach ($_POST as $key => $value) {
-					if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
-						$qs .= '&'.$key.'='.urlencode($value);
+					if (in_array($key, array('action', 'massaction', 'password'))) {
+						continue;
+					}
+					if (!is_array($value)) {
+						if ($value !== '') {
+							$qs .= '&'.$key.'='.urlencode($value);
+						}
+					} else {
+						foreach ($value as $value2) {
+							if ($value2 !== '') {
+								$qs .= '&'.$key.'[]='.urlencode($value2);
+							}
+						}
 					}
 				}
 			}
@@ -2556,12 +2575,12 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	            });
 
 	            jQuery("#topmenulogincompanyinfo-btn").on("click", function() {
-					console.log("Clik on #topmenulogincompanyinfo-btn");
+					console.log("Click on #topmenulogincompanyinfo-btn");
 	                jQuery("#topmenulogincompanyinfo").slideToggle();
 	            });
 
 	            jQuery("#topmenuloginmoreinfo-btn").on("click", function() {
-					console.log("Clik on #topmenuloginmoreinfo-btn");
+					console.log("Click on #topmenuloginmoreinfo-btn");
 	                jQuery("#topmenuloginmoreinfo").slideToggle();
 	            });';
 		}
@@ -2983,7 +3002,7 @@ function top_menu_search()
     <script>
     jQuery(document).ready(function() {
 
-        // prevent submiting form on press ENTER
+        // prevent submitting form on press ENTER
         jQuery("#top-global-search-input").keydown(function (e) {
             if (e.keyCode == 13 || e.keyCode == 40) {
                 var inputs = $(this).parents("form").eq(0).find(":button");
@@ -3068,7 +3087,7 @@ function top_menu_search()
 /**
  *  Show left menu bar
  *
- *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
+ *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprecated and must be provided to ''.
  *  @param  string	$helppagename    	       	Name of wiki page for help ('' by default).
  * 				     		                   	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage|DE:GermanPage
  * 									         	For other external page: http://server/url
@@ -3272,7 +3291,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
 				$bugbaseurl .= urlencode("[*Verbose description*]\n");
 				$bugbaseurl .= urlencode("\n");
-				$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
+				$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging information…)\n");
 				$bugbaseurl .= urlencode("[*Files*]\n");
 				$bugbaseurl .= urlencode("\n");
 
@@ -3487,7 +3506,7 @@ if (!function_exists("llxFooter")) {
 	 *
 	 * @param	string	$comment    				A text to add as HTML comment into HTML generated page
 	 * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
-	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
+	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without displaying them
 	 * @return	void
 	 */
 	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
@@ -3528,7 +3547,7 @@ if (!function_exists("llxFooter")) {
 					if (empty($val['sortorder'])) {
 						unset($val['sortorder']);
 					}
-					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
 					$_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
 				}
@@ -3665,7 +3684,7 @@ if (!function_exists("llxFooter")) {
 					// MAIN_LAST_PING_KO_DATE
 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent (this month)
 					if (getDolGlobalString('MAIN_LAST_PING_KO_DATE') && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
-						print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. An error already occured this month, we will try later. -->\n";
+						print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. An error already occurred this month, we will try later. -->\n";
 					} else {
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index b316708f3ed..a59b140f098 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -188,7 +188,7 @@ if (!empty($enddate)) {
 }
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 // We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report.
-// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
+// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable.
 if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) {
 	$sql .= " AND d.buy_price_ht <> 0";
 }
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 66ffc072e74..eda02b7998e 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -260,7 +260,7 @@ if (!empty($enddate)) {
 }
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 // We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report.
-// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
+// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable.
 if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) {
 	$sql .= " AND d.buy_price_ht <> 0";
 }
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 836d34c3341..c052377fc92 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -106,55 +106,55 @@ function marges_prepare_head()
 /**
  * Return an array with margins information of a line
  *
- * @param 	float 	$pvht				Selling price without tax
+ * @param 	float 	$pv_ht				Selling price without tax
  * @param 	float	$remise_percent		Discount percent on line
  * @param 	float	$tva_tx				Vat rate (not used)
  * @param 	float	$localtax1_tx		Vat rate special 1 (not used)
  * @param 	float	$localtax2_tx		Vat rate special 2 (not used)
- * @param 	int		$fk_pa				Id of buying price (prefer set this to 0 and provide $paht instead. With id, buying price may have change)
- * @param 	float	$paht				Buying price without tax
+ * @param 	int		$fk_pa				Id of buying price (prefer set this to 0 and provide $pa_ht instead. With id, buying price may have change)
+ * @param 	float	$pa_ht				Buying price without tax
  * @return	array						Array of margin info (buying price, marge rate, marque rate)
  */
-function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht)
+function getMarginInfos($pv_ht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $pa_ht)
 {
 	global $db, $conf;
 
 	$marge_tx_ret = '';
 	$marque_tx_ret = '';
 
-	if ($fk_pa > 0 && empty($paht)) {
+	if ($fk_pa > 0 && empty($pa_ht)) {
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$product = new ProductFournisseur($db);
 		if ($product->fetch_product_fournisseur_price($fk_pa)) {
-			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+			$pa_ht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
 		} else {
-			$paht_ret = $paht;
+			$pa_ht_ret = $pa_ht;
 		}
 	} else {
-		$paht_ret = $paht;
+		$pa_ht_ret = $pa_ht;
 	}
 
 	// Calculate selling unit price including line discount
 	// We don't use calculate_price, because this function is dedicated to calculation of total with accuracy of total. We need an accuracy of a unit price.
 	// Also we must not apply rounding on non decimal rule defined by option MAIN_ROUNDING_RULE_TOT
-	$pu_ht_remise = $pvht * (1 - ($remise_percent / 100));
+	$pu_ht_remise = $pv_ht * (1 - ($remise_percent / 100));
 	$pu_ht_remise = price2num($pu_ht_remise, 'MU');
 
 	// calcul marge
 	if ($pu_ht_remise < 0) {
-		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
+		$marge = -1 * (abs($pu_ht_remise) - $pa_ht_ret);
 	} else {
-		$marge = $pu_ht_remise - $paht_ret;
+		$marge = $pu_ht_remise - $pa_ht_ret;
 	}
 
 	// calcul taux marge
-	if ($paht_ret != 0) {
-		$marge_tx_ret = (100 * $marge) / $paht_ret;
+	if ($pa_ht_ret != 0) {
+		$marge_tx_ret = (100 * $marge) / $pa_ht_ret;
 	}
 	// calcul taux marque
 	if ($pu_ht_remise != 0) {
 		$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
 	}
 
-	return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
+	return array($pa_ht_ret, $marge_tx_ret, $marque_tx_ret);
 }
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d782ad10a01..b13f504fa94 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -216,7 +216,7 @@ if (!empty($enddate)) {
 }
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 // We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report.
-// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
+// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable.
 if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) {
 	$sql .= " AND d.buy_price_ht <> 0";
 }
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 89de7e7d79f..1b7e9a1bb85 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -168,7 +168,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 			$sql .= " AND d.buy_price_ht IS NOT NULL";
 			// We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report.
-			// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
+			// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable.
 			if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) {
 				$sql .= " AND d.buy_price_ht <> 0";
 			}
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 69cfa8e54aa..53008e78728 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -185,7 +185,7 @@ if ($socid > 0) {
 	$sql .= " AND f.fk_soc = $socid";
 	$sql .= " AND d.buy_price_ht IS NOT NULL";
 	// We should not use this here. Option ForceBuyingPriceIfNull should have effect only when inserting data. Once data is recorded, it must be used as it is for report.
-	// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
+	// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredictable.
 	if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) {
 		$sql .= " AND d.buy_price_ht <> 0";
 	}
@@ -202,7 +202,7 @@ if ($socid > 0) {
 		print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
 
 		$i = 0;
-		print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print "<table class=\"noborder\" width=\"100%\">";
 
 		print '<tr class="liste_titre">';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 7ac5b569dbf..1da84df3e33 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -114,7 +114,7 @@ if (!empty($dolibarr_main_document_root_alt)) {
 	}
 }
 
-// Chargement des includes principaux de librairies communes
+// Load the main includes of common libraries
 if (!defined('NOREQUIREUSER')) {
 	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // Need 500ko memory
 }
@@ -127,7 +127,7 @@ if (!defined('NOREQUIRESOC')) {
 
 
 /*
- * Creation objet $langs (must be before all other code)
+ * Create object $langs (must be before all other code)
  */
 if (!defined('NOREQUIRETRAN')) {
 	$langs = new Translate('', $conf); // Must be after reading conf
@@ -163,7 +163,7 @@ if (!defined('NOREQUIREDB')) {
 	}
 }
 
-// Now database connexion is known, so we can forget password
+// Now database connection is known, so we can forget password
 //unset($dolibarr_main_db_pass); 	// We comment this because this constant is used in some other pages
 unset($conf->db->pass); // This is to avoid password to be shown in memory/swap dump
 
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index ca47a61e3e2..02513e697be 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -75,7 +75,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 if (preg_match('/del_(.*)/', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0) {
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 2fbddca8900..bed53dd9aab 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1068,7 +1068,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 			 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 			 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 			 *  'index' if we want an index in database.
-			 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+			 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 			 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 			 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 			 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -1618,7 +1618,7 @@ if ($dirins && $action == 'initdic' && $module && empty($cancel)) {
 	}
 	if (!GETPOST('label')) {
 		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lable")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
 	if (!$error) {
 		$newdicname = $dicname;
@@ -2258,7 +2258,7 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 		}
 	}
 
-	// verify informations entred
+	// verify information entered
 	if (!GETPOST('label', 'alpha')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
@@ -2353,7 +2353,7 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 			dol_print_error($db, $e->getMessage());
 		}
 	}
-	// verify informations entred
+	// verify information entered
 	if (!GETPOST('label', 'alpha')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
@@ -3470,7 +3470,8 @@ if ($module == 'initmodule') {
 				foreach ($listofsetuppages as $setuppage) {
 					//var_dump($setuppage);
 					print '<tr><td>';
-					print '<span class="fa fa-file-o"></span> '.$langs->trans("SetupFile").' : <strong class="wordbreak">'.$modulelowercase.'/admin/'.$setuppage['relativename'].'</strong>';
+					print '<span class="fa fa-file-o"></span> '.$langs->trans("SetupFile").' : ';
+					print '<strong class="wordbreak bold"><a href="'.dol_buildpath($modulelowercase.'/admin/'.$setuppage['relativename'], 1).'" target="_test">'.$modulelowercase.'/admin/'.$setuppage['relativename'].'</a></strong>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($modulelowercase.'/admin/'.$setuppage['relativename']).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 					print '</td></tr>';
 				}
@@ -5035,7 +5036,7 @@ if ($module == 'initmodule') {
 			$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
 			$destdir = $dirins.'/'.strtolower($module);
 			$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
-			$objects = dolGetListOfObjectclasses($destdir);
+			$objects = dolGetListOfObjectClasses($destdir);
 
 			$leftmenus = array();
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 875e9e03c38..34a94fbc016 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -143,7 +143,8 @@ $item = $formSetup->newItem('MYMODULE_MYPARAM10');
 $item->setAsMultiSelect($TField);
 $item->helpText = $langs->transnoentities('MYMODULE_MYPARAM10');
 
-
+// Setup conf for a category selection
+$formSetup->newItem('MYMODULE_CATEGORY_ID_XXX')->setAsCategory('product');
 
 // Setup conf MYMODULE_MYPARAM10
 $item = $formSetup->newItem('MYMODULE_MYPARAM10');
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 78f4cdebb68..25a086f58cd 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -59,7 +59,7 @@ class MyModuleApi extends DolibarrApi
 	/**
 	 * Get properties of a myobject object
 	 *
-	 * Return an array with myobject informations
+	 * Return an array with myobject information
 	 *
 	 * @param	int		$id				ID of myobject
 	 * @return  Object					Object with cleaned properties
@@ -98,7 +98,7 @@ class MyModuleApi extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -203,7 +203,7 @@ class MyModuleApi extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->myobject->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -251,7 +251,7 @@ class MyModuleApi extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->myobject->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index b35a4ae989d..f0a3c8f3887 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -92,7 +92,7 @@ class MyObject extends CommonObject
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -243,7 +243,7 @@ class MyObject extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -287,10 +287,10 @@ class MyObject extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -542,10 +542,10 @@ class MyObject extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -553,11 +553,11 @@ class MyObject extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User $user       	User that deletes
+	 * @param int 	$notrigger  0=launch triggers, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -568,10 +568,10 @@ class MyObject extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -599,7 +599,7 @@ class MyObject extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -818,7 +818,7 @@ class MyObject extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1188,7 +1188,7 @@ class MyObject extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1275,7 +1275,7 @@ class MyObjectLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index d9749ce8511..84c5f3886f6 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -117,7 +117,7 @@ class mymodulewidget1 extends ModeleBoxes
 			'target' => '',
 			// HTML class attached to the picto and link
 			'subclass' => 'center',
-			// Limit and truncate with "…" the displayed text lenght, 0 = disabled
+			// Limit and truncate with "…" the displayed text length, 0 = disabled
 			'limit' => 0,
 			// Adds translated " (Graph)" to a hidden form value's input (?)
 			'graph' => false
@@ -140,7 +140,7 @@ class mymodulewidget1 extends ModeleBoxes
 					'target' => '_blank',
 					// Fist line logo (deprecated. Include instead logo html code into text or text2, and set asis property to true to avoid HTML cleaning)
 					//'logo' => 'monmodule@monmodule',
-					// Unformatted text, added after text. Usefull to add/load javascript code
+					// Unformatted text, added after text. Useful to add/load javascript code
 					'textnoformat' => '',
 
 					// Main text for content of cell (other method)
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
index ce1c1e90c3b..8f242f3fd2e 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
@@ -169,7 +169,7 @@ class mailing_mailing_mymodule_selector1 extends MailingTargets
 	 */
 	public function getSqlArrayForStats()
 	{
-		// CHANGE THIS: Optionnal
+		// CHANGE THIS: Optional
 
 		//var $statssql=array();
 		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 7ff829ad411..b2bcfa2eeb1 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -189,7 +189,7 @@ class modMyModule extends DolibarrModules
 		// 'intervention'     to add a tab in intervention view
 		// 'invoice'          to add a tab in customer invoice view
 		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
+		// 'member'           to add a tab in foundation member view
 		// 'opensurveypoll'	  to add a tab in opensurvey poll view
 		// 'order'            to add a tab in sale order view
 		// 'order_supplier'   to add a tab in supplier order view
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 15f8ebf9f08..555363b958a 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -319,7 +319,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 0d34cb3ba06..145ce9156d7 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_standard_myobject extends ModelePDFMyObject
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -132,7 +132,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -1204,18 +1204,18 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		$this->cols['theColKey'] = array(
 			'rank' => $rank, // int : use for ordering columns
 			'width' => 20, // the column width in mm
 			'title' => array(
 				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				'label' => ' ', // the final label : used fore final generated text
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 			'content' => array(
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 		);
@@ -1227,7 +1227,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 392addd84d0..cf6138143d5 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -147,7 +147,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'PRODUCT_SET_MULTILANGS':
 			//case 'PRODUCT_DEL_MULTILANGS':
 
-			//Stock mouvement
+			//Stock movement
 			//case 'STOCK_MOVEMENT':
 
 			//MYECMDIR
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
index cc518391c33..8677fa58069 100644
--- a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -28,6 +28,7 @@ ModuleMyModuleDesc = MyModule description
 MyModuleSetup = MyModule setup
 Settings = Settings
 MyModuleSetupPage = MyModule setup page
+NewSection=New section
 MYMODULE_MYPARAM1 = My param 1
 MYMODULE_MYPARAM1Tooltip = My param 1 tooltip
 MYMODULE_MYPARAM2=My param 2
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 8695b9a9100..1005958d029 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -116,7 +116,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 0377c74a0a5..3f57f50d349 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -139,7 +139,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -584,7 +584,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/modulebuilder/template/test/phpunit/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/functional/MyModuleFunctionalTest.php
index 50f9d9c3257..660b4cc4105 100644
--- a/htdocs/modulebuilder/template/test/phpunit/functional/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/functional/MyModuleFunctionalTest.php
@@ -180,7 +180,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		} else {
 			// Disable the module
 			$this->byHref('modMyModule')->click();
-			// Reenable the module
+			// Re-enable the module
 			$this->byHref('modMyModule')->click();
 		}
 		// Page reloaded, we need a new Xpath
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 242628d32a5..4b185f4b304 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -53,7 +53,7 @@ class Mos extends DolibarrApi
 	/**
 	 * Get properties of a MO object
 	 *
-	 * Return an array with MO informations
+	 * Return an array with MO information
 	 *
 	 * @param	int		$id				ID of MO
 	 * @return  Object					Object with cleaned properties
@@ -90,7 +90,7 @@ class Mos extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -187,7 +187,7 @@ class Mos extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->mo->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -231,7 +231,7 @@ class Mos extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->mo->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -348,7 +348,7 @@ class Mos extends DolibarrApi
 				$arraytoproduce = $value;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$stockmove->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 09a8fe10f2c..78b95f012c0 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Lenin Rivas		   <lenin@leninrivas.com>
- * Copyright (C) 2023       Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
  *
  * 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
@@ -77,7 +77,7 @@ class Mo extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -257,7 +257,7 @@ class Mo extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -293,10 +293,10 @@ class Mo extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <=0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$error = 0;
 		$idcreated = 0;
@@ -316,7 +316,7 @@ class Mo extends CommonObject
 		$this->db->begin();
 
 		if ($this->fk_bom > 0) {
-			// If there is a nown BOM, we force the type of MO to the type of BOM
+			// If there is a known BOM, we force the type of MO to the type of BOM
 			include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 			$tmpbom = new BOM($this->db);
 			$tmpbom->fetch($this->fk_bom);
@@ -550,7 +550,7 @@ class Mo extends CommonObject
 	 * Get list of lines linked to current line for a defined role.
 	 *
 	 * @param  	string 	$role      	Get lines linked to current line with the selected role ('consumed', 'produced', ...)
-	 * @param	int		$lineid		Id of production line to filter childs
+	 * @param	int		$lineid		Id of production line to filter children
 	 * @return 	array             	Array of lines
 	 */
 	public function fetchLinesLinked($role, $lineid = 0)
@@ -637,10 +637,10 @@ class Mo extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -671,10 +671,10 @@ class Mo extends CommonObject
 	 * Erase and update the line to consume and to produce.
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function createProduction(User $user, $notrigger = true)
+	public function createProduction(User $user, $notrigger = 0)
 	{
 		$error = 0;
 		$role = "";
@@ -789,10 +789,10 @@ class Mo extends CommonObject
 	 * Update quantities in lines to consume and/or lines to produce.
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function updateProduction(User $user, $notrigger = true)
+	public function updateProduction(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -842,11 +842,11 @@ class Mo extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param	User	$user										User that deletes
-	 * @param	bool	$notrigger									false=launch triggers after, true=disable triggers
+	 * @param	int		$notrigger									0=launch triggers after, 1=disable triggers
 	 * @param	bool	$also_cancel_consumed_and_produced_lines  	true if the consumed and produced lines will be deleted (and stocks incremented/decremented back) (false by default)
 	 * @return	int													Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false, $also_cancel_consumed_and_produced_lines = false)
+	public function delete(User $user, $notrigger = 0, $also_cancel_consumed_and_produced_lines = false)
 	{
 		$error = 0;
 		$this->db->begin();
@@ -879,10 +879,10 @@ class Mo extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		global $langs;
 		$langs->loadLangs(array('stocks', 'mrp'));
@@ -1024,7 +1024,7 @@ class Mo extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -1234,7 +1234,7 @@ class Mo extends CommonObject
 	 *	Cancel consumed and produced lines (movement stocks)
 	 *
 	 *	@param	User	$user					Object user that modify
-	 *  @param  bool	$mode  					Type line supported (0 by default) (0: consumed and produced lines; 1: consumed lines; 2: produced lines)
+	 *  @param  int 	$mode  					Type line supported (0 by default) (0: consumed and produced lines; 1: consumed lines; 2: produced lines)
 	 *  @param  bool	$also_delete_lines  	true if the consumed/produced lines is deleted (false by default)
 	 *  @param	int		$notrigger				1=Does not execute triggers, 0=Execute triggers
 	 *	@return	int								Return integer <0 if KO, 0=Nothing done, >0 if OK
@@ -1386,7 +1386,7 @@ class Mo extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', '', 'production', ...)
@@ -1605,7 +1605,7 @@ class Mo extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1807,7 +1807,7 @@ class Mo extends CommonObject
 
 
 	/**
-	 * Function used to return childs of Mo
+	 * Function used to return children of Mo
 	 *
 	 * @return Mo[]|int 			array if OK, -1 if KO
 	 */
@@ -1893,7 +1893,7 @@ class Mo extends CommonObject
 
 
 	/**
-	 * Function used to return childs of Mo
+	 * Function used to return children of Mo
 	 *
 	 * @return Mo|int			MO object if OK, -1 if KO, 0 if not exist
 	 */
@@ -2052,7 +2052,7 @@ class MoLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -2090,10 +2090,10 @@ class MoLine extends CommonObjectLine
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		if (empty($this->qty)) {
 			$this->error = 'BadValueForQty';
@@ -2198,10 +2198,10 @@ class MoLine extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -2209,11 +2209,11 @@ class MoLine extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 441e0d79bf7..97819f7bf3a 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -69,7 +69,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -143,7 +143,7 @@ if (empty($reshook)) {
 	}
 	$triggermodname = 'MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-	// Create MO with Childs
+	// Create MO with Children
 	if ($action == 'add' && empty($id) && !empty($TBomLineId)) {
 		$noback = 1;
 		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 63ec40be623..136345b7c87 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -86,7 +86,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -477,7 +477,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 97ae90c7eeb..9cbea212d8e 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -92,7 +92,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 9fb66eb916d..7cbdcef0abc 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -70,7 +70,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 5e02c43a319..291de3868a6 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -48,7 +48,7 @@ class MultiCurrencies extends DolibarrApi
 	 * @param int		$limit			Limit for list
 	 * @param int	    $page			Page number
 	 * @param string    $sqlfilters		Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
-	 * @param string    $properties		Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties		Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array					Array of warehouse objects
 	 *
 	 * @throws RestException
@@ -109,7 +109,7 @@ class MultiCurrencies extends DolibarrApi
 	/**
 	 * Get properties of a Currency object
 	 *
-	 * Return an array with Currency informations
+	 * Return an array with Currency information
 	 *
 	 * @param	int			$id		ID of Currency
 	 * @return  Object              Object with cleaned properties
@@ -133,7 +133,7 @@ class MultiCurrencies extends DolibarrApi
 	/**
 	 * Get properties of a Currency object by code
 	 *
-	 * Return an array with Currency informations
+	 * Return an array with Currency information
 	 * @url GET /bycode/{code}
 	 *
 	 * @param	string		$code	Code of Currency (ex: EUR)
@@ -257,7 +257,7 @@ class MultiCurrencies extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$multicurrency->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -350,7 +350,7 @@ class MultiCurrencies extends DolibarrApi
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
-		// Clear all fields out of interrest
+		// Clear all fields out of interest
 		foreach ($object as $key => $value) {
 			if ($key == "rate") {
 				$object->$key = $this->_cleanObjectDatasRate($object->$key);
@@ -376,7 +376,7 @@ class MultiCurrencies extends DolibarrApi
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
-		// Clear all fields out of interrest
+		// Clear all fields out of interest
 		foreach ($object as $key => $value) {
 			if ($key == "id" || $key == "rate" || $key == "date_sync") {
 				continue;
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index a7ef2153c9f..779d53eecfa 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -97,7 +97,7 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -108,10 +108,10 @@ class MultiCurrency extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      	User that creates
-	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $trigger = true)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -160,7 +160,7 @@ class MultiCurrency extends CommonObject
 			$this->date_create = $now;
 			$this->fk_user = $user->id;
 
-			if ($trigger) {
+			if (empty($notrigger)) {
 				$result = $this->call_trigger('CURRENCY_CREATE', $user);
 				if ($result < 0) {
 					$error++;
@@ -274,10 +274,10 @@ class MultiCurrency extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      	User that modifies
-	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $trigger = true)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -310,7 +310,7 @@ class MultiCurrency extends CommonObject
 			dol_syslog('MultiCurrency::update '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (!$error && $trigger) {
+		if (!$error && empty($notrigger)) {
 			$result = $this->call_trigger('CURRENCY_MODIFY', $user);
 			if ($result < 0) {
 				$error++;
@@ -333,10 +333,10 @@ class MultiCurrency extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param	User	$user		User making the deletion
-	 * @param 	bool 	$trigger 	true=launch triggers after, false=disable triggers
+	 * @param  	int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($user, $trigger = true)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog('MultiCurrency::delete', LOG_DEBUG);
 
@@ -344,7 +344,7 @@ class MultiCurrency extends CommonObject
 
 		$this->db->begin();
 
-		if ($trigger) {
+		if (empty($notrigger)) {
 			$result = $this->call_trigger('CURRENCY_DELETE', $user);
 			if ($result < 0) {
 				$error++;
@@ -409,10 +409,12 @@ class MultiCurrency extends CommonObject
 	 */
 	public function addRate($rate)
 	{
+		global $user;
+
 		$currencyRate = new CurrencyRate($this->db);
 		$currencyRate->rate = price2num($rate);
 
-		if ($currencyRate->create($this->id) > 0) {
+		if ($currencyRate->create($user, $this->id) > 0) {
 			$this->rate = $currencyRate;
 			return 1;
 		} else {
@@ -630,7 +632,7 @@ class MultiCurrency extends CommonObject
 				return 1;
 			}
 
-			return -1; // Alternate souce not found
+			return -1; // Alternate source not found
 		}
 
 		return 0; // Nothing to do
@@ -775,7 +777,7 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -785,13 +787,14 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Create object into database
 	 *
-	 * @param  int	$fk_multicurrency	Id of currency
-	 * @param  bool	$trigger			true=launch triggers after, false=disable triggers
-	 * @return int 						Return integer <0 if KO, Id of created object if OK
+	 * @param	User	$user				User making the deletion
+	 * @param  	int		$fk_multicurrency	Id of currency
+	 * @param  	int 	$notrigger 			0=launch triggers after, 1=disable triggers
+	 * @return 	int 						Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create($fk_multicurrency, $trigger = true)
+	public function create(User $user, int $fk_multicurrency, $notrigger = 0)
 	{
-		global $conf, $user;
+		global $conf;
 
 		dol_syslog('CurrencyRate::create', LOG_DEBUG);
 
@@ -832,7 +835,7 @@ class CurrencyRate extends CommonObjectLine
 			$this->fk_multicurrency = $fk_multicurrency;
 			$this->date_sync = $now;
 
-			if ($trigger) {
+			if (empty($notrigger)) {
 				$result = $this->call_trigger('CURRENCYRATE_CREATE', $user);
 				if ($result < 0) {
 					$error++;
@@ -897,13 +900,12 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Update object into database
 	 *
-	 * @param  bool $trigger	true=launch triggers after, false=disable triggers
-	 * @return int 				Return integer <0 if KO, >0 if OK
+	 * @param	User	$user		User making the deletion
+	 * @param  	int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update($trigger = true)
+	public function update(User $user, $notrigger = 0)
 	{
-		global $user;
-
 		$error = 0;
 
 		dol_syslog('CurrencyRate::update', LOG_DEBUG);
@@ -931,7 +933,7 @@ class CurrencyRate extends CommonObjectLine
 			dol_syslog('CurrencyRate::update '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (!$error && $trigger) {
+		if (!$error && empty($notrigger)) {
 			$result = $this->call_trigger('CURRENCYRATE_MODIFY', $user);
 			if ($result < 0) {
 				$error++;
@@ -954,10 +956,10 @@ class CurrencyRate extends CommonObjectLine
 	 * Delete object in database
 	 *
 	 * @param	User	$user		User making the deletion
-	 * @param 	bool 	$trigger 	true=launch triggers after, false=disable triggers
+	 * @param  	int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($user, $trigger = true)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog('CurrencyRate::delete', LOG_DEBUG);
 
@@ -965,7 +967,7 @@ class CurrencyRate extends CommonObjectLine
 
 		$this->db->begin();
 
-		if ($trigger) {
+		if (empty($notrigger)) {
 			$result = $this->call_trigger('CURRENCYRATE_DELETE', $user);
 			if ($result < 0) {
 				$error++;
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 4164a99cb6b..8e85a0f4d7e 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array('multicurrency'));
+$langs->loadLangs(array('admin', 'multicurrency'));
 
 // Get Parameters
 $action				= GETPOST('action', 'alpha');
@@ -78,7 +78,6 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-
 // Initialize technical objects
 $object = new CurrencyRate($db);
 $form = new Form($db);
@@ -150,7 +149,7 @@ if ($action == "create") {
 		$currencyRate_static->rate = $rateinput;
 		$currencyRate_static->rate_indirect = $rateindirectinput;
 
-		$result = $currencyRate_static->create(intval($fk_currency));
+		$result = $currencyRate_static->create($user, intval($fk_currency));
 		if ($result > 0) {
 			setEventMessages($langs->trans('successRateCreate', $multicurrency_code), null);
 		} else {
@@ -169,7 +168,7 @@ if ($action == 'update') {
 		$currencyRate->date_sync = $dateinput;
 		$currencyRate->fk_multicurrency = $fk_currency;
 		$currencyRate->rate = $rateinput;
-		$res = $currencyRate->update();
+		$res = $currencyRate->update($user);
 		if ($res) {
 			setEventMessages($langs->trans('successUpdateRate'), null);
 		} else {
@@ -182,7 +181,7 @@ if ($action == 'update') {
 
 if ($action == "deleteRate") {
 	$current_rate = new CurrencyRate($db);
-	$current_rate->fetch(intval($id_rate_selected));
+	$current_rate->fetch((int) $id_rate_selected);
 
 	if ($current_rate) {
 		$current_currency = new MultiCurrency($db);
@@ -207,7 +206,7 @@ if ($action == "deleteRate") {
 
 if ($action == "confirm_delete") {
 	$current_rate = new CurrencyRate($db);
-	$current_rate->fetch(intval($id_rate_selected));
+	$current_rate->fetch((int) $id_rate_selected);
 	if ($current_rate) {
 		$result = $current_rate->delete($user);
 		if ($result) {
@@ -346,7 +345,7 @@ if ($search_date_sync && $search_date_sync_end) {
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
 }
 if ($search_rate) {
-	$sql .= natural_search('cr.rate', $search_rate);
+	$sql .= natural_search('cr.rate', $search_rate, 1);
 }
 if ($search_code) {
 	$sql .= natural_search('m.code', $search_code);
@@ -357,7 +356,7 @@ $sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= " GROUP BY cr.rowid, cr.date_sync, cr.rate, m.code, cr.entity, m.code, m.name";
+$sql .= " GROUP BY cr.rowid, cr.date_sync, cr.rate, cr.rate_indirect, m.code, cr.entity, m.code, m.name";
 
 // Add fields from hooks
 $parameters = array();
@@ -477,6 +476,13 @@ if ($resql) {
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
 
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre center">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	// date
 	if (!empty($arrayfields['cr.date_sync']['checked'])) {
 		print '<td class="liste_titre" align="left">';
@@ -502,14 +508,20 @@ if ($resql) {
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-
+	// Action column
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre center">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	if (!empty($arrayfields['cr.date_sync']['checked'])) {
 		print_liste_field_titre($arrayfields['cr.date_sync']['label'], $_SERVER["PHP_SELF"], "cr.date_sync", "", $param, "", $sortfield, $sortorder);
 	}
@@ -524,8 +536,10 @@ if ($resql) {
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	// Action column
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	print "</tr>\n";
 
 	$i = 0;
@@ -537,18 +551,41 @@ if ($resql) {
 
 		// USER REQUEST UPDATE FOR THIS LINE
 		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-			//  var_dump($obj);
-			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="center">';
+				print '</td>';
+			}
+			print '<td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
 			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-			print ' <td><input type="text" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
-
-			print '<td class="center nowrap ">';
+			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+			print '<button type="submit" class="button small reposition" name="action" value="update">'.$langs->trans("Modify").'</button>';
+			print '<button type="submit" class="button small reposition" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
 			print '</td>';
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="center">';
+				print '</td>';
+			}
 		} else {
+			// Action
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<a class="editfielda marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+					print '<a class="marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
 			// date_sync
 			if (!empty($arrayfields['cr.date_sync']['checked'])) {
 				print '<td class="tdoverflowmax200">';
@@ -598,19 +635,21 @@ if ($resql) {
 			print $hookmanager->resPrint;
 
 			// Action
-			print '<td class="nowrap" align="center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+					print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
-				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
 			}
 
 			print "</tr>\n";
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 4fd68649ef6..45eb9252d18 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -21,7 +21,7 @@
  *  \file       htdocs/opensurvey/class/opensurveysondage.class.php
  *  \ingroup    opensurvey
  *  \brief      This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *				Initialy built by build_class_from_table on 2013-03-10 00:32
+ *				Initially built by build_class_from_table on 2013-03-10 00:32
  */
 
 // Put here all includes required by your class file
@@ -83,7 +83,7 @@ class Opensurveysondage extends CommonObject
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -168,7 +168,7 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -476,7 +476,7 @@ class Opensurveysondage extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param	int  	$notooltip					1=Disable tooltip
diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
index 308d92b51f5..820a4b39add 100644
--- a/htdocs/opensurvey/css/style.css
+++ b/htdocs/opensurvey/css/style.css
@@ -281,7 +281,7 @@ div.jourschoisis {
 	font-size:12px;
 	width:100%;
 }
-/*presenation des pages*/
+/*presentation des pages*/
 div.bodydate {
 	padding:10px;
 	font-family:arial, sans-serif;
diff --git a/htdocs/opensurvey/lib/opensurvey.lib.php b/htdocs/opensurvey/lib/opensurvey.lib.php
index 123e7f0d54a..c2509c334ec 100644
--- a/htdocs/opensurvey/lib/opensurvey.lib.php
+++ b/htdocs/opensurvey/lib/opensurvey.lib.php
@@ -17,7 +17,7 @@
 */
 
 /**
- *	\file       htdocs/opensurvey/fonctions.php
+ *	\file       htdocs/opensurvey/lib/opensurvey.lib.php
  *	\ingroup    opensurvey
  *	\brief      Functions for module
  */
@@ -73,12 +73,12 @@ function opensurvey_prepare_head(Opensurveysondage $object)
  * @param	string		$numsondage			Num survey
  * @return	void
  */
-function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $numsondage = '')
+function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [], $numsondage = '')
 {
 	global $conf, $langs, $mysoc;
 	global $dolibarr_main_url_root;
 
-	//$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+	// $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
 
@@ -95,7 +95,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	// Define logo and logosmall
 	$logosmall = $mysoc->logo_small;
 	$logo = $mysoc->logo;
-	//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+	// print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 	// Define urllogo
 	$urllogo = '';
 	$urllogofull = '';
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 46d41906627..be6d3169cd3 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -344,7 +344,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 
 		//parcours de tous les sujets actuels
 		while (isset($toutsujet[$j])) {
-			//si le sujet n'est pas celui qui a été effacé alors on concatene
+			// If the subject is not the deleted subject, then concatenate the current subject
 			if ($i != $j) {
 				if (!empty($nouveauxsujets)) {
 					$nouveauxsujets .= ',';
@@ -384,7 +384,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 			// parcours de toutes les réponses actuelles
 			for ($j = 0; $j < $nbcolonnes; $j++) {
 				$car = substr($ensemblereponses, $j, 1);
-				//si les reponses ne concerne pas la colonne effacée, on concatene
+				//si les reponses ne concerne pas la colonne effacée, on concatenate
 				if ($i != $j) {
 					$newcar .= $car;
 				}
@@ -906,7 +906,7 @@ while ($compteur < $num) {
 			}
 		}
 	} else {
-		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
+		// Else, replace the user's choices with a line of checkboxes to retrieve new values
 		if ($compteur == $ligneamodifier) {
 			for ($i = 0; $i < $nbcolonnes; $i++) {
 				$car = substr($ensemblereponses, $i, 1);
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 9abccc721d4..8422b1dfedc 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -153,7 +153,7 @@ print '</tr></table>'."\n";
 print '</form>'."\n";
 
 
-print '<a name=bas></a>'."\n";
+print '<a name="bas"></a>'."\n";
 print '<br><br><br>'."\n";
 print '</div>'."\n";
 
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index dafd2b46a9a..c37b2c8deea 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -76,8 +76,8 @@ if (GETPOST('confirmation')) {
 						$debutcreneau = explode(":", $creneaux[1]);
 						$fincreneau = explode(":", $creneaux[2]);
 
-						//comparaison des heures de fin et de debut
-						//si correctes, on entre les données dans la variables de session
+						// Compare hours for start and end
+						// If correct, add the data in the session variables
 						if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
 							$_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
 						} else { //sinon message d'erreur et nettoyage de la case
@@ -89,8 +89,8 @@ if (GETPOST('confirmation')) {
 						$debutcreneau = preg_split("/h/i", $creneaux[1]);
 						$fincreneau = preg_split("/h/i", $creneaux[2]);
 
-						//comparaison des heures de fin et de debut
-						//si correctes, on entre les données dans la variables de session
+						// Compare hours for start and end
+						// If correct, add the data in the session variables
 						if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
 							$_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
 						} else { //sinon message d'erreur et nettoyage de la case
@@ -155,7 +155,7 @@ if (GETPOST('confirmation')) {
 							$choixdate .= ",";
 							$choixdate .= $_SESSION["totalchoixjour"][$i];
 							$choixdate .= "@";
-							// On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite
+							// Replace the comma and the '@' token to avoid issues
 							$choixdate .= str_replace(array(',', '@'), array('&#44;', '&#64;'), $_SESSION["horaires$i"][$j]);
 						}
 					}
@@ -536,11 +536,11 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) {
 
 	for ($i = 0; $i < $_SESSION["nbrecaseshoraires"]; $i++) {
 		$j = $i + 1;
-		print '<td classe="somme"><div class="center">'.$langs->trans("Time").' '.$j.'</div></td>'."\n";
+		print '<td class="somme"><div class="center">'.$langs->trans("Time").' '.$j.'</div></td>'."\n";
 	}
 
 	if ($_SESSION["nbrecaseshoraires"] < 10) {
-		print '<td classe="somme"><input type="image" name="ajoutcases" src="../img/add-16.png"></td>'."\n";
+		print '<td class="somme"><input type="image" name="ajoutcases" src="../img/add-16.png"></td>'."\n";
 	}
 
 	print '</tr>'."\n";
@@ -555,11 +555,11 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) {
 
 		//affichage des cases d'horaires
 		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-			//si on voit une erreur, le fond de la case est rouge
 			if (isset($errheure[$i][$j]) && $errheure[$i][$j]) {
+				// When an error is found, the checkbox background is red
 				print '<td><input type=text size="10" maxlength="11" name=horaires'.$i.'[] value="'.$_SESSION["horaires$i"][$j].'" style="background-color:#FF6666;"></td>'."\n";
 			} else {
-				//sinon la case est vide normalement
+				// Else the color is empty (in principle)
 				print '<td><input type=text size="10" maxlength="11" name=horaires'.$i.'[] value="'.$_SESSION["horaires$i"][$j].'"></td>'."\n";
 			}
 		}
@@ -581,7 +581,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) {
 
 print '</tr>'."\n";
 print '</table>'."\n";
-print '<a name=bas></a>'."\n";
+print '<a name="bas"></a>'."\n";
 //fin du formulaire et bandeau de pied
 print '</form>'."\n";
 //bandeau de pied
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index a32a8541883..61f5a1ef7d5 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -198,7 +198,7 @@ if (GETPOST('choix_sondage')) {
 	print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
 	print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
 } else {
-	// Show image to selecte between date survey or other survey
+	// Show image to select between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
 	print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="../img/calendar-32.png"></td></tr>'."\n";
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 81c88ff72f7..7639b936e3e 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -111,7 +111,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setting">';
 print '<input type="hidden" name="page_y" value="">';
 
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -154,7 +154,7 @@ print load_fiche_titre($langs->trans("ReferingWebsiteCheck"), '', '');
 print '<span class="opacitymedium">'.$langs->trans("ReferingWebsiteCheckDesc").'</span><br>';
 print '<br>';
 
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
diff --git a/htdocs/partnership/class/api_partnerships.class.php b/htdocs/partnership/class/api_partnerships.class.php
index 445d5650094..4ac8c70dba3 100644
--- a/htdocs/partnership/class/api_partnerships.class.php
+++ b/htdocs/partnership/class/api_partnerships.class.php
@@ -56,7 +56,7 @@ class Partnerships extends DolibarrApi
 	/**
 	 * Get properties of a partnership object
 	 *
-	 * Return an array with partnership informations
+	 * Return an array with partnership information
 	 *
 	 * @param	int		$id				ID of partnership
 	 * @return  Object					Object with cleaned properties
@@ -95,7 +95,7 @@ class Partnerships extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -199,7 +199,7 @@ class Partnerships extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->partnership->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -247,7 +247,7 @@ class Partnerships extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->partnership->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 4496eb0d7dc..2e8210b6e96 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -86,7 +86,7 @@ class Partnership extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -157,7 +157,7 @@ class Partnership extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -198,10 +198,10 @@ class Partnership extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
 			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
@@ -342,7 +342,7 @@ class Partnership extends CommonObject
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
 		} else {
-			$sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Dont't use entity if you use rowid
+			$sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Don't use entity if you use rowid
 		}
 
 		if ($ref) {
@@ -503,10 +503,10 @@ class Partnership extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
 			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
@@ -522,11 +522,11 @@ class Partnership extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -537,10 +537,10 @@ class Partnership extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -568,7 +568,7 @@ class Partnership extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -700,7 +700,7 @@ class Partnership extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_APPROVED) {
-			dol_syslog(get_class($this)."::accept action abandonned: already acceptd", LOG_WARNING);
+			dol_syslog(get_class($this)."::accept action abandoned: already acceptd", LOG_WARNING);
 			return 0;
 		}
 
@@ -940,7 +940,7 @@ class Partnership extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1235,7 +1235,7 @@ class Partnership extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1355,7 +1355,7 @@ class PartnershipLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index aba40325cfd..a627915ad84 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -81,7 +81,7 @@ class PartnershipType extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -125,10 +125,10 @@ class PartnershipType extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 		return $resultcreate;
@@ -231,10 +231,10 @@ class PartnershipType extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -242,17 +242,17 @@ class PartnershipType extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User $user       	User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 3876b5e6bdd..8248860f83b 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -47,7 +47,7 @@ class PartnershipUtils
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -321,7 +321,7 @@ class PartnershipUtils
 		}
 		$sql .= " WHERE p.".$fk_partner." > 0";
 		$sql .= " AND p.status = ".((int) $partnership::STATUS_APPROVED); // Only accepted and not yet canceled
-		$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 24 * 3600)."')"; // Never more than 1 check every day to check that website contains a referal link.
+		$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 24 * 3600)."')"; // Never more than 1 check every day to check that website contains a referral link.
 		$sql .= $this->db->order('p.rowid', 'ASC');
 		// Limit is managed into loop later
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 2072c9182c9..1185e3e4bee 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -56,7 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index a2e612a88c5..cbd2c7aee69 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -103,7 +103,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -724,7 +724,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 103c46171b0..0faef11468e 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -90,19 +90,19 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 	$conf->global->PAYBOX_HASH = 'sha512';
 
-	// Definition des parametres vente produit pour paybox
+	// Definition des parameters vente produit pour paybox
 	$IBS_CMD = $TAG;
 	$IBS_TOTAL = $PRICE * 100; // En centimes
 	$IBS_MODE = 1; // Mode formulaire
 	$IBS_PORTEUR = $EMAIL;
-	$IBS_RETOUR = "montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox)
+	$IBS_RETOUR = "montant:M;ref:R;auto:A;trans:T"; // Format of the validation GET parameter in reply (url to define for paybox)
 	$IBS_TXT = ' '; // Use a space
 	$IBS_EFFECTUE = $urlok;
 	$IBS_ANNULE = $urlko;
 	$IBS_REFUSE = $urlko;
 	$IBS_BKGD = "#FFFFFF";
 	$IBS_WAIT = "2000";
-	$IBS_LANG = "GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
+	$IBS_LANG = "GBR"; // By default GBR=English (FRA, GBR, ESP, ITA et DEU...)
 	if (preg_match('/^FR/i', $langs->defaultlang)) {
 		$IBS_LANG = "FRA";
 	}
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index a7d5862fae2..cd9bda1e9f3 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -286,8 +286,8 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 
 	//'---------------------------------------------------------------------------------------------------------------
 	//' Make the API call to PayPal
-	//' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
-	//' If an error occured, show the resulting errors
+	//' If the API call succeeded, then redirect the buyer to PayPal to begin to authorize payment.
+	//' If an error occurred, show the resulting errors
 	//'---------------------------------------------------------------------------------------------------------------
 	$resArray = hash_call("SetExpressCheckout", $nvpstr);
 	$ack = strtoupper($resArray["ACK"]);
@@ -310,7 +310,7 @@ function getDetails($token)
 	//'--------------------------------------------------------------
 	//' At this point, the buyer has completed authorizing the payment
 	//' at PayPal.  The function will call PayPal to obtain the details
-	//' of the authorization, incuding any shipping information of the
+	//' of the authorization, including any shipping information of the
 	//' buyer.  Remember, the authorization is not a completed transaction
 	//' at this state - the buyer still needs an additional step to finalize
 	//' the transaction
@@ -376,7 +376,7 @@ function confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipad
 	$nvpstr .= '&INVNUM='.urlencode($tag);
 
 	/* Make the call to PayPal to finalize payment
-	 If an error occured, show the resulting errors
+	 If an error occurred, show the resulting errors
 	 */
 	$resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
 
@@ -446,7 +446,7 @@ function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCar
  *
  * @param	string	$methodName 	is name of API  method.
  * @param	string	$nvpStr 		is nvp string.
- * @return	array					returns an associtive array containing the response from the server.
+ * @return	array					returns an associative array containing the response from the server.
  */
 function hash_call($methodName, $nvpStr)
 {
@@ -568,26 +568,26 @@ function hash_call($methodName, $nvpStr)
 
 /**
  * This function will take NVPString and convert it to an Associative Array and it will decode the response.
- * It is usefull to search for a particular key and displaying arrays.
+ * It is useful to search for a particular key and displaying arrays.
  *
  * @param	string	$nvpstr 		NVPString
  * @return	array					nvpArray = Associative Array
  */
 function deformatNVP($nvpstr)
 {
-	$intial = 0;
+	$initial = 0;
 	$nvpArray = array();
 
 	while (strlen($nvpstr)) {
-		//postion of Key
+		//position of Key
 		$keypos = strpos($nvpstr, '=');
 		//position of value
 		$valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
 		/*getting the Key and Value values and storing in a Associative Array*/
-		$keyval = substr($nvpstr, $intial, $keypos);
+		$keyval = substr($nvpstr, $initial, $keypos);
 		$valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-		//decoding the respose
+		//decoding the response
 		$nvpArray[urldecode($keyval)] = urldecode($valval);
 		$nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
 	}
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 22e4294eead..9d64eb4c525 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -240,7 +240,7 @@ if ($action == 'set') {
 	}
 }
 
-// To enable a constant whithout javascript
+// To enable a constant without javascript
 if (preg_match('/set_(.+)/', $action, $reg)) {
 	$keyforvar = $reg[1];
 	if ($keyforvar) {
@@ -249,7 +249,7 @@ if (preg_match('/set_(.+)/', $action, $reg)) {
 	}
 }
 
-// To disable a constant whithout javascript
+// To disable a constant without javascript
 if (preg_match('/del_(.+)/', $action, $reg)) {
 	$keyforvar = $reg[1];
 	if ($keyforvar) {
@@ -460,7 +460,7 @@ foreach ($dirmodels as $reldir) {
 									print "</td>";
 								}
 
-								// Defaut
+								// Default
 								print '<td class="center">';
 								if (getDolGlobalString('PRODUCT_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
@@ -690,7 +690,7 @@ print $form->selectarray(
 print '</td>';
 print '</tr>';
 
-// Visualiser description produit dans les formulaires activation/desactivation
+// Visualiser description produit dans les formulaires activation/deactivation
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
 print '<td class="right">';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index f4fea4ce380..5ea00762dc7 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -176,7 +176,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans("Batch"), -1, 'lot');
 
 
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
-	// The feature to define the numbering module of lot or serial is no enabled bcause it is not used anywhere in Dolibarr code: You can set it
+	// The feature to define the numbering module of lot or serial is no enabled because it is not used anywhere in Dolibarr code: You can set it
 	// but the numbering module is not used.
 	// TODO Use it on lot creation page, when you create a lot and when the lot number is kept empty to define the lot according
 	// to the selected product.
@@ -473,7 +473,7 @@ foreach ($dirmodels as $reldir) {
 									print "</td>";
 								}
 
-								// Defaut
+								// Default
 								print '<td class="center">';
 								if (getDolGlobalString('PRODUCT_BATCH_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
diff --git a/htdocs/product/admin/stock_mouvement_extrafields.php b/htdocs/product/admin/stock_mouvement_extrafields.php
index b4c3542331d..82fe4de72b9 100644
--- a/htdocs/product/admin/stock_mouvement_extrafields.php
+++ b/htdocs/product/admin/stock_mouvement_extrafields.php
@@ -23,7 +23,7 @@
 /**
  *      \file       htdocs/product/admin/stock_mouvement_extrafields.php
  *		\ingroup    stock
- *		\brief      Page to setup extra fields of stock mouvement
+ *		\brief      Page to setup extra fields of stock movement
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 31ea346c566..fb0364c06e4 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -174,11 +174,11 @@ if ($action == 'fetch' && !empty($id)) {
 				$objp = $db->fetch_object($result);
 				if ($objp) {
 					$found = true;
-					$outprice_ht = price($objp->price);			// formated for langage user because is inserted into input field
-					$outprice_ttc = price($objp->price_ttc);	// formated for langage user because is inserted into input field
+					$outprice_ht = price($objp->price);			// formatted for language user because is inserted into input field
+					$outprice_ttc = price($objp->price_ttc);	// formatted for language user because is inserted into input field
 					$outpricebasetype = $objp->price_base_type;
 					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
-						$outtva_tx_formated = price($objp->tva_tx);	// formated for langage user because is inserted into input field
+						$outtva_tx_formated = price($objp->tva_tx);	// formatted for language user because is inserted into input field
 						$outtva_tx = price2num($objp->tva_tx);		// international numeric
 						$outdefault_vat_code = $objp->default_vat_code;
 					} else {
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 6c89c208129..fe7285c8907 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -53,7 +53,7 @@ class ActionsCardProduct
 	//! Template container
 	public $tpl = array();
 
-	// List of fiels for action=list
+	// List of fields for action=list
 	public $field_list = array();
 
 	/**
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index ed5dfb52eab..a95a599dd1f 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -54,7 +54,7 @@ class ActionsCardService
 	//! Template container
 	public $tpl = array();
 
-	// List of fiels for action=list
+	// List of fields for action=list
 	public $field_list = array();
 
 	public $id;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 9121960301d..a3c487bff35 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -159,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 		$upload_dir = $conf->service->multidir_output[$entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 	}
 
-	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatiblity, we scan also old dirs
+	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatibility, we scan also old dirs
 		if (isModEnabled("product")) {
 			$upload_dirold = $conf->product->multidir_output[$entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
 		} else {
@@ -533,7 +533,7 @@ if (empty($reshook)) {
 			$localtax2 = 0;
 			$localtax1_type = '0';
 			$localtax2_type = '0';
-			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 			$reg = array();
 			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
@@ -1094,7 +1094,7 @@ if (empty($reshook)) {
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 			// On reevalue prix selon taux tva car taux tva transaction peut etre different
-			// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+			// de ceux du produit par default (par example si pays different entre vendeur et acheteur).
 			if ($tmpvat != $tmpprodvat) {
 				if ($price_base_type != 'HT') {
 					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
@@ -1952,7 +1952,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</select>';
 				print '</td></tr>';
 
-				// Batch number managment
+				// Batch number management
 				if (isModEnabled('productbatch')) {
 					if ($object->isProduct() || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 						print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 29b3c251cdb..7ff9f8403d4 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -173,7 +173,7 @@ class Products extends DolibarrApi
 	 * @param  int    $variant_filter		Use this param to filter list (0 = all, 1=products without variants, 2=parent of variants, 3=variants only)
 	 * @param  bool   $pagination_data		If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0
 	 * @param  int    $includestockdata		Load also information about stock (slower)
-	 * @param string  $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string  $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array						Array of product objects
 	 */
 	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0, $pagination_data = false, $includestockdata = 0, $properties = '')
@@ -314,7 +314,7 @@ class Products extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->product->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -366,7 +366,7 @@ class Products extends DolibarrApi
 				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->product->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -499,15 +499,15 @@ class Products extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$childsArbo = $this->product->getChildsArbo($id, 1);
+		$childrenArbo = $this->product->getChildsArbo($id, 1);
 
 		$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec', 'ref', 'fk_association', 'rang');
-		$childs = array();
-		foreach ($childsArbo as $values) {
-			$childs[] = array_combine($keys, $values);
+		$children = array();
+		foreach ($childrenArbo as $values) {
+			$children[] = array_combine($keys, $values);
 		}
 
-		return $childs;
+		return $children;
 	}
 
 	/**
@@ -743,7 +743,7 @@ class Products extends DolibarrApi
 	 * @param	int			$availability					Product availability
 	 * @param	string		$ref_fourn						Supplier ref
 	 * @param	float		$tva_tx							New VAT Rate (For example 8.5. Should not be a string)
-	 * @param	string		$charges						costs affering to product
+	 * @param	string|float $charges						costs affering to product
 	 * @param	float		$remise_percent					Discount  regarding qty (percent)
 	 * @param	float		$remise							Discount  regarding qty (amount)
 	 * @param	int			$newnpr							Set NPR or not
@@ -1014,7 +1014,7 @@ class Products extends DolibarrApi
 	 * @param  int    $limit      Limit for list
 	 * @param  int    $page       Page number
 	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:color)"
-	 * @param string  $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string  $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array
 	 *
 	 * @throws RestException 401
@@ -1282,7 +1282,7 @@ class Products extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$prodattr->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -1595,7 +1595,7 @@ class Products extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$objectval->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -1862,7 +1862,7 @@ class Products extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$prodcomb->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -1905,7 +1905,7 @@ class Products extends DolibarrApi
 
 	/**
 	 * Get stock data for the product id given.
-	 * Optionaly with $selected_warehouse_id parameter user can get stock of specific warehouse
+	 * Optionally with $selected_warehouse_id parameter user can get stock of specific warehouse
 	 *
 	 * @param  int $id ID of Product
 	 * @param  int $selected_warehouse_id ID of warehouse
@@ -1999,7 +1999,7 @@ class Products extends DolibarrApi
 		unset($object->fk_bank);
 		unset($object->fk_account);
 
-		unset($object->supplierprices);	// Mut use another API to get them
+		unset($object->supplierprices);	// Must use another API to get them
 
 		if (empty(DolibarrApiAccess::$user->rights->stock->lire)) {
 			unset($object->stock_reel);
@@ -2084,15 +2084,15 @@ class Products extends DolibarrApi
 		}
 
 		if ($includesubproducts) {
-			$childsArbo = $this->product->getChildsArbo($id, 1);
+			$childrenArbo = $this->product->getChildsArbo($id, 1);
 
 			$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec', 'ref', 'fk_association', 'rang');
-			$childs = array();
-			foreach ($childsArbo as $values) {
-				$childs[] = array_combine($keys, $values);
+			$children = array();
+			foreach ($childrenArbo as $values) {
+				$children[] = array_combine($keys, $values);
 			}
 
-			$this->product->sousprods = $childs;
+			$this->product->sousprods = $children;
 		}
 
 		if ($includeparentid) {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 44eb2313ece..cbf0c406139 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -18,7 +18,7 @@
 
 /**
  *	\file       htdocs/product/class/html.formproduct.class.php
- *	\brief      Fichier de la classe des fonctions predefinie de composants html
+ *	\brief      File for class with methods for building product related HTML components
  */
 
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -524,7 +524,7 @@ class FormProduct
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output a combo box with list of units
-	 *  pour l'instant on ne definit pas les unites dans la base
+	 *  Currently the units are not define in the DB
 	 *
 	 *  @param	string		$name               Name of HTML field
 	 *  @param	string		$measuring_style    Unit to show: weight, size, surface, volume, time
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 32f7987c610..5a7ae18ee1d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -273,7 +273,7 @@ class Product extends CommonObject
 	 */
 	public $duration_value;
 	/**
-	 * Serivce expiration unit
+	 * Service expiration unit
 	 */
 	public $duration_unit;
 	/**
@@ -543,7 +543,7 @@ class Product extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -795,7 +795,7 @@ class Product extends CommonObject
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
 				if ($obj->nb == 0) {
-					// Produit non deja existant
+					// Insert new product, no previous one found
 					$sql = "INSERT INTO ".$this->db->prefix()."product (";
 					$sql .= "datec";
 					$sql .= ", entity";
@@ -1045,7 +1045,7 @@ class Product extends CommonObject
 	 * @param  boolean $updatetype  Update product type
 	 * @return int                  1 if OK, -1 if ref already exists, -2 if other error
 	 */
-	public function update($id, $user, $notrigger = false, $action = 'update', $updatetype = false)
+	public function update($id, $user, $notrigger = 0, $action = 'update', $updatetype = false)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -1340,7 +1340,7 @@ class Product extends CommonObject
 				}
 
 				if (!$this->hasbatch() && $this->oldcopy->hasbatch()) {
-					// Selection of all product stock mouvements that contains batchs
+					// Selection of all product stock movements that contains batchs
 					$sql = 'SELECT pb.qty, pb.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
 					$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
 					$sql.= ' WHERE ps.fk_product = '.(int) $this->id;
@@ -2088,7 +2088,24 @@ class Product extends CommonObject
 	public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
 	{
 		// phpcs:enable
-		global $conf;
+		global $action, $hookmanager;
+
+		// Call hook if any
+		if (is_object($hookmanager)) {
+			$parameters = array(
+				'prodfournprice' => $prodfournprice,
+				'qty' => $qty,
+				'product_id' => $product_id,
+				'fourn_ref' => $fourn_ref,
+				'fk_soc' => $fk_soc,
+			);
+			// Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('getBuyPrice', $parameters, $this, $action);
+			if ($reshook > 0) {
+				return $hookmanager->resArray;
+			}
+		}
+
 		$result = 0;
 
 		// We do a first search with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
@@ -3184,8 +3201,8 @@ class Product extends CommonObject
 				}
 			}
 
-			// If stock decrease is on invoice validation, the theorical stock continue to
-			// count the orders to ship in theorical stock when some are already removed by invoice validation.
+			// If stock decrease is on invoice validation, the theoretical stock continue to
+			// count the orders to ship in theoretical stock when some are already removed by invoice validation.
 			if ($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 				if (getDolGlobalString('DECREASE_ONLY_UNINVOICEDPRODUCTS')) {
 					// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation but only if order not yet invoice.
@@ -3831,7 +3848,7 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Return an array formated for showing graphs
+	 *  Return an array formatted for showing graphs
 	 *
 	 * @param  string $sql  		Request to execute
 	 * @param  string $mode 		'byunit'=number of unit, 'bynumber'=nb of entities
@@ -4906,7 +4923,7 @@ class Product extends CommonObject
 					'entity'=>$tmpproduct->entity
 				);
 
-				// Recursive call if there is childs to child
+				// Recursive call if there child has children of its own
 				if (isset($desc_pere['childs']) && is_array($desc_pere['childs'])) {
 					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
 					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id, $ignore_stock_load);
@@ -5062,9 +5079,9 @@ class Product extends CommonObject
 
 
 	/**
-	 *  Return childs of product $id
+	 *  Return children of product $id
 	 *
-	 * @param  int $id             		Id of product to search childs of
+	 * @param  int $id             		Id of product to search children of
 	 * @param  int $firstlevelonly 		Return only direct child
 	 * @param  int $level          		Level of recursing call (start to 1)
 	 * @param  array $parents   	    Array of all parents of $id
@@ -5091,7 +5108,7 @@ class Product extends CommonObject
 		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
 
 		if ($level == 1) {
-			$alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
+			$alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
 		}
 		// Protection against infinite loop
 		if ($level > 30) {
@@ -5152,7 +5169,7 @@ class Product extends CommonObject
 		foreach ($this->getChildsArbo($this->id) as $keyChild => $valueChild) {    // Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
 			$parent[$this->label][$keyChild] = $valueChild;
 		}
-		foreach ($parent as $key => $value) {        // key=label, value is array of childs
+		foreach ($parent as $key => $value) {        // key=label, value is array of children
 			$this->sousprods[$key] = $value;
 		}
 	}
@@ -5199,7 +5216,7 @@ class Product extends CommonObject
 			$datas['label']= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
 		}
 		if (!empty($this->description)) {
-			$datas['description']= '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineofText($this->description, 5);
+			$datas['description']= '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineOfText($this->description, 5);
 		}
 		if ($this->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			if (isModEnabled('productbatch')) {
@@ -5237,9 +5254,19 @@ class Product extends CommonObject
 				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
 			}
 			if ($labelsurfacevolume) {
-				$datas['surface']= "<br>" . $labelsurfacevolume;
+				$datas['surface'] = "<br>" . $labelsurfacevolume;
 			}
 		}
+		if ($this->type == Product::TYPE_SERVICE && !empty($this->duration_value)) {
+			// Duration
+			$datas['duration'] = '<br><b>'.$langs->trans("Duration").':</b> '.$this->duration_value;
+			if ($this->duration_value > 1) {
+				$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+			} elseif ($this->duration_value > 0) {
+				$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			}
+			$datas['duration'] .= (!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? "&nbsp;".$langs->trans($dur[$this->duration_unit]) : '');
+		}
 		if (!empty($this->pmp) && $this->pmp) {
 			$datas['pmp'] = "<br><b>".$langs->trans("PMPValue").'</b>: '.price($this->pmp, 0, '', 1, -1, -1, $conf->currency);
 		}
@@ -5553,7 +5580,7 @@ class Product extends CommonObject
 	 * @param  string $inventorycode  Inventory code
 	 * @param  string $origin_element Origin element type
 	 * @param  int    $origin_id      Origin id of element
-	 * @param  int	  $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 * @param  int	  $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
 	 * @param  Extrafields $extrafields	  Array of extrafields
 	 * @return int                    Return integer <0 if KO, >0 if OK
 	 */
@@ -5615,7 +5642,7 @@ class Product extends CommonObject
 	 * @param  string   $inventorycode  Inventory code
 	 * @param  string   $origin_element Origin element type
 	 * @param  int      $origin_id      Origin id of element
-	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
 	 * @param  Extrafields $extrafields	Array of extrafields
 	 * @param  boolean  $force_update_batch   Force update batch
 	 * @return int                      Return integer <0 if KO, >0 if OK
@@ -5990,7 +6017,7 @@ class Product extends CommonObject
 	 * Return an array with all photos of product found on disk. There is no sorting criteria.
 	 *
 	 * @param  string $dir   	Directory to scan
-	 * @param  int    $nbmax 	Number maxium of photos (0=no maximum)
+	 * @param  int    $nbmax 	Number maximum of photos (0=no maximum)
 	 * @return array            Array of photos
 	 */
 	public function liste_photos($dir, $nbmax = 0)
@@ -6022,7 +6049,7 @@ class Product extends CommonObject
 
 					$dirthumb = $dir.'thumbs/';
 
-					// Objet
+					// Object
 					$obj = array();
 					$obj['photo'] = $photo;
 					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) {
@@ -6171,7 +6198,7 @@ class Product extends CommonObject
 	/**
 	 * Return if  object have a constraint on mandatory_period
 	 *
-	 * @return boolean     True if mandatory_period setted to 1
+	 * @return boolean     True if mandatory_period set to 1
 	 */
 	public function isMandatoryPeriod()
 	{
@@ -6307,7 +6334,7 @@ class Product extends CommonObject
 	/**
 	 * Return minimum product recommended price
 	 *
-	 * @return int            Minimum recommanded price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
+	 * @return int            Minimum recommended price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
 	 */
 	public function min_recommended_price()
 	{
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index c1f48884e84..254d0a8fe3c 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -73,7 +73,7 @@ class Productbatch extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -351,7 +351,7 @@ class Productbatch extends CommonObject
 	}
 
 	/**
-	 *  Clean fields (triming)
+	 *  Clean fields (trimming)
 	 *
 	 *  @return	void
 	 */
@@ -374,14 +374,14 @@ class Productbatch extends CommonObject
 	/**
 	 *  Find first detail record that match eather eat-by or sell-by or batch within given warehouse
 	 *
-	 *  @param	int			$fk_product_stock   id product_stock for objet
+	 *  @param	int			$fk_product_stock   id product_stock for object
 	 *  @param	integer		$eatby    			eat-by date for object - deprecated: a search must be done on batch number
 	 *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
 	 *  @param	string		$batch_number   	batch number for object
 	 *  @param	int			$fk_warehouse		filter on warehouse (use it if you don't have $fk_product_stock)
 	 *  @return int          					Return integer <0 if KO, >0 if OK
 	 */
-	public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '', $fk_warehouse = 0)
+	public function find($fk_product_stock = 0, $eatby = null, $sellby = null, $batch_number = '', $fk_warehouse = 0)
 	{
 		$where = array();
 		$sql = "SELECT";
@@ -443,7 +443,7 @@ class Productbatch extends CommonObject
 	 * Return all batch detail records for a given product and warehouse
 	 *
 	 * @param	DoliDB		$dbs    			database object
-	 * @param	int			$fk_product_stock	id product_stock for objet
+	 * @param	int			$fk_product_stock	id product_stock for object
 	 * @param	int			$with_qty    		1 = doesn't return line with 0 quantity
 	 * @param  	int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
 	 * @return 	array|int         				Return integer <0 if KO, array of batch
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index e5b124ce97e..8e44d4cc52e 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -105,7 +105,7 @@ class ProductCustomerPrice extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db handler
+	 * @param DoliDB $db handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 2c03c4187b4..c33df050da0 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -74,7 +74,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -169,7 +169,7 @@ class ProductFournisseurPrice extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -196,10 +196,10 @@ class ProductFournisseurPrice extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -399,10 +399,10 @@ class ProductFournisseurPrice extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -410,11 +410,11 @@ class ProductFournisseurPrice extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User $user       	User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
@@ -436,7 +436,7 @@ class ProductFournisseurPrice extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -596,7 +596,7 @@ class ProductFournisseurPrice extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -846,7 +846,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index ecb8202b522..bc6491955fc 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -57,7 +57,7 @@ class Propalmergepdfproduct extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index f70639a6a05..1e86a7bedce 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -321,7 +321,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$nbofsubsubproducts = count($prods_arbo); // This include sub sub product into nb
 		$prodschild = $object->getChildsArbo($id, 1);
-		$nbofsubproducts = count($prodschild); // This include only first level of childs
+		$nbofsubproducts = count($prodschild); // This include only first level of children
 
 
 		print '<div class="fichecenter">';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2e32646a8b9..b3e56a9f5ac 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -90,7 +90,7 @@ if ($id > 0 || !empty($ref)) {
 		$upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product');
 	}
 
-	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatiblity, we scan also old dirs
+	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatibility, we scan also old dirs
 		if (isModEnabled("product")) {
 			$upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
 		} else {
@@ -228,7 +228,7 @@ if ($object->id) {
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 
-	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatiblity, we scan also old dirs
+	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatibility, we scan also old dirs
 		$filearrayold = dol_dir_list($upload_dirold, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 		$filearray = array_merge($filearray, $filearrayold);
 	}
@@ -283,11 +283,11 @@ if ($object->id) {
 
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
-		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatiblity, we scan also old dirs
+		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatibility, we scan also old dirs
 			$filearray = array_merge($filearray, dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
 		}
 
-		// For each file build select list with PDF extention
+		// For each file build select list with PDF extension
 		if (count($filearray) > 0) {
 			print '<br>';
 			// Actual file to merge is :
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 59f9df6e4fe..5a0fa5243ff 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -25,7 +25,7 @@
 
 
 /**
- *	Class for accesing price expression table
+ *	Class for accessing price expression table
  */
 class PriceExpression
 {
@@ -67,7 +67,7 @@ class PriceExpression
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index d9d7a340551..e14075cfd48 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -25,7 +25,7 @@
 
 
 /**
- *	Class for accesing price global variables table
+ *	Class for accessing price global variables table
  */
 class PriceGlobalVariable
 {
@@ -66,7 +66,7 @@ class PriceGlobalVariable
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 5b7aee5d5f6..5097d8ac7ba 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -78,7 +78,7 @@ class PriceGlobalVariableUpdater
 	/**
 	 *  Constructor
 	 *
-	 *  @param  DoliDb      $db      Database handler
+	 *  @param  DoliDB      $db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index e53193481f2..138f5927836 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -65,7 +65,7 @@ class PriceParser
 		$langs->load("errors");
 		/*
 		-No arg
-		 9, an unexpected error occured
+		 9, an unexpected error occurred
 		14, division by zero
 		19, expression not found
 		20, empty expression
@@ -213,7 +213,7 @@ class PriceParser
 			return -6;
 		}
 
-		//Iterate over each expression splitted by $separator_chr
+		//Iterate over each expression split by $separator_chr
 		$expressions = explode($this->separator_chr, $expression);
 		$expressions = array_slice($expressions, 0, $this->limit);
 		foreach ($expressions as $expr) {
@@ -246,7 +246,7 @@ class PriceParser
 	 *	Calculates product price based on product id and associated expression
 	 *
 	 *	@param	Product				$product    	The Product object to get information
-	 *	@param	array 				$extra_values   Any aditional values for expression
+	 *	@param	array 				$extra_values   Any additional values for expression
 	 *	@return int 						> 0 if OK, < 1 if KO
 	 */
 	public function parseProduct($product, $extra_values = array())
@@ -293,7 +293,7 @@ class PriceParser
 	 *	Calculates supplier product price based on product supplier price and associated expression
 	 *
 	 *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
-	 *	@param	array 				$extra_values       Any aditional values for expression
+	 *	@param	array 				$extra_values       Any additional values for expression
 	 *  @return int 				> 0 if OK, < 1 if KO
 	 */
 	public function parseProductSupplier($product_supplier, $extra_values = array())
@@ -324,7 +324,7 @@ class PriceParser
 	 *
 	 *  @param  int					$product_id    	The Product id to get information
 	 *  @param  string 				$expression     The expression to parse
-	 *  @param  array 				$extra_values   Any aditional values for expression
+	 *  @param  array 				$extra_values   Any additional values for expression
 	 *  @return int 				> 0 if OK, < 1 if KO
 	 */
 	public function testExpression($product_id, $expression, $extra_values = array())
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index f32a9708868..714a44081b0 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -163,7 +163,7 @@ print '</td></tr>';
 
 // Title input
 print '<tr><td class="fieldrequired">'.$langs->trans("Name").'</td><td>';
-print '<input class="flat" name="expression_title" size="15" value="'.($price_expression->title ? $price_expression->title : '').'">';
+print '<input class="flat" name="expression_title" size="15" value="'.(GETPOSTISSET('expression_title') ? GETPOST('expression_title') : ($price_expression->title ? $price_expression->title : '')).'">';
 print '</td></tr>';
 
 //Help text
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index fb2081cb563..aba181da8f9 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -807,7 +807,7 @@ if ($id > 0 || $ref) {
 					print '<td>'.$langs->trans('GencodBuyPrice').'</td>';
 					print '<td>';
 					print img_picto('', 'barcode', 'class="pictofixedwidth"');
-					print $formbarcode->selectBarcodeType((GETPOSTISSET('fk_barcode_type') ? GETPOST('fk_barcode_type', 'int') : ($rowid ? $object->supplier_fk_barcode_type : getDolGlobalint("PRODUIT_DEFAULT_BARCODE_TYPE"))), 'fk_barcode_type', 1);
+					print $formbarcode->selectBarcodeType((GETPOSTISSET('fk_barcode_type') ? GETPOST('fk_barcode_type', 'int') : ($rowid ? $object->supplier_fk_barcode_type : getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE"))), 'fk_barcode_type', 1);
 					print ' <input class="flat" name="barcode"  value="'.(GETPOSTISSET('barcode') ? GETPOST('barcode') : ($rowid ? $object->supplier_barcode : '')).'"></td>';
 					print '</tr>';
 				}
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 4ad3d19544f..f26c28b840d 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -418,7 +418,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 
 // TODO Move this into a page that should be available into menu "accountancy - report - turnover - per quarter"
 // Also method used for counting must provide the 2 possible methods like done by all other reports into menu "accountancy - report - turnover":
-// "commitment engagment" method and "cash accounting" method
+// "commitment engagement" method and "cash accounting" method
 if (isModEnabled("invoice") && $user->hasRight('facture', 'lire') && getDolGlobalString('MAIN_SHOW_PRODUCT_ACTIVITY_TRIM')) {
 	if (isModEnabled("product")) {
 		activitytrim(0);
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index e7b152556bd..b0f66bf3e59 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -62,7 +62,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 29c1ffb9024..039723e2dc2 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -78,7 +78,7 @@ class Inventory extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200', 'minwidth300 maxwidth500 widthcentpercentminusx'
@@ -222,7 +222,7 @@ class Inventory extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -243,10 +243,10 @@ class Inventory extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$result = $this->createCommon($user, $notrigger);
 
@@ -257,11 +257,11 @@ class Inventory extends CommonObject
 	 * Validate inventory (start it)
 	 *
 	 * @param  	User 	$user      				User that creates
-	 * @param	bool 	$notrigger 				false=launch triggers after, true=disable triggers
+	 * @param	int 	$notrigger 				0=launch triggers after, 1=disable triggers
 	 * @param	int		$include_sub_warehouse	Include sub warehouses
 	 * @return 	int             				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function validate(User $user, $notrigger = false, $include_sub_warehouse = 0)
+	public function validate(User $user, $notrigger = 0, $include_sub_warehouse = 0)
 	{
 		global $conf;
 		$this->db->begin();
@@ -371,10 +371,10 @@ class Inventory extends CommonObject
 	 * Go back to draft
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function setDraft(User $user, $notrigger = false)
+	public function setDraft(User $user, $notrigger = 0)
 	{
 		$this->db->begin();
 
@@ -401,10 +401,10 @@ class Inventory extends CommonObject
 	 * Set to inventory to status "Closed". It means all stock movements were recorded.
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function setRecorded(User $user, $notrigger = false)
+	public function setRecorded(User $user, $notrigger = 0)
 	{
 		$this->db->begin();
 
@@ -423,10 +423,10 @@ class Inventory extends CommonObject
 	 * Set to Canceled
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function setCanceled(User $user, $notrigger = false)
+	public function setCanceled(User $user, $notrigger = 0)
 	{
 		$this->db->begin();
 
@@ -524,10 +524,10 @@ class Inventory extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -535,11 +535,11 @@ class Inventory extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
@@ -549,10 +549,10 @@ class Inventory extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -563,7 +563,7 @@ class Inventory extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to
@@ -703,7 +703,7 @@ class Inventory extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
@@ -810,7 +810,7 @@ class InventoryLine extends CommonObjectLine
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -834,7 +834,7 @@ class InventoryLine extends CommonObjectLine
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
 		'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
-		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
+		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty added or removed (filled once movements are validated)'),
 		'pmp_real'      => array('type'=>'double', 'label'=>'PMPReal', 'visible'=>1, 'enabled'=>1, 'position'=>35),
 		'pmp_expected'  => array('type'=>'double', 'label'=>'PMPExpected', 'visible'=>1, 'enabled'=>1, 'position'=>36),
 	);
@@ -860,11 +860,11 @@ class InventoryLine extends CommonObjectLine
 	/**
 	 * Create object in database
 	 *
-	 * @param User $user       User that creates
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that creates
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -887,10 +887,10 @@ class InventoryLine extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -898,11 +898,11 @@ class InventoryLine extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 99e01a02e48..d9cd71a4d29 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -18,7 +18,7 @@
 /**
  *   	\file       htdocs/product/inventory/inventory.php
  *		\ingroup    inventory
- *		\brief      Tabe to enter counting
+ *		\brief      Tab to enter counting
  */
 
 // Load Dolibarr environment
@@ -75,7 +75,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 2ff1de2a40f..3acbf368d5f 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -80,7 +80,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -509,7 +509,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index af66192f41a..cd8137b4609 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -69,7 +69,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-// Search Criterias
+// Search Criteria
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_id = GETPOST("search_id", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
@@ -204,7 +204,7 @@ if (isModEnabled('barcode')) {
 	$fieldstosearchall['p.barcode'] = 'Gencod';
 	$fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
 }
-// Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel;p.description=Description;p.note=Note;'
+// Personalized search criteria. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel;p.description=Description;p.note=Note;'
 if (getDolGlobalString('PRODUCT_QUICKSEARCH_ON_FIELDS')) {
 	$fieldstosearchall = dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
 }
@@ -1678,7 +1678,7 @@ while ($i < $imaxinloop) {
 			print '<td class="left">';
 			// Since description can be very large (several pages of HTML-
 			// code) we limit to the first two rows
-			print dolGetFirstLineofText($product_static->description, 2);
+			print dolGetFirstLineOfText($product_static->description, 2);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 2d5c8468fc3..31fa5a58963 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -138,7 +138,7 @@ if (empty($reshook)) {
 		$localtax2 = 0;
 		$localtax1_type = '0';
 		$localtax2_type = '0';
-		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 			// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
@@ -397,7 +397,7 @@ if (empty($reshook)) {
 			$localtax2 = 0;
 			$localtax1_type = '0';
 			$localtax2_type = '0';
-			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 				// We look into database using code
 				$vatratecode = $reg[1];
@@ -654,7 +654,7 @@ if (empty($reshook)) {
 		$localtax2 = 0;
 		$localtax1_type = '0';
 		$localtax2_type = '0';
-		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 			// We look into database using code
 			$vatratecode = $reg[1];
@@ -777,7 +777,7 @@ if (empty($reshook)) {
 		$localtax2 = 0;
 		$localtax1_type = '0';
 		$localtax2_type = '0';
-		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 			// We look into database using code
 			$vatratecode = $reg[1];
@@ -1022,7 +1022,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 			print '<!-- Default VAT Rate -->';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-			// TODO We show localtax from $object, but this properties may not be correct. Only value $object->default_vat_code is guaranted.
+			// TODO We show localtax from $object, but this properties may not be correct. Only value $object->default_vat_code is guaranteed.
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
 				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->tva_tx);
@@ -1938,7 +1938,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		$sortfield = "soc.nom";
 	}
 
-	// Build filter to diplay only concerned lines
+	// Build filter to display only concerned lines
 	$filter = array('t.fk_product' => $object->id);
 
 	if (!empty($search_soc)) {
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index e551258154f..ba066ce40d6 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -75,7 +75,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $object = new Product($db);
 $search_sale = GETPOST("search_sale");
 if (GETPOSTISSET('catid')) {
@@ -101,7 +101,7 @@ if (!$sortorder) {
 }
 
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 1f47339c3c4..2fcead94fbb 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -55,7 +55,7 @@ class StockMovements extends DolibarrApi
 	/**
 	 * Get properties of a stock movement object
 	 *
-	 * Return an array with stock movement informations
+	 * Return an array with stock movement information
 	 *
 	 * @param	int		$id				ID of movement
 	 * @return  Object					Object with cleaned properties
@@ -89,7 +89,7 @@ class StockMovements extends DolibarrApi
 	 * @param int		$limit		Limit for list
 	 * @param int		$page		Page number
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of warehouse objects
 	 *
 	 * @throws RestException
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 6fa256454b9..37f0d39065f 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -53,7 +53,7 @@ class Warehouses extends DolibarrApi
 	/**
 	 * Get properties of a warehouse object
 	 *
-	 * Return an array with warehouse informations
+	 * Return an array with warehouse information
 	 *
 	 * @param	int		$id				ID of warehouse
 	 * @return  Object					Object with cleaned properties
@@ -89,7 +89,7 @@ class Warehouses extends DolibarrApi
 	 * @param int		$page		Page number
 	 * @param  int    $category   Use this param to filter list by category
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'WH-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of warehouse objects
 	 *
 	 * @throws RestException
@@ -172,7 +172,7 @@ class Warehouses extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->warehouse->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -212,7 +212,7 @@ class Warehouses extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->warehouse->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 00218170867..225e4e1ce04 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -23,7 +23,7 @@
 /**
  *  \file       htdocs/product/stock/class/entrepot.class.php
  *  \ingroup    stock
- *  \brief      Fichier de la classe de gestion des entrepots
+ *  \brief      File for class to manage warehouses
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -190,10 +190,10 @@ class Entrepot extends CommonObject
 	 *	Creation d'un entrepot en base
 	 *
 	 *	@param		User	$user		Object user that create the warehouse
-	 *	@param		bool	$notrigger	false=launch triggers after, true=disable triggers
-	 *	@return		int					>0 if OK, =<0 if KO
+	 *	@param		int		$notrigger	0=launch triggers after, 1=disable triggers
+	 *	@return		int					Return >0 if OK, =<0 if KO
 	 */
-	public function create($user, $notrigger = false)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -271,10 +271,10 @@ class Entrepot extends CommonObject
 	 *
 	 *	@param		int		$id			id of warehouse to modify
 	 *	@param		User	$user		User object
-	 *	@param		bool 	$notrigger	false=launch triggers after, true=disable trigge
-	 *	@return		int				>0 if OK, <0 if KO
+	 *	@param		int 	$notrigger	0=launch triggers after, 1=disable trigge
+	 *	@return		int					Return >0 if OK, <0 if KO
 	 */
-	public function update($id, $user, $notrigger = false)
+	public function update($id, $user, $notrigger = 0)
 	{
 		global $conf;
 
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 6a56ca01a36..7535d4c2bb4 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -179,7 +179,7 @@ class MouvementStock extends CommonObject
 	 *	@param		string			$batch				batch number
 	 *	@param		boolean			$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int				$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
-	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
 	 *  @param		int				$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
 	 * 	@param		boolean			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
 	 *	@return		int									Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
@@ -284,7 +284,7 @@ class MouvementStock extends CommonObject
 		}
 
 		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
-		// Only record into stock tables wil be disabled by this (the rest like writing into lot table or movement of subproucts are done)
+		// Only record into stock tables will be disabled by this (the rest like writing into lot table or movement of subproucts are done)
 		$movestock = 0;
 		if ($product->type != Product::TYPE_SERVICE || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$movestock = 1;
@@ -633,7 +633,7 @@ class MouvementStock extends CommonObject
 			}
 			// End call triggers
 
-			// Check unicity for serial numbered equipments once all movement were done.
+			// Check unicity for serial numbered equipment once all movement were done.
 			if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
 				if ($product->status_batch == 2 && $qty > 0) {	// We check only if we increased qty
 					if ($this->getBatchCount($fk_product, $batch) > 1) {
@@ -1120,7 +1120,7 @@ class MouvementStock extends CommonObject
 	}
 
 	/**
-	 *  Return a link (with optionaly the picto)
+	 *  Return a link (with optionally the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
@@ -1243,22 +1243,22 @@ class MouvementStock extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
-	 * Retrieve number of equipments for a product lot/serial
+	 * Retrieve number of equipment for a product lot/serial
 	 *
 	 * @param 	int 		$fk_product 	Product id
 	 * @param 	string 		$batch  		batch number
-	 * @return 	int            				Return integer <0 if KO, number of equipments found if OK
+	 * @return 	int            				Return integer <0 if KO, number of equipment found if OK
 	 */
 	private function getBatchCount($fk_product, $batch)
 	{
@@ -1287,13 +1287,13 @@ class MouvementStock extends CommonObject
 	}
 
 	/**
-	 * reverse mouvement for object by updating infos
+	 * reverse movement for object by updating infos
 	 * @return int    1 if OK,-1 if KO
 	 */
 	public function reverseMouvement()
 	{
 		$formattedDate = "REVERTMV" .dol_print_date($this->datem, '%Y%m%d%His');
-		if ($this->label == 'Annulation mouvement ID'.$this->id) {
+		if ($this->label == 'Annulation movement ID'.$this->id) {
 			return -1;
 		}
 		if ($this->inventorycode == $formattedDate) {
@@ -1301,7 +1301,7 @@ class MouvementStock extends CommonObject
 		}
 
 		$sql = "UPDATE ".$this->db->prefix()."stock_mouvement SET";
-		$sql .= " label = 'Annulation mouvement ID ".((int) $this->id)."',";
+		$sql .= " label = 'Annulation movement ID ".((int) $this->id)."',";
 		$sql .= "inventorycode = '".($formattedDate)."'";
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 4a1974d57b2..0e9852fba82 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -83,7 +83,7 @@ class Productlot extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -168,7 +168,7 @@ class Productlot extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -297,12 +297,11 @@ class Productlot extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -513,12 +512,11 @@ class Productlot extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -611,12 +609,11 @@ class Productlot extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -1095,7 +1092,7 @@ class Productlot extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the a lot card (with optionaly the picto)
+	 *  Return a link to the a lot card (with optionally the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpicto				Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
@@ -1196,7 +1193,7 @@ class Productlot extends CommonObject
 	{
 		global $conf;
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 3aae11eced6..abf7f20ca9d 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@netlogic.fr>
  *
  * 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
@@ -70,7 +70,7 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -80,12 +80,11 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -244,7 +243,7 @@ class ProductStockEntrepot extends CommonObject
 	 *
 	 * @return int|array Return integer <0 if KO, array if OK
 	 */
-	public function fetchAll($fk_product = '', $fk_entrepot = '', $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($fk_product = 0, $fk_entrepot = 0, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -315,12 +314,11 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -395,12 +393,11 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -492,7 +489,7 @@ class ProductStockEntrepot extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the user card (with optionaly the picto)
+	 *  Return a link to the user card (with optionally the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 86ebf002689..fd3c8e2e9c4 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -18,7 +18,7 @@
 /**
  *	\file       htdocs/product/stock/info.php
  *	\ingroup    stock
- *	\brief      Page des informations d'un entrepot
+ *	\brief      Page des information d'un entrepot
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index 69d9a86815a..8751935cb13 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -79,7 +79,7 @@ function dolDispatchToDo($order_id)
 /**
  * dispatchedOrders
  *
- * @return string		Array of id of orders wit all dispathing already done or not required
+ * @return string		Array of id of orders with all dispatching already done or not required
  */
 function dispatchedOrders()
 {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index a5fea4930f3..3f9ca9d6cce 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -89,7 +89,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 22db69246e5..48fdd6d27d8 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -526,7 +526,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 	} else {
 		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
-	Header('Location: '.$_SERVER["PHP_SELF"]);
+	header('Location: '.$_SERVER["PHP_SELF"]);
 	exit;
 }
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 1fb915a2f7d..9a447d213db 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -175,7 +175,7 @@ $uploaddir = $conf->stock->dir_output.'/movements';
 
 $permissiontoread = $user->rights->stock->mouvement->lire;
 $permissiontoadd = $user->rights->stock->mouvement->creer;
-$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we shoul dnever delete
+$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we should never delete
 
 $usercanread = $user->rights->stock->mouvement->lire;
 $usercancreate = $user->rights->stock->mouvement->creer;
@@ -586,7 +586,7 @@ if ($action == "transfert_stock" && !$cancel) {
 	}
 }
 
-// reverse mouvement of stock
+// reverse movement of stock
 if ($action == 'confirm_reverse') {
 	$listMouvement = array();
 	$toselect = array_map('intval', $toselect);
@@ -1143,7 +1143,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0c5e071f323..cb8b0192977 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -859,7 +859,7 @@ if ($id > 0 || $ref) {
 			}
 
 
-			// Calculating a theorical value
+			// Calculating a theoretical value
 			print '<tr><td>';
 			print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
 			print '</td>';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 0feab66a2e5..a7a8178ab2a 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -21,7 +21,7 @@
  *   	\file       product/stock/productlot_card.php
  *		\ingroup    stock
  *		\brief      This file is an example of a php page
- *					Initialy built by build_class_from_table on 2016-05-17 12:22
+ *					Initially built by build_class_from_table on 2016-05-17 12:22
  */
 
 // Load Dolibarr environment
@@ -58,7 +58,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index f72ad23a3ef..5d29e2bcd5b 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -21,7 +21,7 @@
  * \file        product/stock/productlot_list.php
  * \ingroup     stock
  * \brief       This file is an example of a php page
- *              Initialy built by build_class_from_table on 2016-05-17 12:22
+ *              Initially built by build_class_from_table on 2016-05-17 12:22
  */
 
 // Load Dolibarr environment
@@ -85,7 +85,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index d347290c92c..a9ae3c62195 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -392,7 +392,7 @@ if ($search_label) {
 	$sql .= natural_search('p.label', $search_label);
 }
 $sql .= ' AND p.tobuy = 1';
-if (!empty($conf->variants->eabled) && !getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) {	// Add test to exclude products that has variants
+if (!empty($conf->variants->enabled) && !getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) {	// Add test to exclude products that has variants
 	$sql .= ' AND p.rowid NOT IN (SELECT pac.fk_product_parent FROM '.MAIN_DB_PREFIX.'product_attribute_combination as pac WHERE pac.entity IN ('.getEntity('product').'))';
 }
 if ($fk_supplier > 0) {
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 8971e1a667e..3aa54ed103d 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -427,7 +427,7 @@ if (!empty($search_fk_warehouse)) {
 	}
 }
 if ($productid > 0) {
-	$param .= '&productid='.$productid;
+	$param .= '&productid='.(int) $productid;
 }
 if (GETPOST('dateday', 'int') > 0) {
 	$param .= '&dateday='.GETPOST('dateday', 'int');
@@ -442,7 +442,7 @@ if (GETPOST('dateyear', 'int') > 0) {
 // TODO Move this into the title line ?
 print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1);
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="liste centpercent">';
 
 $stocklabel = $langs->trans('StockAtDate');
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 89a01ac56ea..513e7746200 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -107,7 +107,7 @@ class StockTransfer extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -183,7 +183,7 @@ class StockTransfer extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -228,10 +228,10 @@ class StockTransfer extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$model_pdf = GETPOST('model');
 		if (!empty($model_pdf)) {
@@ -491,10 +491,10 @@ class StockTransfer extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$this->tms = ''; // Will be done automatically because tms field is on update cascade
 		$res = $this->updateCommon($user, $notrigger);
@@ -510,11 +510,11 @@ class StockTransfer extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		if ($this->status > self::STATUS_VALIDATED) {
 			return 0;
@@ -528,10 +528,10 @@ class StockTransfer extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -561,7 +561,7 @@ class StockTransfer extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -750,7 +750,7 @@ class StockTransfer extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1022,7 +1022,7 @@ class StockTransfer extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1104,7 +1104,7 @@ class StockTransfer extends CommonObject
 //	/**
 //	 * Constructor
 //	 *
-//	 * @param DoliDb $db Database handler
+//	 * @param DoliDB $db Database handler
 //	 */
 //	public function __construct(DoliDB $db)
 //	{
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 83da40a6a52..f1a19e3324a 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -76,7 +76,7 @@ class StockTransferLine extends CommonObjectLine
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -126,7 +126,7 @@ class StockTransferLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -170,10 +170,10 @@ class StockTransferLine extends CommonObjectLine
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -375,10 +375,10 @@ class StockTransferLine extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -386,11 +386,11 @@ class StockTransferLine extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -401,10 +401,10 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -540,7 +540,7 @@ class StockTransferLine extends CommonObjectLine
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -729,7 +729,7 @@ class StockTransferLine extends CommonObjectLine
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -977,7 +977,7 @@ class StockTransferLine extends CommonObjectLine
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index 2ffacc95a9d..1def7644d9d 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -70,7 +70,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-	// On remet cette lecture de permission ici car nécessaire d'avoir le nouveau statut de l'objet après toute action exécutée dessus (après incrémentation par exemple, le bouton supprimer doit disparaître)
+	// On remet cette lecture de permission ici car nécessaire d'avoir le nouveau statut de l'objet après toute action exécutée dessus (après incrémentation par example, le bouton supprimer doit disparaître)
 	$permissiontodelete = $user->rights->stocktransfer->stocktransfer->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 
 	// Actions when linking object each other
@@ -401,7 +401,7 @@ llxHeader('', $title, $help_url);
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {';
 
-// Affichage alerte date prévue de départ si transfert concerné
+// Show alert for planned departure date if the transfer is related
 $date_prevue_depart = $object->date_prevue_depart;
 $date_prevue_depart_plus_delai = $date_prevue_depart;
 if ($object->lead_time_for_warning > 0) {
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index 16f91769e56..920310e0251 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -22,7 +22,7 @@
 /**
  *       \file       htdocs/comm/propal/contact.php
  *       \ingroup    propal
- *       \brief      Tab to manage contacts/adresses of proposal
+ *       \brief      Tab to manage contacts/addresses of proposal
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 7e8734c1c72..3d67255b36c 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -81,7 +81,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -473,7 +473,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 3d70590a486..5a745e58d5d 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -144,7 +144,7 @@ if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $object->element == 'product'
 }
 
 // Serial / Eat-by date
-if (ismodEnabled('productbatch') &&
+if (isModEnabled('productbatch') &&
 (($object->element == 'product' && $object->hasbatch())
 || ($object->element == 'stock'))
 ) {
@@ -191,7 +191,7 @@ if (isModEnabled('project')) {
 }
 print '</tr>';
 
-// Label of mouvement of id of inventory
+// Label for movement of id of inventory
 $valformovementlabel = ((GETPOST("label") && (GETPOST('label') != $langs->trans("MovementCorrectStock", ''))) ? GETPOST("label") : $langs->trans("MovementCorrectStock", $productref));
 print '<tr>';
 print '<td>'.$langs->trans("MovementLabel").'</td>';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 166baecc5c9..8be73099cac 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -163,7 +163,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright">';
 
 
-/* Affichage de la liste des projets d'hier */
+/* Show list of yesterday's projects */
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -220,7 +220,7 @@ if ($db->type != 'pgsql')
 {
 	print '<br>';
 
-	// Affichage de la liste des projets de la semaine
+	// Show list of projects active this week
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -275,7 +275,7 @@ if ($db->type != 'pgsql')
 }
 */
 
-/* Affichage de la liste des projets du mois */
+/* Show list of projects active this month */
 if (getDolGlobalString('PROJECT_TASK_TIME_MONTH')) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
@@ -322,7 +322,7 @@ if (getDolGlobalString('PROJECT_TASK_TIME_MONTH')) {
 	print '</div>';
 }
 
-/* Affichage de la liste des projets de l'annee */
+/* Show list of projects that were active this year */
 if (getDolGlobalString('PROJECT_TASK_TIME_YEAR')) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<br><table class="noborder centpercent">';
@@ -409,10 +409,10 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_SHO
 	// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
 	// Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
 
-	$max = (!getDolGlobalString('PROJECT_LIMIT_TASK_PROJECT_AREA') ? 1000 : $conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
+	$max = getDolGlobalInt('PROJECT_LIMIT_TASK_PROJECT_AREA', 1000);
 
-	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, p.dateo as projdateo, p.datee as projdatee,";
-	$sql .= " t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.element_duration) as timespent";
+	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, p.dateo as projdate_start, p.datee as projdate_end,";
+	$sql .= " t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo as date_start, t.datee as date_end, SUM(tasktime.element_duration) as timespent";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
@@ -432,8 +432,8 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_SHO
 		$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 	}
 	$sql .= " AND p.fk_statut=1";
-	$sql .= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
-	$sql .= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
+	$sql .= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, p.dateo, p.datee, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
+	$sql .= " ORDER BY t.dateo DESC, t.rowid DESC, t.datee DESC";
 	$sql .= $db->plimit($max + 1); // We want more to know if we have more than limit
 
 	dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
@@ -469,14 +469,16 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_SHO
 			$projectstatic->title = $obj->title;
 			$projectstatic->statut = $obj->status;
 			$projectstatic->public = $obj->public;
-			$projectstatic->dateo = $db->jdate($obj->projdateo);
-			$projectstatic->datee = $db->jdate($obj->projdatee);
+			$projectstatic->date_start = $db->jdate($obj->projdate_start);
+			$projectstatic->date_end = $db->jdate($obj->projdate_end);
 
 			$taskstatic->projectstatus = $obj->projectstatus;
 			$taskstatic->progress = $obj->progress;
 			$taskstatic->fk_statut = $obj->status;
-			$taskstatic->dateo = $db->jdate($obj->dateo);
-			$taskstatic->datee = $db->jdate($obj->datee);
+			$taskstatic->date_start = $db->jdate($obj->date_start);
+			$taskstatic->date_end = $db->jdate($obj->date_end);
+			$taskstatic->dateo = $db->jdate($obj->date_start);
+			$taskstatic->datee = $db->jdate($obj->date_end);
 
 			$username = '';
 			if ($obj->userid && $userstatic->id != $obj->userid) {	// We have a user and it is not last loaded user
@@ -512,8 +514,8 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_SHO
 				print $langs->trans("NoTasks");
 			}
 			print '</td>';
-			print '<td class="center">'.dol_print_date($db->jdate($obj->dateo), 'day').'</td>';
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datee), 'day');
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_start), 'day').'</td>';
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_end), 'day');
 			if ($taskstatic->hasDelay()) {
 				print img_warning($langs->trans("Late"));
 			}
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 09ecdaa3e3e..3967b6953a5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('timesheetperdaycard'));
 
 // Security check
 $socid = 0;
-// For external user, no check is done on company because readability is managed by public status of project and assignement.
+// For external user, no check is done on company because readability is managed by public status of project and assignment.
 //if ($user->socid > 0) $socid=$user->socid;
 $result = restrictedArea($user, 'projet', $projectid);
 
@@ -90,7 +90,7 @@ $yearofday = GETPOST('addtimeyear');
 
 $daytoparse = $now;
 if ($year && $month && $day) {
-	$daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submited after submit of action 'submitdateselect'
+	$daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submitted after submit of action 'submitdateselect'
 } elseif ($yearofday && $monthofday && $dayofday) {
 	$daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
 }
@@ -100,7 +100,7 @@ if ($yearofday && $monthofday && $dayofday) {
 	$daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt');
 } elseif ($year && $month && $day) { // xxxofday is value of day after submit action 'addtime'
 	$daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt');
-} // this are value submited after submit of action 'submitdateselect'
+} // this are value submitted after submit of action 'submitdateselect'
 
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index d3bd7d0e316..65e617aec8d 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -52,7 +52,7 @@ $projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOST("projectid",
 
 // Security check
 $socid = 0;
-// For external user, no check is done on company because readability is managed by public status of project and assignement.
+// For external user, no check is done on company because readability is managed by public status of project and assignment.
 // if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $projectid);
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 37ff7f3014b..c8049ec14fb 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('timesheetperweekcard'));
 
 // Security check
 $socid = 0;
-// For external user, no check is done on company because readability is managed by public status of project and assignement.
+// For external user, no check is done on company because readability is managed by public status of project and assignment.
 // if ($user->socid > 0) $socid=$user->socid;
 $result = restrictedArea($user, 'projet', $projectid);
 
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 2186dc580e4..e6d80454cdc 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -721,7 +721,7 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 										print "</td>";
 									}
 
-									// Defaut
+									// Default
 									print '<td class="center">';
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name") {
 										print img_picto($langs->trans("Default"), 'on');
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index 6c9f059f314..1e8f02c4bba 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('projectcardinfo'));
 // Security check
 $id = GETPOST("id", 'int');
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 if (!$user->hasRight('projet', 'lire')) {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index a7e90a287de..df69727b960 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -83,7 +83,7 @@ $object = new Project($db);
 $extrafields = new ExtraFields($db);
 
 // Load object
-//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Can't use generic include because when creating a project, ref is defined and we dont want error if fetch fails from ref.
+//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Can't use generic include because when creating a project, ref is defined and we don't want error if fetch fails from ref.
 if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
@@ -100,7 +100,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check
 $socid = GETPOST('socid', 'int');
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 restrictedArea($user, 'projet', $object->id, 'projet&project');
 
 if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && !GETPOST("cancel"))) {
@@ -197,7 +197,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		// Create with status validated immediatly
+		// Create with status validated immediately
 		if (getDolGlobalString('PROJECT_CREATE_NO_DRAFT') && !$error) {
 			$status = Project::STATUS_VALIDATED;
 		}
@@ -865,7 +865,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	print '</form>';
 
 	// Change probability from status or role of project
-	// Set also dependencies between use taks and bill time
+	// Set also dependencies between use task and bill time
 	print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	function change_percent()
@@ -1427,7 +1427,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 
 	print '</form>';
 
-	// Set also dependencies between use taks and bill time
+	// Set also dependencies between use task and bill time
 	print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	jQuery("#usage_task").change(function() {
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 2d8b049b701..8a7c4e6fed2 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -62,7 +62,7 @@ class Projects extends DolibarrApi
 	/**
 	 * Get properties of a project object
 	 *
-	 * Return an array with project informations
+	 * Return an array with project information
 	 *
 	 * @param   int         $id         ID of project
 	 * @return  Object					Object with cleaned properties
@@ -102,7 +102,7 @@ class Projects extends DolibarrApi
 	 * @param string		   $thirdparty_ids		Thirdparty ids to filter projects of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param  int    $category   Use this param to filter list by category
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of project objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $properties = '')
@@ -201,7 +201,7 @@ class Projects extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->project->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -462,7 +462,7 @@ class Projects extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->project->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index cbab93ce7a7..2604bfc7aab 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -57,7 +57,7 @@ class Tasks extends DolibarrApi
 	/**
 	 * Get properties of a task object
 	 *
-	 * Return an array with task informations
+	 * Return an array with task information
 	 *
 	 * @param   int         $id                     ID of task
 	 * @param   int         $includetimespent       0=Return only task. 1=Include a summary of time spent, 2=Include details of time spent lines
@@ -102,7 +102,7 @@ class Tasks extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of project objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
@@ -197,7 +197,7 @@ class Tasks extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->task->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -459,7 +459,7 @@ class Tasks extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->task->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 01a52a52436..f79bb10a1b9 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -276,7 +276,7 @@ class Project extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -819,7 +819,7 @@ class Project extends CommonObject
 	 *	@param		string		$projectkey		Equivalent key  to fk_projet for actual type
 	 * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
 	 */
-	public function get_element_list($type, $tablename, $datefieldname = '', $date_start = '', $date_end = '', $projectkey = 'fk_projet')
+	public function get_element_list($type, $tablename, $datefieldname = '', $date_start = null, $date_end = null, $projectkey = 'fk_projet')
 	{
 		// phpcs:enable
 
@@ -1168,7 +1168,7 @@ class Project extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -1586,7 +1586,7 @@ class Project extends CommonObject
 	 * @param 	int		$mode			0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
 	 * @param 	int		$list			0=Return array, 1=Return string list
 	 * @param	int		$socid			0=No filter on third party, id of third party
-	 * @param	string	$filter			additionnal filter on project (statut, ref, ...)
+	 * @param	string	$filter			additional filter on project (statut, ref, ...)
 	 * @return 	array|string			Array of projects id, or string with projects id separated with "," if list is 1
 	 */
 	public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
@@ -1944,12 +1944,12 @@ class Project extends CommonObject
 			}
 			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
 
-			//Calcultate new task start date with difference between old proj start date and origin task start date
+			//Calculate new task start date with difference between old proj start date and origin task start date
 			if (!empty($tasktoshiftdate->date_start)) {
 				$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
 			}
 
-			//Calcultate new task end date with difference between origin proj end date and origin task end date
+			//Calculate new task end date with difference between origin proj end date and origin task end date
 			if (!empty($tasktoshiftdate->date_end)) {
 				$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
 			}
@@ -2040,7 +2040,7 @@ class Project extends CommonObject
 	 *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
 	 *
 	 *  @param	string		$modele			Force template to use ('' by default)
-	 *  @param	Translate	$outputlangs	Objet lang to use for translation
+	 *  @param	Translate	$outputlangs	Object lang to use for translation
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
@@ -2203,7 +2203,7 @@ class Project extends CommonObject
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 * @param	User	$user   Objet user
+	 * @param	User	$user   Object user
 	 * @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
@@ -2211,7 +2211,7 @@ class Project extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		// For external user, no check is done on company because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company because readability is managed by public status of project and assignment.
 		//$socid=$user->socid;
 
 		$response = new WorkboardResponse();
@@ -2227,7 +2227,7 @@ class Project extends CommonObject
 		$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
 		$sql .= ")";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		$sql .= " WHERE p.fk_statut = 1";
 		$sql .= " AND p.entity IN (".getEntity('project').')';
@@ -2246,7 +2246,7 @@ class Project extends CommonObject
 
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
-		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id).") OR (s.rowid IS NULL))";
 
 		//print $sql;
@@ -2295,7 +2295,7 @@ class Project extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Charge indicateurs this->nb pour le tableau de bord
+	 * Load indicators this->nb for the state board
 	 *
 	 * @return     int         Return integer <0 if KO, >0 if OK
 	 */
@@ -2353,7 +2353,7 @@ class Project extends CommonObject
 
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
@@ -2431,7 +2431,7 @@ class Project extends CommonObject
 	 *  @param 	string	$addr_bcc           Email bcc
 	 *  @param 	int		$deliveryreceipt	Ask a delivery receipt
 	 *  @param	int		$msgishtml			1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
-	 *  @param	string	$errors_to			erros to
+	 *  @param	string	$errors_to			errors to
 	 *  @param	string	$moreinheader		Add more html headers
 	 *  @since V18
 	 *  @return	int							Return integer <0 if KO, >0 if OK
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 660102eb05e..795cb968fa2 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -81,14 +81,14 @@ class ProjectStats extends Stats
 		$sql = "SELECT";
 		$sql .= " SUM(t.opp_amount), t.fk_opp_status, cls.code, cls.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->socid)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= ", ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= $this->buildWhere();
-		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignment.
 		//if ($socid > 0) $sql.= " AND t.fk_soc = ".((int) $socid);
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id).") OR (s.rowid IS NULL))";
 		$sql .= " AND t.fk_opp_status = cls.rowid";
 		$sql .= " AND t.fk_statut <> 0"; // We want historic also, so all projects not draft
@@ -147,13 +147,13 @@ class ProjectStats extends Stats
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb, SUM(t.opp_amount) as total, AVG(t.opp_amount) as avg,";
 		$sql .= " SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter ? " OR cls.code IN ('WON','LOST')" : ""), '0', 't.opp_percent')." / 100) as weighted";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON cls.rowid = t.fk_opp_status";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
-		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company permission because readability is managed by public status of project and assignment.
 		//if ($socid > 0) $sql.= " AND t.fk_soc = ".((int) $socid);
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id).") OR (s.rowid IS NULL))";
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
@@ -187,7 +187,7 @@ class ProjectStats extends Stats
 			$sqlwhere[] = ' t.fk_user_resp = '.((int) $this->userid);
 		}
 
-		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
+		// Forced filter on socid is similar to forced filter on project. TODO Use project assignment to allow to not use filter on project
 		if (!empty($this->socid)) {
 			$sqlwhere[] = ' t.fk_soc = '.((int) $this->socid);
 		}
@@ -244,7 +244,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
@@ -269,7 +269,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
@@ -381,7 +381,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter ? " OR cls.code IN ('WON','LOST')" : ""), '0', 't.opp_percent')." / 100)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t LEFT JOIN ".MAIN_DB_PREFIX.'c_lead_status as cls ON t.fk_opp_status = cls.rowid';
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
@@ -489,7 +489,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
@@ -502,7 +502,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-		// No check is done on company permission because readability is managed by public status of project and assignement.
+		// No check is done on company permission because readability is managed by public status of project and assignment.
 		//if (! $user->rights->societe->client->voir && ! $user->soc_id)
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user = ".((int) $user->id);
 		$sql .= $this->buildWhere();
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 6706558523f..c3cbe241739 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -83,15 +83,22 @@ class Task extends CommonObjectLine
 	public $duration_effective; // total of time spent on this task
 	public $planned_workload;
 	public $date_c;
-	public $date_start;
-	public $date_end;
 	public $progress;
 
+	/**
+	 * @deprecated Use date_start instead
+	 */
+	public $dateo;
+
+	public $date_start;
+
 	/**
 	 * @deprecated Use date_end instead
 	 */
 	public $datee;
 
+	public $date_end;
+
 	/**
 	 * @var int ID
 	 */
@@ -149,7 +156,7 @@ class Task extends CommonObjectLine
 	public $tobill;
 	public $billed;
 
-	// Properties to store project informations
+	// Properties to store project information
 	public $projectref;
 	public $projectstatus;
 	public $projectlabel;
@@ -324,8 +331,8 @@ class Task extends CommonObjectLine
 		$sql .= " t.duration_effective,";
 		$sql .= " t.planned_workload,";
 		$sql .= " t.datec,";
-		$sql .= " t.dateo,";
-		$sql .= " t.datee,";
+		$sql .= " t.dateo as date_start,";
+		$sql .= " t.datee as date_end,";
 		$sql .= " t.fk_user_creat,";
 		$sql .= " t.fk_user_valid,";
 		$sql .= " t.fk_statut,";
@@ -369,8 +376,8 @@ class Task extends CommonObjectLine
 				$this->duration_effective = $obj->duration_effective;
 				$this->planned_workload = $obj->planned_workload;
 				$this->date_c = $this->db->jdate($obj->datec);
-				$this->date_start = $this->db->jdate($obj->dateo);
-				$this->date_end				= $this->db->jdate($obj->datee);
+				$this->date_start = $this->db->jdate($obj->date_start);
+				$this->date_end				= $this->db->jdate($obj->date_end);
 				$this->fk_user_creat		= $obj->fk_user_creat;
 				$this->fk_user_valid		= $obj->fk_user_valid;
 				$this->fk_statut			= $obj->fk_statut;
@@ -1177,7 +1184,7 @@ class Task extends CommonObjectLine
 			return -1;
 		}
 
-		/* Liste des taches et role sur les projets ou taches */
+		/* Liste des taches et role sur les projects ou taches */
 		$sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
 		if ($userp) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet as pt";
@@ -1816,7 +1823,7 @@ class Task extends CommonObjectLine
 				}
 			}
 
-			// Update hourly rate of this time spent entry, but only if it was not set initialy
+			// Update hourly rate of this time spent entry, but only if it was not set initially
 			$res_update = 1;
 			if (empty($timespent->thm) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM')) {
 				$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
@@ -1977,15 +1984,15 @@ class Task extends CommonObjectLine
 			$projectstatic = new Project($this->db);
 			$projectstatic->fetch($ori_project_id);
 
-			//Origin project strat date
+			//Origin project start date
 			$orign_project_dt_start = $projectstatic->date_start;
 
-			//Calcultate new task start date with difference between origin proj start date and origin task start date
+			//Calculate new task start date with difference between origin proj start date and origin task start date
 			if (!empty($clone_task->date_start)) {
 				$clone_task->date_start = $now + $clone_task->date_start - $orign_project_dt_start;
 			}
 
-			//Calcultate new task end date with difference between origin proj end date and origin task end date
+			//Calculate new task end date with difference between origin proj end date and origin task end date
 			if (!empty($clone_task->date_end)) {
 				$clone_task->date_end = $now + $clone_task->date_end - $orign_project_dt_start;
 			}
@@ -2224,8 +2231,8 @@ class Task extends CommonObjectLine
 	/**
 	 *  Create an intervention document on disk using template defined into PROJECT_TASK_ADDON_PDF
 	 *
-	 *  @param	string		$modele			force le modele a utiliser ('' par defaut)
-	 *  @param	Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param	string		$modele			force le modele a utiliser ('' par default)
+	 *  @param	Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
@@ -2257,7 +2264,7 @@ class Task extends CommonObjectLine
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 * @param	User	$user   Objet user
+	 * @param	User	$user   Object user
 	 * @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
@@ -2265,7 +2272,7 @@ class Task extends CommonObjectLine
 		// phpcs:enable
 		global $conf, $langs;
 
-		// For external user, no check is done on company because readability is managed by public status of project and assignement.
+		// For external user, no check is done on company because readability is managed by public status of project and assignment.
 		//$socid = $user->socid;
 		$socid = 0;
 
@@ -2275,7 +2282,7 @@ class Task extends CommonObjectLine
 		// List of tasks (does not care about permissions. Filtering will be done later)
 		$sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
 		$sql .= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
-		$sql .= " t.dateo as date_start, t.datee as datee";
+		$sql .= " t.dateo as date_start, t.datee as date_end";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
@@ -2314,7 +2321,8 @@ class Task extends CommonObjectLine
 				$task_static->projectstatus = $obj->projectstatus;
 				$task_static->progress = $obj->progress;
 				$task_static->fk_statut = $obj->status;
-				$task_static->date_end = $this->db->jdate($obj->datee);
+				$task_static->date_start = $this->db->jdate($obj->date_start);
+				$task_static->date_end = $this->db->jdate($obj->date_end);
 
 				if ($task_static->hasDelay()) {
 					$response->nbtodolate++;
@@ -2331,7 +2339,7 @@ class Task extends CommonObjectLine
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge indicateurs this->nb de tableau de bord
+	 *      Load indicators this->nb for state board
 	 *
 	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index a314b848477..64131563823 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -36,7 +36,7 @@ class TaskStats extends Stats
 	/**
 	 * Constructor of the class
 	 *
-	 * @param   DoliDb  $db     Database handler
+	 * @param   DoliDB  $db     Database handler
 	 */
 	public function __construct($db)
 	{
@@ -138,7 +138,7 @@ class TaskStats extends Stats
 		if (!empty($this->userid)) {
 			$sqlwhere[] = ' t.fk_user_resp = '.((int) $this->userid);
 		}
-		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
+		// Forced filter on socid is similar to forced filter on project. TODO Use project assignment to allow to not use filter on project
 		if (!empty($this->socid)) {
 			$sqlwhere[] = ' p.fk_soc = '.((int) $this->socid); // Link on thirdparty is on project, not on task
 		}
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 596ddda994e..f16b51854ba 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -48,7 +48,7 @@ $withproject = GETPOST('withproject', 'int');
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if (!$user->hasRight('projet', 'lire')) {
 	accessforbidden();
 }
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 8e7c81d1200..43297b14009 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -59,7 +59,7 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $hookmanager->initHooks(array('projectcontactcard', 'globalcard'));
@@ -87,7 +87,7 @@ if (empty($reshook)) {
 		$task_array = $taskstatic->getTasksArray(0, 0, $object->id, 0, 0);
 		$nbTasks = count($task_array);
 
-		//If no task avaiblable, redirec to to add confirm
+		//If no task available, redirec to to add confirm
 		$type_to = (GETPOST('typecontact') ? 'typecontact='.GETPOST('typecontact') : 'type='.GETPOST('type'));
 		$personToAffect = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$affect_to = (GETPOST('userid') ? 'userid='.$personToAffect : 'contactid='.$personToAffect);
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9ecc2ab8d2b..be56c01ff31 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -81,7 +81,7 @@ if (!$sortfield) {
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $permissiontoadd = $user->hasRight('projet', 'creer');
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index fe4af44cdff..3c5a8467a5d 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -150,14 +150,14 @@ if (isModEnabled('eventorganization')) {
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$datesrfc = GETPOST('datesrfc');
-$dateerfc = GETPOST('dateerfc');
+$datesrfc = GETPOST('datesrfc');	// deprecated
+$dateerfc = GETPOST('dateerfc');	// deprecated
 $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
 $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
-if (empty($dates) && !empty($datesrfc)) {
+if (empty($dates) && !empty($datesrfc)) {	// deprecated
 	$dates = dol_stringtotime($datesrfc);
 }
-if (empty($datee) && !empty($dateerfc)) {
+if (empty($datee) && !empty($dateerfc)) {	// deprecated
 	$datee = dol_stringtotime($dateerfc);
 }
 if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && getDolGlobalString('PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR')) {
@@ -185,7 +185,7 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
 
 // Security check
 $socid = $object->socid;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $object->id, 'projet&project');
 
 $hookmanager->initHooks(array('projectOverview'));
@@ -1249,7 +1249,7 @@ foreach ($listofreferent as $key => $value) {
 				// Remove link
 				print '<td style="width: 24px">';
 				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement') {
-					if (!getDolGlobalString('PROJECT_DISABLE_UNLINK_FROM_OVERVIEW') || $user->admin) {		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
+					if (!getDolGlobalString('PROJECT_DISABLE_UNLINK_FROM_OVERVIEW') || $user->admin) {		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by default, so this test true
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unlink&tablename='.$tablename.'&elementselect='.$element->id.($project_field ? '&projectfield='.$project_field : '').'" class="reposition">';
 						print img_picto($langs->trans('Unlink'), 'unlink');
 						print '</a>';
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index 7800b7ef1d1..40d6bc3ebdf 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -235,7 +235,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	<dt>pClass</dt><dd>(required) the css class for this task</dd>
 	<dt>pLink</dt><dd>(optional) any http link to be displayed in tool tip as the "More information" link.</dd>
 	<dt>pMile</dt><dd>(optional) indicates whether this is a milestone task - Numeric; 1 = milestone, 0 = not milestone</dd>
-	<dt>pRes</dt><dd>(optional) resource name</dd>
+	<dt>press</dt><dd>(optional) resource name</dd>
 	<dt>pComp</dt><dd>(required) completion percent, numeric</dd>
 	<dt>pGroup</dt><dd>(optional) indicates whether this is a group task (parent) - Numeric; 0 = normal task, 1 = standard group task, 2 = combined group task<a href='#combinedtasks' class="footnote">*</a></dd>
 	<dt>pParent</dt><dd>(required) identifies a parent pID, this causes this task to be a child of identified task. Numeric, top level tasks should have pParent set to 0</dd>
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 44eeebfc4b2..a53fce9ea6f 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -20,7 +20,7 @@
 /**
  *	\file       htdocs/projet/ganttview.php
  *	\ingroup    projet
- *	\brief      Gantt diagramm of a project
+ *	\brief      Gantt diagram of a project
  */
 
 require "../main.inc.php";
@@ -49,7 +49,7 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 // Load translation files required by the page
@@ -362,7 +362,7 @@ if (count($tasksarray) > 0) {
 		$taskcursor++;
 	}
 
-	// Search parent to set task_parent_alternate_id (requird by ganttchart)
+	// Search parent to set task_parent_alternate_id (required by ganttchart)
 	foreach ($tasks as $tmpkey => $tmptask) {
 		foreach ($tasks as $tmptask2) {
 			if ($tmptask2['task_id'] == $tmptask['task_parent']) {
@@ -380,9 +380,9 @@ if (count($tasksarray) > 0) {
 	if (!empty($conf->use_javascript_ajax)) {
 		//var_dump($_SESSION);
 
-		// How the date for data are formated (format used bu jsgantt)
+		// How the date for data are formatted (format used bu jsgantt)
 		$dateformatinput = 'yyyy-mm-dd';
-		// How the date for data are formated (format used by dol_print_date)
+		// How the date for data are formatted (format used by dol_print_date)
 		$dateformatinput2 = 'standard';
 		//var_dump($dateformatinput);
 		//var_dump($dateformatinput2);
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 2ee05e564e2..959cc1e84b3 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -52,7 +52,7 @@ if ($search_project_user == $user->id) {
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if (!$user->hasRight('projet', 'lire')) {
 	accessforbidden();
 }
@@ -200,7 +200,7 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
 print '</div><div class="fichetwothirdright">';
 
 // Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.dateo, p.datee, p.fk_statut as status, p.tms as datem";
+$sql = "SELECT p.rowid, p.ref, p.title, p.dateo as date_start, p.datee as date_end, p.fk_statut as status, p.tms as datem";
 $sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 $sql .= ", s.code_client, s.code_compta, s.client";
 $sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
@@ -241,6 +241,8 @@ if ($resql) {
 			$projectstatic->title = $obj->title;
 			$projectstatic->thirdparty_name = $obj->name;
 			$projectstatic->status = $obj->status;
+			$projectstatic->date_start = $db->jdate($obj->date_start);
+			$projectstatic->date_end = $db->jdate($obj->date_end);
 
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4f798f1437e..b4bca156beb 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -63,7 +63,7 @@ $title = $langs->trans("Projects");
 
 // Security check
 $socid = GETPOST('socid', 'int');
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if ($socid > 0) {
 	$soc = new Societe($db);
 	$soc->fetch($socid);
@@ -504,7 +504,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON p.fk_user_creat = u.rowid';
 // We'll need this table joined to the select in order to filter by sale
-// No check is done on company permission because readability is managed by public status of project and assignement.
+// No check is done on company permission because readability is managed by public status of project and assignment.
 //if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 if ($search_sale > 0) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
@@ -610,12 +610,12 @@ if ($search_opp_status) {
 if ($search_public != '') {
 	$sql .= " AND p.public = ".((int) $search_public);
 }
-// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
+// For external user, no check is done on company permission because readability is managed by public status of project and assignment.
 //if ($socid > 0) $sql.= " AND s.rowid = ".((int) $socid);
 if ($search_sale > 0) {
 	$sql .= " AND sc.fk_user = ".((int) $search_sale);
 }
-// No check is done on company permission because readability is managed by public status of project and assignement.
+// No check is done on company permission because readability is managed by public status of project and assignment.
 //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id).") OR (s.rowid IS NULL))";
 if ($search_project_user > 0) {
 	// TODO Replace this with a EXISTS and remove the link to table + DISTINCT
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index 94c1869da05..411a92eb980 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('projectcardinfo'));
 // Security check
 $id = GETPOST("id", 'int');
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 if (!$user->hasRight('projet', 'lire')) {
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 397c3046dbe..06be85621fb 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -46,7 +46,7 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $hookmanager->initHooks(array('projetnote'));
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 7083ad95e3f..0e0381fd831 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -134,7 +134,7 @@ if (!$sortorder) {
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
@@ -310,8 +310,8 @@ if ($action == 'createtask' && $user->hasRight('projet', 'creer')) {
 	$error = 0;
 
 	// If we use user timezone, we must change also view/list to use user timezone everywhere
-	$date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
-	$date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
+	$date_start = dol_mktime(GETPOST('date_starthour', 'int'), GETPOST('date_startmin', 'int'), 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+	$date_end = dol_mktime(GETPOST('date_endhour', 'int'), GETPOST('date_endmin', 'int'), 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
 	if (!$cancel) {
 		if (empty($taskref)) {
@@ -789,13 +789,13 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	// Date start task
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
 	print img_picto('', 'action', 'class="pictofixedwidth"');
-	print $form->selectDate((!empty($date_start) ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
+	print $form->selectDate((!empty($date_start) ? $date_start : ''), 'date_start', 1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Date end task
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
 	print img_picto('', 'action', 'class="pictofixedwidth"');
-	print $form->selectDate((!empty($date_end) ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
+	print $form->selectDate((!empty($date_end) ? $date_end : -1), 'date_end', -1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Planned workload
@@ -1027,7 +1027,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 			print '</td>';
 		}
 	}
-	// Contacts of task, disabled because available by default jsut after
+	// Contacts of task, disabled because available by default just after
 	/*
 	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
 		print '<td class="liste_titre"></td>';
@@ -1103,7 +1103,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 			print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "t.billed", '', $param, '', $sortfield, $sortorder, 'right ');
 		}
 	}
-	// Contacts of task, disabled because available by default jsut after
+	// Contacts of task, disabled because available by default just after
 	/*
 	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
 		print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 561d2e36d03..72c50084750 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -117,7 +117,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if (!$user->hasRight('projet', 'lire')) {
 	accessforbidden();
 }
@@ -835,7 +835,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 // Fields title search
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 579e17b70fc..442e6c2f8ed 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -40,7 +40,7 @@ $project_ref = GETPOST('project_ref', 'alpha');
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if (!$user->hasRight('projet', 'lire')) {
 	accessforbidden();
 }
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index d4bf3aa2099..c9a6c4d3aa4 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -108,8 +108,8 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 		}
 		$object->fk_task_parent = $task_parent;
 		$object->planned_workload = $planned_workload;
-		$object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
-		$object->date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
+		$object->date_start = dol_mktime(GETPOST('date_starthour', 'int'), GETPOST('date_startmin', 'int'), 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+		$object->date_end = dol_mktime(GETPOST('date_endhour', 'int'), GETPOST('date_endmin', 'int'), 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
 		$object->budget_amount = price2num(GETPOST('budget_amount', 'alphanohtml'));
 
@@ -473,12 +473,12 @@ if ($id > 0 || !empty($ref)) {
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print $form->selectDate($object->date_start, 'dateo', 1, 1, 0, '', 1, 0);
+		print $form->selectDate($object->date_start, 'date_start', 1, 1, 0, '', 1, 0);
 		print '</td></tr>';
 
 		// Date end
 		print '<tr><td>'.$langs->trans("Deadline").'</td><td>';
-		print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0);
+		print $form->selectDate($object->date_end ? $object->date_end : -1, 'date_end', 1, 1, 0, '', 1, 0);
 		print '</td></tr>';
 
 		// Planned workload
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 48e941aae91..dc15eb7165b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -131,7 +131,7 @@ if ($id > 0 || $ref) {
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;	  // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;	  // For external user, no check is done on company because readability is managed by public status of project and assignment.
 if (!$user->hasRight('projet', 'lire')) {
 	accessforbidden();
 }
@@ -1738,7 +1738,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print '<input type="hidden" name="taskid" value="' . $id . '">';
 			}
 
-			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 			print '<table class="noborder nohover centpercent">';
 
 			print '<tr class="liste_titre">';
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index 51f5b5e8a81..d2633a1d51a 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -89,7 +89,7 @@ $next_month = $next['month'];
 $max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month
 // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
+$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
 $tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 if ($tmpday >= 1) {
 	$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
@@ -528,8 +528,8 @@ if ($action == 'afteradd') {
 			}
 			hour.setMinutes(hour.getMinutes() + duration);
 
-			let hours = hour.getHours().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
-			let mins = hour.getMinutes().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
+			let hours = hour.getHours().toString().padStart(2, "0"); // Formatter pour obtenir deux chiffres
+			let mins = hour.getMinutes().toString().padStart(2, "0"); // Formatter pour obtenir deux chiffres
 
 			timerange = index + " - " + `${hours}:${mins}`;
 			str += "<input class=\'button btnsubmitbooking "+(isalreadybooked == true ? "btnbookcalbooked" : "")+"\' type=\'submit\' name=\'timebooking\' value=\'"+timerange+"\' data-duration=\'"+duration+"\'><br>";
diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php
index 5cf30de3bd9..28b81207da4 100644
--- a/htdocs/public/company/new.php
+++ b/htdocs/public/company/new.php
@@ -258,7 +258,7 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		$db->commit();
 
-		Header("Location: " . $urlback);
+		header("Location: " . $urlback);
 		exit;
 	} else {
 		$db->rollback();
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index 2cbea50bb90..ca3c8c06235 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -61,11 +61,11 @@ if (php_sapi_name() == "cli") {
 	exit(-1);
 }
 
-// librarie core
+// core library
 // Dolibarr environment
 require '../../main.inc.php';
 
-// librarie jobs
+// cron jobs library
 dol_include_once("/cron/class/cronjob.class.php");
 
 global $langs, $conf;
diff --git a/htdocs/public/datapolicy/index.php b/htdocs/public/datapolicy/index.php
index 08aa1691547..23444d380f7 100644
--- a/htdocs/public/datapolicy/index.php
+++ b/htdocs/public/datapolicy/index.php
@@ -18,7 +18,7 @@
 /**
  * \file    htdocs/public/datapolicy/index.php
  * \ingroup datapolicy
- * \brief   Page to show the result of updating it Data policiy preferences after an email campaign using sendMailDataPolicyContact()
+ * \brief   Page to show the result of updating it Data policy preferences after an email campaign using sendMailDataPolicyContact()
  */
 
 if (!defined('NOLOGIN')) {
@@ -54,7 +54,7 @@ $langs->load('datapolicy', 0, 0, $l);
  */
 
 if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
-	print 'Missing paramater s, c or a';
+	print 'Missing parameter s, c or a';
 	return 0;
 } elseif (!empty($idc)) {
 	$contact = new Contact($db);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 98daae7e8c8..bdd8f8b8d07 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -110,7 +110,7 @@ if (empty($reshook)) {
 
 	// Visible
 	$alwayscheckedmodules = array('barcode', 'bookmark', 'categorie', 'externalrss', 'fckeditor', 'geoipmaxmind', 'gravatar', 'memcached', 'syslog', 'user', 'webservices'); // Technical module we always want
-	$alwaysuncheckedmodules = array('dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'socialnetworks', 'website'); // Module we dont want by default
+	$alwaysuncheckedmodules = array('dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'socialnetworks', 'website'); // Module we don't want by default
 	// Not visible
 	$alwayshiddencheckedmodules = array('accounting', 'api', 'barcode', 'blockedlog', 'bookmark', 'clicktodial', 'comptabilite', 'cron', 'document', 'domain', 'externalrss', 'externalsite', 'fckeditor', 'geoipmaxmind', 'gravatar', 'label', 'ldap',
 									'mailmanspip', 'notification', 'oauth', 'syslog', 'user', 'webservices', 'workflow',
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 286818bad1c..06bd5db19f2 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -63,7 +63,7 @@ $langs->loadLangs(array("main", "mails"));
 
 $mtid = GETPOST('mtid');
 $email = GETPOST('email');
-$tag = GETPOST('tag');	// To retreive the emailing, and recipient
+$tag = GETPOST('tag');	// To retrieve the emailing, and recipient
 $unsuscrib = GETPOST('unsuscrib');
 $securitykey = GETPOST('securitykey');
 
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 18dbf294ffd..8973e1c6be2 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -344,13 +344,13 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 			$db->commit();
 
-			Header("Location: ".$redirection);
+			header("Location: ".$redirection);
 			exit;
 		}
 
 		$resultfetchthirdparty = 0;
 
-		$genericcompanyname = $langs->trans('EventParticipant').' '.($emailcompany ? $emailcompany : $email);	// Keep this label simple so we can retreive same thirdparty for another event
+		$genericcompanyname = $langs->trans('EventParticipant').' '.($emailcompany ? $emailcompany : $email);	// Keep this label simple so we can retrieve same thirdparty for another event
 
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
@@ -470,7 +470,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -609,7 +609,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 					}
 				}
 
-				Header("Location: ".$redirection);
+				header("Location: ".$redirection);
 				exit;
 			} else {
 				$db->rollback();
@@ -667,7 +667,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
-			Header("Location: ".$redirection);
+			header("Location: ".$redirection);
 			exit;
 		}
 		//Header("Location: ".$urlback);
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index eddb0e1d5c8..4fa749af693 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -24,7 +24,7 @@
  *		\ingroup    core
  *		\brief      File to show page after a successful subscription.
  *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
+ *                  This token can be used to get more information.
  */
 
 if (!defined('NOLOGIN')) {
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b6f4025736d..14a45eb421c 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -447,7 +447,7 @@ if (empty($reshook) && $action == 'add') {
 
 				if (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') && getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') != '-1') {
 					if (empty($adht->caneditamount)) {			// If edition of amount not allowed
-						// TODO Check amount is same than the amount required for the type of member or if not defined as the defeault amount into $conf->global->MEMBER_NEWFORM_AMOUNT
+						// TODO Check amount is same than the amount required for the type of member or if not defined as the default amount into $conf->global->MEMBER_NEWFORM_AMOUNT
 						// It is not so important because a test is done on return of payment validation.
 					}
 
@@ -474,7 +474,7 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		$db->commit();
 
-		Header("Location: ".$urlback);
+		header("Location: ".$urlback);
 		exit;
 	} else {
 		$db->rollback();
@@ -771,7 +771,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 		if ($caneditamount && empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
 			$amount = getDolGlobalString('MEMBER_NEWFORM_AMOUNT');
 		}
-		// - If not set, we accept ot have amount defined as parameter (for backward compatibility).
+		// - If not set, we accept to have amount defined as parameter (for backward compatibility).
 		if (empty($amount)) {
 			$amount = (GETPOST('amount') ? price2num(GETPOST('amount', 'alpha'), 'MT', 2) : '');
 		}
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index c107fba3d3b..ab37aa7d420 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -48,7 +48,7 @@ require '../main.inc.php';
  */
 
 if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml')) {
-	print 'Sorry, it seems your internet connexion is off.<br>';
+	print 'Sorry, it seems your internet connection is off.<br>';
 	print 'You need to be connected to network to use this software.<br>';
 } else {
 	$langs->loadLangs(array("error", "other"));
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 4668789c9c0..9854777187a 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -210,7 +210,7 @@ if (is_array($results)) {
 			print '</b><br>';
 
 			// Description
-			//print  $langs->trans("Desription").' : ';
+			//print  $langs->trans("Description").' : ';
 			print '<br>';
 			print '<div class="opensurveydescription centpercent">';
 			print dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->commentaires), 1, 1, 1));
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 73245eb75e4..3a0ae62c2a9 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -568,7 +568,7 @@ while ($compteur < $num) {
 			}
 		}
 	} else {
-		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour saisie
+		// Else, replace the user's choices with a line of checkboxes for entry
 		if ($compteur == $ligneamodifier) {
 			for ($i = 0; $i < $nbcolonnes; $i++) {
 				$car = substr($ensemblereponses, $i, 1);
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index c8cc832b183..5fb9e2b194b 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -512,7 +512,7 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		$db->commit();
 
-		Header("Location: ".$urlback);
+		header("Location: ".$urlback);
 		exit;
 	} else {
 		$db->rollback();
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 121a39f9bf7..0621eac22a2 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -206,7 +206,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?';
 // Complete urls for post treatment
 $ref = $REF = GETPOST('ref', 'alpha');
 $TAG = GETPOST("tag", 'alpha');
-$FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more informations
+$FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more information
 $SECUREKEY = GETPOST("securekey"); // Secure key
 
 if ($paymentmethod && !preg_match('/'.preg_quote('PM='.$paymentmethod, '/').'/', $FULLTAG)) {
@@ -383,7 +383,7 @@ if ($action == 'dopayment') {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
 			$action = '';
 			// } elseif (empty($EMAIL)) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-			// } elseif (! isValidEMail($EMAIL)) { $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
+			// } elseif (! isValidEmail($EMAIL)) { $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
 		} elseif (!$origfulltag) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
 			$action = '';
@@ -399,7 +399,7 @@ if ($action == 'dopayment') {
 				$PAYPAL_API_DEVISE = $currency;
 			}
 
-			// Show var initialized by include fo paypal lib at begin of this file
+			// Show var initialized by inclusion of paypal lib at start of this file
 			dol_syslog("Submit Paypal form", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_PASSWORD: ".preg_replace('/./', '*', $PAYPAL_API_PASSWORD), LOG_DEBUG); // No password into log files
@@ -423,7 +423,7 @@ if ($action == 'dopayment') {
 
 			dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 
-			// A redirect is added if API call successfull
+			// A redirect is added if API call successful
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
@@ -446,7 +446,7 @@ if ($action == 'dopayment') {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
 		} elseif (empty($email)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ONLINE_PAYMENT_SENDEMAIL"));
-		} elseif (!isValidEMail($email)) {
+		} elseif (!isValidEmail($email)) {
 			$mesg = $langs->trans("ErrorBadEMail", $email);
 		} elseif (!$origfulltag) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
@@ -517,7 +517,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 			$metadata = array(
 				'dol_version' => DOL_VERSION,
 				'dol_entity'  => $conf->entity,
-				'dol_company' => $mysoc->name, // Usefull when using multicompany
+				'dol_company' => $mysoc->name, // Useful when using multicompany
 				'dol_tax_num' => $vatnumber,
 				'ipaddress'=> getUserRemoteIP()
 			);
@@ -579,7 +579,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 						$charge = \Stripe\Charge::create(array(
 							'amount'   => price2num($amountstripe, 'MU'),
 							'currency' => $currency,
-							'capture'  => true, // Charge immediatly
+							'capture'  => true, // Charge immediately
 							'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
 							'metadata' => $metadata,
 							'customer' => $customer->id,
@@ -649,7 +649,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 					'customer' => $customer->id,
 					'amount'   => price2num($amountstripe, 'MU'),
 					'currency' => $currency,
-					'capture'  => true, // Charge immediatly
+					'capture'  => true, // Charge immediately
 					'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
 					'metadata' => $metadata,
 					'statement_descriptor' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
@@ -772,7 +772,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 			//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_payment');
 
 			// Get here amount and currency used for payment and force value into $amount and $currency so the real amount is saved into session instead
-			// of the amount and currency retreived from the POST.
+			// of the amount and currency retrieved from the POST.
 			if (!empty($paymentintent->currency) && !empty($paymentintent->amount)) {
 				$currency = strtoupper($paymentintent->currency);
 				$amount = $paymentintent->amount;
@@ -937,7 +937,7 @@ if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 
 print '<!-- Form to send a payment -->'."\n";
 print '<!-- creditor = '.dol_escape_htmltag($creditor).' -->'."\n";
-// Additionnal information for each payment system
+// Additional information for each payment system
 if (isModEnabled('paypal')) {
 	print '<!-- PAYPAL_API_SANDBOX = '.getDolGlobalString('PAYPAL_API_SANDBOX').' -->'."\n";
 	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.getDolGlobalString('PAYPAL_API_INTEGRAL_OR_PAYPALONLY').' -->'."\n";
@@ -2196,7 +2196,7 @@ print '<br>';
 
 
 // Add more content on page for some services
-if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
+if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payment mode
 	// Save some data for the paymentok
 	$remoteip = getUserRemoteIP();
 	$_SESSION["currencyCodeType"] = $currency;
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index ac61888b738..3df08fffe53 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -22,7 +22,7 @@
  *		\ingroup    core
  *		\brief      File to show page after a failed payment.
  *                  This page is called by payment system with url provided to it competed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
+ *                  This token can be used to get more information.
  */
 
 if (!defined('NOLOGIN')) {
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 81544107d0d..e6ca0ded986 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -24,9 +24,9 @@
  *     	\file       htdocs/public/payment/paymentok.php
  *		\ingroup    core
  *		\brief      File to show page after a successful payment on a payment line system.
- *					The payment was already really recorded. So an error here must send warning to admin but must still infor user that payment is ok.
+ *					The payment was already really recorded. So an error here must send warning to admin but must still info user that payment is ok.
  *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
- *                  This token and session can be used to get more informations.
+ *                  This token and session can be used to get more information.
  */
 
 if (!defined('NOLOGIN')) {
@@ -313,7 +313,7 @@ if (isModEnabled('paypal')) {
 				}
 			} else {
 				$ErrorCode = "SESSIONEXPIRED";
-				$ErrorLongMsg = "Session expired. Can't retreive PaymentType. Payment has not been validated.";
+				$ErrorLongMsg = "Session expired. Can't retrieve PaymentType. Payment has not been validated.";
 				$ErrorShortMsg = "Session expired";
 
 				dol_syslog($ErrorLongMsg, LOG_WARNING, 0, '_payment');
@@ -375,7 +375,7 @@ if (empty($FinalPaymentAmt)) {
 if (empty($currencyCodeType)) {
 	$currencyCodeType = $_SESSION['currencyCodeType'];
 }
-// Seems used onyl by Paypal
+// Seems used only by Paypal
 if (empty($paymentType)) {
 	$paymentType     = $_SESSION["paymentType"];
 }
@@ -521,7 +521,7 @@ if ($ispaymentok) {
 					}
 				}
 
-				// Subscription informations
+				// Subscription information
 				$datesubscription = $object->datevalid; // By default, the subscription start date is the payment date
 				if ($object->datefin > 0) {
 					$datesubscription = dol_time_plus_duree($object->datefin, 1, 'd');
@@ -554,7 +554,7 @@ if ($ispaymentok) {
 				$formatteddate = dol_print_date($paymentdate, 'dayhour', 'auto', $outputlangs);
 				$label = $langs->trans("OnlineSubscriptionPaymentLine", $formatteddate, $paymentmethod, $ipaddress, $TRANSACTIONID);
 
-				// Payment informations
+				// Payment information
 				$accountid = 0;
 				if ($paymentmethod == 'paybox') {
 					$accountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -705,7 +705,7 @@ if ($ispaymentok) {
 									}
 								} else {	// should not happen
 									$error++;
-									$errmsg = 'Failed to retreive paymentintent or charge from id';
+									$errmsg = 'Failed to retrieve paymentintent or charge from id';
 									dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
@@ -1107,7 +1107,7 @@ if ($ispaymentok) {
 					$paiement->amounts = array($object->id => $totalpaid); // Array with all payments dispatching with donation
 				} else {
 					// PaymentDonation does not support multi currency
-					$postactionmessages[] = 'Payment donation can\'t be payed with diffent currency than '.$conf->currency;
+					$postactionmessages[] = 'Payment donation can\'t be paid with different currency than '.$conf->currency;
 					$ispostactionok = -1;
 					$error++; // Not yet supported
 				}
@@ -1757,7 +1757,7 @@ if ($ispaymentok) {
 		}
 		// End call triggers
 	} elseif (get_class($object) == 'stdClass') {
-		//In some case $object is not instanciate (for paiement on custom object) We need to deal with payment
+		//In some case $object is not instantiate (for paiement on custom object) We need to deal with payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 		$paiement = new Paiement($db);
 		$result = $paiement->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 1a7dbbc644d..b3f553ba5b1 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -419,7 +419,7 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		$db->commit();
 
-		Header("Location: ".$urlback);
+		header("Location: ".$urlback);
 		exit;
 	} else {
 		$db->rollback();
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index bac61fbda67..d6d59113ab5 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -260,7 +260,7 @@ if (empty($reshook) && $action == 'add') {
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -330,7 +330,7 @@ if (empty($reshook) && $action == 'add') {
 					$thirdparty->fournisseur = 1;
 
 					// Load object modCodeFournisseur
-					$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 						$module = substr($module, 0, dol_strlen($module) - 4);
 					}
@@ -341,7 +341,7 @@ if (empty($reshook) && $action == 'add') {
 							break;
 						}
 					}
-					$modCodeFournisseur = new $module();
+					$modCodeFournisseur = new $module($db);
 					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
 						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
 					}
@@ -470,7 +470,7 @@ if (empty($reshook) && $action == 'add') {
 										$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 									}
 								}
-								Header("Location: ".$redirection);
+								header("Location: ".$redirection);
 								exit;
 							}*/
 						}
@@ -533,7 +533,7 @@ if (empty($reshook) && $action == 'add') {
 
 		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
-		Header("Location: ".$redirection);
+		header("Location: ".$redirection);
 		exit;
 	} else {
 		$db->rollback();
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index da8de48cde6..328ddffbc51 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -261,7 +261,7 @@ if (empty($reshook) && $action == 'add') {
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -330,7 +330,7 @@ if (empty($reshook) && $action == 'add') {
 					$thirdparty->fournisseur = 1;
 
 					// Load object modCodeFournisseur
-					$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 						$module = substr($module, 0, dol_strlen($module) - 4);
 					}
@@ -341,7 +341,7 @@ if (empty($reshook) && $action == 'add') {
 							break;
 						}
 					}
-					$modCodeFournisseur = new $module();
+					$modCodeFournisseur = new $module($db);
 					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
 						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
 					}
@@ -470,7 +470,7 @@ if (empty($reshook) && $action == 'add') {
 		$db->commit();
 		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
-		Header("Location: ".$redirection);
+		header("Location: ".$redirection);
 		exit;
 	} else {
 		$db->rollback();
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index e7fc6cc57ff..9e62d69cf6d 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -237,7 +237,7 @@ if ($event->type == 'payout.created') {
 			$bank_line_id_to = 0;
 			$result = 0;
 
-			// By default, electronic transfert from bank to bank
+			// By default, electronic transfer from bank to bank
 			$typefrom = 'PRE';
 			$typeto = 'VIR';
 
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 3b0d17bbf98..71639adc51b 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -107,7 +107,7 @@ This page is a sample of page using tables. It is designed to make test with<br>
 </div>
 
 
-<br><hr><br>Example 0a : Table with div+div+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
+<br><hr><br>Example 0a : Table with div+div+div containing a select that should be overflowed and truncated => Use this to align text or form<br>
 
 <div class="tagtable centpercent">
 	<div class="tagtr">
@@ -120,7 +120,7 @@ This page is a sample of page using tables. It is designed to make test with<br>
 	</div>
 </div>
 
-<br><hr><br>Example 0b: Table with div+form+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
+<br><hr><br>Example 0b: Table with div+form+div containing a select that should be overflowed and truncated => Use this to align text or form<br>
 
 <div class="tagtable centpercent">
 	<form action="xxx" method="POST" class="tagtr">
@@ -133,7 +133,7 @@ This page is a sample of page using tables. It is designed to make test with<br>
 	</form>
 </div>
 
-<br><hr><br>Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated => Use this to align text or form<br>
+<br><hr><br>Example 0c: Table with table+tr+td containing a select that should be overflowed and truncated => Use this to align text or form<br>
 
 <table class="centpercent">
 	<tr>
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index d24171680b0..29e726c9ae3 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -36,7 +36,7 @@ This page is a sample of page using Dolibarr HTML widget methods. It is designed
 <?php
 $form = new Form($db);
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 
 // Test1: form->selectDate using tzuser date
 print "Test 1a: We must have here current date and hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
@@ -66,7 +66,7 @@ print '<br><br>'."\n";
 
 // Test4a: a select
 print "Test 4a: a select<br>\n";
-$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3 with a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
 $selected = 3;
 print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 print '<br><br>';
diff --git a/htdocs/public/theme/common/nophotopublic.png b/htdocs/public/theme/common/nophotopublic.png
new file mode 100644
index 00000000000..8b052fe17ac
Binary files /dev/null and b/htdocs/public/theme/common/nophotopublic.png differ
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 27a47b0c126..51729081de9 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -157,7 +157,7 @@ if (empty($reshook)) {
 			// Search company saved with email
 			$searched_companies = $object->searchSocidByEmail($origin_email, '0');
 
-			// Chercher un contact existant avec cette adresse email
+			// Chercher un contact existent avec cette address email
 			// Le premier contact trouvé est utilisé pour déterminer le contact suivi
 			$contacts = $object->searchContactByEmail($origin_email);
 
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 8c3c3fadd57..a8acb98d303 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -178,7 +178,7 @@ if ($pageid == 'css') {   // No more used ?
 $refname = basename(dirname($original_file)."/");
 
 // Security:
-// Limite acces si droits non corrects
+// Limit access if permissions are insufficient
 if (!$accessallowed) {
 	accessforbidden();
 }
diff --git a/htdocs/public/website/javascript.js.php b/htdocs/public/website/javascript.js.php
index 7da5d3621d9..d592c94a6ae 100644
--- a/htdocs/public/website/javascript.js.php
+++ b/htdocs/public/website/javascript.js.php
@@ -128,7 +128,7 @@ $original_file = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity
 $refname = basename(dirname($original_file)."/");
 
 // Security:
-// Limite acces si droits non corrects
+// Limit access if permissions are insufficient
 if (!$accessallowed) {
 	accessforbidden();
 }
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index db63b396295..6bfb41ef180 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -128,7 +128,7 @@ $original_file = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity
 $refname = basename(dirname($original_file)."/");
 
 // Security:
-// Limite acces si droits non corrects
+// Limit access if permissions are insufficient
 if (!$accessallowed) {
 	accessforbidden();
 }
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 68851629917..0498c8d06bc 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -302,7 +302,7 @@ if (empty($reshook)) {
 		$object->size_units = GETPOST('size_units', 'int');
 		$object->weight_units = GETPOST('weight_units', 'int');
 
-		// On va boucler sur chaque ligne du document d'origine pour completer objet reception
+		// On va boucler sur chaque ligne du document d'origine pour completer object reception
 		// avec info diverses + qte a livrer
 
 		if ($object->origin == "supplierorder") {
@@ -316,7 +316,7 @@ if (empty($reshook)) {
 		$object->socid = $objectsrc->socid;
 		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 		$object->model_pdf = GETPOST('model');
-		$object->date_delivery = $date_delivery; // Date delivery planed
+		$object->date_delivery = $date_delivery; // Date delivery planned
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
 		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
@@ -1008,7 +1008,7 @@ if ($action == 'create') {
 					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
 				}
 
-				// If create form is coming from same page, it means that post was sent but an error occured
+				// If create form is coming from same page, it means that post was sent but an error occurred
 				if (preg_match('/^productl([0-9]+)$/i', $key, $reg)) {
 					$numAsked++;
 					$paramSuffix = $reg[1];
@@ -1101,7 +1101,7 @@ if ($action == 'create') {
 
 			$arrayofpurchaselinealreadyoutput= array();
 
-			// $_POST contains fk_commandefourndet_X_Y    where Y is num of product line and X is number of splitted line
+			// $_POST contains fk_commandefourndet_X_Y    where Y is num of product line and X is number of split lines
 			$indiceAsked = 1;
 			while ($indiceAsked <= $numAsked) {	// Loop on $dispatchLines. Warning: $dispatchLines must be sorted by fk_commandefourndet (it is a regroupment key on output)
 				$product = new Product($db);
@@ -1366,7 +1366,7 @@ if ($action == 'create') {
 
 	$formconfirm = '';
 
-	// Confirm deleteion
+	// Confirm deletion
 	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteReception'), $langs->trans("ConfirmDeleteReception", $object->ref), 'confirm_delete', '', 0, 1);
 	}
@@ -1397,7 +1397,7 @@ if ($action == 'create') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateReception'), $text, 'confirm_valid', '', 0, 1, 250);
 	}
 
-	// Confirm cancelation
+	// Confirm cancellation
 	if ($action == 'annuler') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelReception'), $langs->trans("ConfirmCancelReception", $object->ref), 'confirm_cancel', '', 0, 1);
 	}
@@ -1970,7 +1970,7 @@ if ($action == 'create') {
 					print '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
 					// Warehouse source
 					print '<td>'.$formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
-					// Batch number managment
+					// Batch number management
 					if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch)) {
 						print '<td class="nowraponall left"><input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"><br>';
 						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
@@ -1991,7 +1991,7 @@ if ($action == 'create') {
 					print '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
 					// Warehouse source
 					print '<td></td>';
-					// Batch number managment
+					// Batch number management
 					print '<td></td>';
 					print '</tr>';
 				}
@@ -2015,7 +2015,7 @@ if ($action == 'create') {
 				}
 			}
 
-			// Batch number managment
+			// Batch number management
 			if (isModEnabled('productbatch')) {
 				if (isset($lines[$i]->batch)) {
 					print '<!-- Detail of lot -->';
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 976f3f396ec..6255b18d722 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -55,7 +55,7 @@ class Receptions extends DolibarrApi
 	/**
 	 * Get properties of a reception object
 	 *
-	 * Return an array with reception informations
+	 * Return an array with reception information
 	 *
 	 * @param       int         $id         ID of reception
 	 * @return		Object					Object with cleaned properties
@@ -93,7 +93,7 @@ class Receptions extends DolibarrApi
 	 * @param int			   $page				Page number
 	 * @param string		   $thirdparty_ids		Thirdparty ids to filter receptions of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of reception objects
 	 *
 	 * @throws RestException
@@ -187,7 +187,7 @@ class Receptions extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->reception->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -442,7 +442,7 @@ class Receptions extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->reception->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index dab334d6042..a24bb2814d0 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -30,7 +30,7 @@
 /**
  *  \file       htdocs/reception/class/reception.class.php
  *  \ingroup    reception
- *  \brief      Fichier de la classe de gestion des receptions
+ *  \brief      File for class to manage receptions
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -97,7 +97,7 @@ class Reception extends CommonObject
 	public $size_units;
 	public $user_author_id;
 
-	public $date_delivery; // Date delivery planed
+	public $date_delivery; // Date delivery planned
 
 	/**
 	 * @var integer|string Effective delivery date
@@ -207,7 +207,7 @@ class Reception extends CommonObject
 	/**
 	 *  Create reception en base
 	 *
-	 *  @param	User	$user       Objet du user qui cree
+	 *  @param	User	$user       Object du user qui cree
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				Return integer <0 si erreur, id reception creee si ok
 	 */
@@ -414,7 +414,7 @@ class Reception extends CommonObject
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
 				$this->date = $this->db->jdate($obj->date_reception); // TODO deprecated
 				$this->date_reception = $this->db->jdate($obj->date_reception); // Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
+				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planned
 				$this->model_pdf            = $obj->model_pdf;
 				$this->shipping_method_id = $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
@@ -546,7 +546,7 @@ class Reception extends CommonObject
 			$error++;
 		}
 
-		// If stock increment is done on reception (recommanded choice)
+		// If stock increment is done on reception (recommended choice)
 		if (!$error && isModEnabled('stock') && getDolGlobalInt('STOCK_CALCULATE_ON_RECEPTION')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -814,14 +814,14 @@ class Reception extends CommonObject
 	 * @param 	int			$id					Id of source line (supplier order line)
 	 * @param 	int			$qty				Quantity
 	 * @param	array		$array_options		extrafields array
-	 * @param	string		$comment				Comment for stock movement
-	 * @param	integer		$eatby					eat-by date
-	 * @param	integer		$sellby					sell-by date
-	 * @param	string		$batch					Lot number
+	 * @param	string		$comment			Comment for stock movement
+	 * @param	int			$eatby				eat-by date
+	 * @param	int			$sellby				sell-by date
+	 * @param	string		$batch				Lot number
 	 * @param	double		$cost_price			Line cost
 	 * @return	int							Return integer <0 if KO, index of line if OK
 	 */
-	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $cost_price = 0)
+	public function addline($entrepot_id, $id, $qty, $array_options = [], $comment = '', $eatby = null, $sellby = null, $batch = '', $cost_price = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -1416,7 +1416,7 @@ class Reception extends CommonObject
 		$order = new CommandeFournisseur($this->db);
 		$order->initAsSpecimen();
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -1457,7 +1457,7 @@ class Reception extends CommonObject
 	/**
 	 *	Set the planned delivery date
 	 *
-	 *	@param      User			$user        		Objet utilisateur qui modifie
+	 *	@param      User			$user        		Object utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
@@ -1516,7 +1516,7 @@ class Reception extends CommonObject
 	 *  @param  int      $id     only this carrier, all if none
 	 *  @return void
 	 */
-	public function list_delivery_methods($id = '')
+	public function list_delivery_methods($id = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -1526,7 +1526,7 @@ class Reception extends CommonObject
 
 		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		if ($id != '') {
+		if (!empty($id)) {
 			$sql .= " WHERE em.rowid = ".((int) $id);
 		}
 
@@ -1718,7 +1718,7 @@ class Reception extends CommonObject
 	}
 
 	/**
-	 *	Classify the reception as invoiced (used for exemple by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
+	 *	Classify the reception as invoiced (used for example by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
 	 *
 	 *	@return     int     Return integer <0 if ko, >0 if ok
 	 */
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index b56211933dd..bc1cc4fb1ab 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -21,7 +21,7 @@
 /**
  *  \file       htdocs/reception/class/receptionstats.class.php
  *  \ingroup    reception
- *  \brief      File of class fo tmanage reception statistics
+ *  \brief      File of class to manage reception statistics
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 06a0d69ff82..ef28514f1fd 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -243,7 +243,7 @@ if (empty($reshook)) {
 
 			$objecttmp = new FactureFournisseur($db);
 			if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
-				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
+				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we reuse it.
 				$objecttmp = $TFactThird[$rcp->socid];
 
 				// Add all links of this new reception to the existing invoice
@@ -251,7 +251,7 @@ if (empty($reshook)) {
 				$rcp->fetchObjectLinked();
 				if (count($rcp->linkedObjectsIds['order_supplier']) > 0) {
 					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value) {
-						if (empty($objecttmp->linkedObjectsIds['order_supplier']) || !in_array($value, $objecttmp->linkedObjectsIds['order_supplier'])) { //Dont try to link if already linked
+						if (empty($objecttmp->linkedObjectsIds['order_supplier']) || !in_array($value, $objecttmp->linkedObjectsIds['order_supplier'])) { //Don't try to link if already linked
 							$objecttmp->add_object_linked('order_supplier', $value); // add supplier order linked object
 						}
 					}
@@ -1311,7 +1311,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 
-		// Date delivery planed
+		// Date delivery planned
 		if (!empty($arrayfields['e.date_delivery']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->delivery_date), "day");
diff --git a/htdocs/recruitment/class/api_recruitments.class.php b/htdocs/recruitment/class/api_recruitments.class.php
index b68fe8602db..88c7c54488e 100644
--- a/htdocs/recruitment/class/api_recruitments.class.php
+++ b/htdocs/recruitment/class/api_recruitments.class.php
@@ -64,7 +64,7 @@ class Recruitments extends DolibarrApi
 	/**
 	 * Get properties of a jobposition object
 	 *
-	 * Return an array with jobposition informations
+	 * Return an array with jobposition information
 	 *
 	 * @param	int			$id		ID of jobposition
 	 * @return  Object				Object with cleaned properties
@@ -95,7 +95,7 @@ class Recruitments extends DolibarrApi
 	/**
 	 * Get properties of a candidature object
 	 *
-	 * Return an array with candidature informations
+	 * Return an array with candidature information
 	 *
 	 * @param	int		$id		ID of candidature
 	 * @return  Object          Object with cleaned properties
@@ -134,7 +134,7 @@ class Recruitments extends DolibarrApi
 	 * @param int			   $limit				Limit for list
 	 * @param int			   $page				Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -328,7 +328,7 @@ class Recruitments extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->jobposition->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -366,7 +366,7 @@ class Recruitments extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->jobposition->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -414,7 +414,7 @@ class Recruitments extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->jobposition->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -463,7 +463,7 @@ class Recruitments extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->candidature->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 5505f6682d1..3dc1ff59e3d 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -89,7 +89,7 @@ class RecruitmentCandidature extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -165,7 +165,7 @@ class RecruitmentCandidature extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -209,10 +209,10 @@ class RecruitmentCandidature extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -435,10 +435,10 @@ class RecruitmentCandidature extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -446,11 +446,11 @@ class RecruitmentCandidature extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -461,10 +461,10 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -492,7 +492,7 @@ class RecruitmentCandidature extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -705,7 +705,7 @@ class RecruitmentCandidature extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -995,7 +995,7 @@ class RecruitmentCandidature extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1122,7 +1122,7 @@ class RecruitmentCandidatureLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index dba9c86ef5f..44fe7f53501 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -95,7 +95,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -186,7 +186,7 @@ class RecruitmentJobPosition extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -230,10 +230,10 @@ class RecruitmentJobPosition extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -450,10 +450,10 @@ class RecruitmentJobPosition extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -461,11 +461,11 @@ class RecruitmentJobPosition extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -476,10 +476,10 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -507,7 +507,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -783,7 +783,7 @@ class RecruitmentJobPosition extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -1052,7 +1052,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 133720a1b8c..3a1e94ca061 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -318,7 +318,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 						$contactobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 6a7030d5882..fda2b7165d8 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPosition
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -157,7 +157,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		}
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
@@ -620,7 +620,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 						$curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
 
 
 
@@ -1090,18 +1090,18 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		);
 
 		/*
-		 * For exemple
+		 * For example
 		$this->cols['theColKey'] = array(
 			'rank' => $rank, // int : use for ordering columns
 			'width' => 20, // the column width in mm
 			'title' => array(
 				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				'label' => ' ', // the final label : used fore final generated text
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 			'content' => array(
-				'align' => 'L', // text alignement :  R,C,L
+				'align' => 'L', // text alignment :  R,C,L
 				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 		);
@@ -1114,7 +1114,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			'width' => false, // only for desc
 			'status' => true,
 			'title' => array(
-				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'textkey' => 'Designation', // use lang key is useful in somme case with module
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index bb6e9fbc2fe..a269bc61683 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -113,7 +113,7 @@ function recruitmentjobpositionPrepareHead($object)
 /**
  * Return string with full Url
  *
- * @param   int		$mode		      0=True url, 1=Url formated with colors
+ * @param   int		$mode		      0=True url, 1=Url formatted with colors
  * @param	string	$ref		      Ref of object
  * @param   int     $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index f3f5164c0c7..f812dd447d3 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -56,7 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -348,7 +348,7 @@ if (($id || $ref) && $action == 'edit') {
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
-	$head = recruitmentcandidaturePrepareHead($object);
+	$head = recruitmentCandidaturePrepareHead($object);
 	print dol_get_fiche_head($head, 'card', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
 
 	$formconfirm = '';
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 68598edbb26..a5279acd2ee 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -82,7 +82,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -609,7 +609,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 38fc5f1cc4b..49f54fcfe6f 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -55,7 +55,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index d93f5cb8a47..f6ba521599e 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -55,7 +55,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 622b6aab64e..244bb711e18 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -78,7 +78,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -449,7 +449,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index cba1ab1d2c0..3783f0de394 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -112,7 +112,7 @@ if (empty($reshook)) {
 				if ($result > 0) {
 					// Creation OK
 					setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
-					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				} else {
 					// Creation KO
@@ -121,7 +121,7 @@ if (empty($reshook)) {
 				}
 			}
 		} else {
-			Header("Location: list.php");
+			header("Location: list.php");
 			exit;
 		}
 	}
@@ -150,7 +150,7 @@ if (empty($reshook)) {
 
 				$result = $object->update($user);
 				if ($result > 0) {
-					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 9fc546e0802..92097ca3e1f 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -98,7 +98,7 @@ class Dolresource extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param	DoliDb		$db      Database handler
+	 *  @param	DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -669,13 +669,13 @@ class Dolresource extends CommonObject
 	 * @param string    $element        Element
 	 * @param int       $element_id     Id
 	 * @param string    $resource_type  Type
-	 * @return array                    Aray of resources
+	 * @return array                    Array of resources
 	 */
 	public function getElementResources($element, $element_id, $resource_type = '')
 	{
 		$resources = array();
 
-		// Links beetween objects are stored in this table
+		// Links between objects are stored in this table
 		$sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources';
 		$sql .= " WHERE element_id=".((int) $element_id)." AND element_type='".$this->db->escape($element)."'";
@@ -799,7 +799,7 @@ class Dolresource extends CommonObject
 	 *
 	 *	@param      int		$withpicto					Add picto into link
 	 *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
-	 *	@param      string	$get_params    				Parametres added to url
+	 *	@param      string	$get_params    				Parameters added to url
 	 *	@param		int  	$notooltip					1=Disable tooltip
 	 *  @param  	string  $morecss                    Add more css on link
 	 *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -904,7 +904,7 @@ class Dolresource extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge indicateurs this->nb de tableau de bord
+	 *      Load indicators this->nb for state board
 	 *
 	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 7222264b939..2d4d3b96b3f 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -164,7 +164,7 @@ class FormResource
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Return html list of tickets type // TODO translate PHPDoc to english
+	 *  Return html list of tickets type
 	 *
 	 *  @param	string	$selected       Id du type pre-selectionne
 	 *  @param  string	$htmlname       Nom de la zone select
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 75cf03d1bb8..77e81696d8f 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -192,7 +192,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// Update ressource
+	// Update resource
 	if ($action == 'update_linked_resource' && $user->hasRight('resource', 'write') && !GETPOST('cancel', 'alpha')) {
 		$res = $object->fetch_element_resource($lineid);
 		if ($res) {
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 19092a8383d..89442fa0b4c 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1001,7 +1001,7 @@ if ($id > 0) {
 		$i = 0;
 		$total = 0;
 
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="noborder paymenttable">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("RefPayment").'</td>';
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 787d794a240..27db76ba07e 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -162,7 +162,7 @@ class PaymentSalary extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User	$user   				User making payment
-	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
+	 *	@param		int		$closepaidcontrib   	1=Also close paid contributions to paid, 0=Do nothing more
 	 *  @return     int     						Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user, $closepaidcontrib = 0)
@@ -181,7 +181,7 @@ class PaymentSalary extends CommonObject
 			$this->datep = $this->datepaye;
 		}
 
-		// Validate parametres
+		// Validate parameters
 		if (empty($this->datep)) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentSalary';
 			return -1;
@@ -252,7 +252,7 @@ class PaymentSalary extends CommonObject
 						$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
 					}
 
-					// If we want to closed payed invoices
+					// If we want to closed paid invoices
 					if ($closepaidcontrib) {
 						$tmpsalary = new Salary($this->db);
 						$tmpsalary->fetch($salary_id);
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index a1e701ed87e..fc687add5ea 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -20,13 +20,13 @@
 /**
  *  \file       htdocs/salaries/class/salariesstats.class.php
  *  \ingroup    salaries
- *  \brief      File of class for statistics on salaries
+ *  \brief      File of class to manage salary statistics
  */
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
 include_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 
 /**
- *	Classe permettant la gestion des stats des salaires
+ *	Class to manage salary statistics
  */
 class SalariesStats extends Stats
 {
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index e04f4430225..43fac6af89f 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -293,7 +293,7 @@ class Salary extends CommonObject
 	 *  Delete object in database
 	 *
 	 *	@param	User	$user       User that delete
-	 *  @param  bool 	$notrigger 	false=launch triggers after, true=disable triggers
+	 *  @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
@@ -676,7 +676,7 @@ class Salary extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Tag social contribution as payed completely
+	 *    Tag social contribution as paid completely
 	 *
 	 *	  @deprecated
 	 *    @see setPaid()
@@ -691,7 +691,7 @@ class Salary extends CommonObject
 	}
 
 	/**
-	 *    Tag social contribution as payed completely
+	 *    Tag social contribution as paid completely
 	 *
 	 *    @param    User    $user       Object user making change
 	 *    @return   int					Return integer <0 if KO, >0 if OK
@@ -714,7 +714,7 @@ class Salary extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Remove tag payed on social contribution
+	 *    Remove tag paid on social contribution
 	 *
 	 *    @param	User	$user       Object user making change
 	 *    @return	int					Return integer <0 if KO, >0 if OK
@@ -741,7 +741,7 @@ class Salary extends CommonObject
 	 * Return label of current status
 	 *
 	 * @param	int			$mode       	0=label long, 1=labels short, 2=Picto + Label short, 3=Picto, 4=Picto + Label long, 5=Label short + Picto
-	 * @param   double		$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 * @param   double		$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
 	 * @return  string						Label
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -755,7 +755,7 @@ class Salary extends CommonObject
 	 *
 	 *  @param	int		$status        	Id status
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
 	 *  @return string        			Label
 	 */
 	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 64b82b4e8f2..89dc0b6927c 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -100,7 +100,7 @@ $filtre = GETPOST("filtre", 'restricthtml');
 
 $childids = $user->getAllChildIds(1);
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -476,7 +476,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index bdf21475a77..d5aff1dd250 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -194,7 +194,7 @@ print dol_get_fiche_end();
 
 
 /*
- * List of salaries payed
+ * List of salaries paid
  */
 
 $disable_delete = 0;
@@ -213,7 +213,7 @@ if ($resql) {
 	$total = 0;
 	print '<br>';
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Salary').'</td>';
@@ -239,7 +239,7 @@ if ($resql) {
 			print '<td class="right">'.price($objp->sc_amount).'</td>';
 			// Status
 			print '<td class="center">'.$salary->getLibStatut(4, $objp->amount).'</td>';
-			// Amount payed
+			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paye == 1) {
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 1c347efa4cd..c80070c78dd 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -115,7 +115,7 @@ if (!GETPOST('search_type_id', 'int')) {
 
 $childids = $user->getAllChildIds(1);
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index 59f82b9880f..e787a889e46 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 
 $permissiontoread = $user->rights->salaries->read;
 $permissiontoadd = $user->rights->salaries->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
-$permissiontodelete = $user->rights->salaries->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissiontodelete = $user->rights->salaries->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_UNPAID);
 
 $moreparam = '';
 if ($type == 'bank-transfer') {
@@ -369,7 +369,7 @@ if ($resql) {
 	$i = 0;
 	$total = 0;
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder paymenttable">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("RefPayment").'</td>';
@@ -481,7 +481,7 @@ if ($object->paye == 0 && $hadRequest == 0) {
 			print '</form>';
 
 			if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT_SHOW_OLD_BUTTON')) {	// This is hidden, prefer to use mode enabled with STRIPE_SEPA_DIRECT_DEBIT
-				// TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediatly..."
+				// TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediately..."
 				print "<br>";
 				//add stripe sepa button
 				$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 3095e18f2b1..66f7c413f19 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -223,7 +223,7 @@ if ($action == "setvatinlist") {
 	}
 }
 
-//Activate Set adress in list
+//Activate Set address in list
 if ($action == "setaddadressinlist") {
 	$val = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index ac7d894b36b..0ca0079270a 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -19,11 +19,11 @@
 /**
  *	\file       htdocs/societe/canvas/actions_card_common.class.php
  *	\ingroup    thirdparty
- *	\brief      Fichier de la classe Thirdparty card controller (common)
+ *	\brief      File for the abstract class to manage third parties
  */
 
 /**
- *	Classe permettant la gestion des tiers par defaut
+ *	Abstract class to manage third parties
  */
 abstract class ActionsCardCommon
 {
@@ -153,7 +153,7 @@ abstract class ActionsCardCommon
 			}
 
 			// Load object modCodeClient
-			$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -253,13 +253,13 @@ abstract class ActionsCardCommon
 			}
 
 			// VAT
-			$this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
+			$this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par default en creation
 
 			// Select users
 			$this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
 			// Local Tax
-			// TODO mettre dans une classe propre au pays
+			// TODO Implement country specific action in country specific class
 			if ($mysoc->country_code == 'ES') {
 				$this->tpl['localtax'] = '';
 
@@ -357,7 +357,7 @@ abstract class ActionsCardCommon
 			}
 
 			// Local Tax
-			// TODO mettre dans une classe propre au pays
+			// TODO Implement country specific action in country specific class
 			if ($mysoc->country_code == 'ES') {
 				$this->tpl['localtax'] = '';
 
@@ -396,7 +396,7 @@ abstract class ActionsCardCommon
 		$this->object->code_client			= GETPOST("code_client");
 		$this->object->fournisseur			= GETPOST("fournisseur");
 		$this->object->code_fournisseur = GETPOST("code_fournisseur");
-		$this->object->address = GETPOST("adresse");
+		$this->object->address = GETPOST("address");
 		$this->object->zip = GETPOST("zipcode");
 		$this->object->town					= GETPOST("town");
 		$this->object->country_id = GETPOST("country_id") ? GETPOST("country_id") : $mysoc->country_id;
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index cd95285d75b..f5d533ceeab 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -34,7 +34,7 @@ class ActionsCardCompany extends ActionsCardCommon
 	/**
 	 *    Constructor
 	 *
-	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	DoliDB	$db				Handler access base de donnees
 	 *    @param	string	$dirmodule		Name of directory of module
 	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
 	 *    @param	string	$canvas			Name of canvas
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 97a2e490ac4..b18f0b31ec2 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -114,7 +114,7 @@ if (isModEnabled('barcode')) { ?>
 
 <tr>
 	<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
-	<td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
+	<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
 </tr>
 
 <tr>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index c928d1e2514..651a9cc180d 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -129,7 +129,7 @@ if (isModEnabled('barcode')) { ?>
 
 <tr>
 	<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
-	<td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
+	<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
 </tr>
 
 <tr>
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 376dbefa1bf..4778cf7f4f0 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -18,7 +18,7 @@
 /**
  *	\file       htdocs/societe/canvas/individual/actions_card_individual.class.php
  *	\ingroup    thirdparty
- *	\brief      Fichier de la classe Thirdparty card controller (individual canvas)
+ *	\brief      File for class for Thirdparty card controller with individual canvas
  */
 include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
 
@@ -33,7 +33,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 	/**
 	 *    Constructor
 	 *
-	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	DoliDB	$db				Handler access base de donnees
 	 *    @param	string	$dirmodule		Name of directory of module
 	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
 	 *    @param	string	$canvas			Name of canvas
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 8ed547f7ecd..e46721b167c 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -122,7 +122,7 @@ if (isModEnabled('barcode')) { ?>
 
 <tr>
 	<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
-	<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
+	<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
 </tr>
 
 <tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index e86d2376896..9c53ad5b3d8 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -126,7 +126,7 @@ if ($this->control->tpl['fournisseur']) {
 
 <tr>
 	<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
-	<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
+	<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
 </tr>
 
 <tr>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b2e1d90266d..dc9bfbf3c3e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -430,7 +430,7 @@ if (empty($reshook)) {
 
 			// Check parameters
 			if (!GETPOST('cancel', 'alpha')) {
-				if (!empty($object->email) && !isValidEMail($object->email)) {
+				if (!empty($object->email) && !isValidEmail($object->email)) {
 					$langs->load("errors");
 					$error++;
 					setEventMessages($langs->trans("ErrorBadEMail", $object->email), null, 'errors');
@@ -905,7 +905,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		// Load object modCodeTiers
-		$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 			$module = substr($module, 0, dol_strlen($module) - 4);
 		}
@@ -916,9 +916,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeClient = new $module();
+		$modCodeClient = new $module($db);
 		// Load object modCodeFournisseur
-		$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 			$module = substr($module, 0, dol_strlen($module) - 4);
 		}
@@ -929,7 +929,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeFournisseur = new $module();
+		$modCodeFournisseur = new $module($db);
 
 		// Define if customer/prospect or supplier status is set or not
 		if (GETPOST("type", 'aZ') != 'f') {
@@ -1106,7 +1106,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
                         	$("#typent_id").change();
                         	$("#effectif_id").val(id_ef15);
                         	$("#effectif_id").change();
-							/* Force to recompute the width of a select2 field when it was hidden and then shown programatically */
+							/* Force to recompute the width of a select2 field when it was hidden and then shown programmatically */
 							if ($("#civility_id").data("select2")) {
 								$("#civility_id").select2({width: "resolve"});
 							}
@@ -1557,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1800,7 +1800,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$head = societe_prepare_head($object);
 
 			// Load object modCodeTiers
-			$module = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON', 'mod_codeclient_leopard');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index dd38649b545..ba9d77715eb 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -112,7 +112,7 @@ if (!$vatNumber) {
 		$messagetoshow = $result['faultstring'];
 	} elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
 	|| ($result['requestDate'] && !$result['valid'])) {
-		// Syntaxe ko
+		// Syntax ko
 		if ($result['requestDate']) {
 			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		}
@@ -120,7 +120,7 @@ if (!$vatNumber) {
 		print $langs->trans("ValueIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
 	} else {
-		// Syntaxe ok
+		// Syntax ok
 		if ($result['requestDate']) {
 			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 3d37b274d99..a501ccb8c62 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -60,7 +60,7 @@ class Contacts extends DolibarrApi
 	/**
 	 * Get properties of a contact object
 	 *
-	 * Return an array with contact informations
+	 * Return an array with contact information
 	 *
 	 * @param	int    $id                  ID of contact
 	 * @param   int    $includecount        Count and return also number of elements the contact is used as a link for
@@ -166,7 +166,7 @@ class Contacts extends DolibarrApi
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param int       $includecount       Count and return also number of elements the contact is used as a link for
 	 * @param int		$includeroles        Includes roles of the contact
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                        Array of contact objects
 	 *
 	 * @throws RestException
@@ -284,7 +284,7 @@ class Contacts extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->contact->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -333,7 +333,7 @@ class Contacts extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->contact->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 9604137ed10..c9adc61efb5 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -66,7 +66,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Get properties of a thirdparty object
 	 *
-	 * Return an array with thirdparty informations
+	 * Return an array with thirdparty information
 	 *
 	 * @param	int		$id				Id of third party to load
 	 * @return  Object					Object with cleaned properties
@@ -81,7 +81,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Get properties of a thirdparty object by email.
 	 *
-	 * Return an array with thirdparty informations
+	 * Return an array with thirdparty information
 	 *
 	 * @param string    $email  Email of third party to load
 	 * @return array|mixed Cleaned Societe object
@@ -98,7 +98,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Get properties of a thirdparty object by barcode.
 	 *
-	 * Return an array with thirdparty informations
+	 * Return an array with thirdparty information
 	 *
 	 * @param string    $barcode  Barcode of third party to load
 	 * @return array|mixed Cleaned Societe object
@@ -127,7 +127,7 @@ class Thirdparties extends DolibarrApi
 	 *								Set to 4 to show only suppliers
 	 * @param	int		$category   Use this param to filter list by category
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "((t.nom:like:'TheCompany%') or (t.name_alias:like:'TheCompany%')) and (t.datec:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of thirdparty objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $properties = '')
@@ -252,7 +252,7 @@ class Thirdparties extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->company->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -297,7 +297,7 @@ class Thirdparties extends DolibarrApi
 				continue;
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->company->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -967,7 +967,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Return list of invoices qualified to be corrected by a credit note.
 	 * Invoices matching the following rules are returned
-	 * (validated + payment on process) or classified (paid completely or paid partialy) + not already replaced + not already a credit note
+	 * (validated + payment on process) or classified (paid completely or paid partially) + not already replaced + not already a credit note
 	 *
 	 * @param int   $id             Id of thirdparty
 	 *
@@ -1105,7 +1105,7 @@ class Thirdparties extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->company->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -1161,7 +1161,7 @@ class Thirdparties extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$account->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -1411,7 +1411,7 @@ class Thirdparties extends DolibarrApi
 
 			foreach ($request_data as $field => $value) {
 				if ($field === 'caller') {
-					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 					$account->context['caller'] = $request_data['caller'];
 					continue;
 				}
@@ -1474,7 +1474,7 @@ class Thirdparties extends DolibarrApi
 
 			foreach ($request_data as $field => $value) {
 				if ($field === 'caller') {
-					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 					$account->context['caller'] = $request_data['caller'];
 					continue;
 				}
@@ -1513,7 +1513,7 @@ class Thirdparties extends DolibarrApi
 
 			foreach ($request_data as $field => $value) {
 				if ($field === 'caller') {
-					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 					$account->context['caller'] = $request_data['caller'];
 					continue;
 				}
@@ -1575,7 +1575,7 @@ class Thirdparties extends DolibarrApi
 
 			foreach ($request_data as $field => $value) {
 				if ($field === 'caller') {
-					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 					$account->context['caller'] = $request_data['caller'];
 					continue;
 				}
@@ -1738,9 +1738,9 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Fetch properties of a thirdparty object.
 	 *
-	 * Return an array with thirdparty informations
+	 * Return an array with thirdparty information
 	 *
-	 * @param    int	$rowid      Id of third party to load (Use 0 to get a specimen record, use null to use other search criterias)
+	 * @param    int	$rowid      Id of third party to load (Use 0 to get a specimen record, use null to use other search criteria)
 	 * @param    string	$ref        Reference of third party, name (Warning, this can return several records)
 	 * @param    string	$ref_ext    External reference of third party (Warning, this information is a free field not provided by Dolibarr)
 	 * @param    string	$barcode    Barcode of third party to load
@@ -1781,8 +1781,8 @@ class Thirdparties extends DolibarrApi
 		}
 
 		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
 			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 37e63bba1d6..55e35cc55dc 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -66,7 +66,7 @@ class CompanyBankAccount extends Account
 	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -262,7 +262,7 @@ class CompanyBankAccount extends Account
 
 		$error = 0;
 
-		// Check paramaters
+		// Check parameters
 		if (empty($this->socid)) {
 			$this->error = 'BadValueForParameter';
 			$this->errors[] = $this->error;
@@ -415,7 +415,7 @@ class CompanyBankAccount extends Account
 	 *	@param	int		$id			Id of record
 	 * 	@param	int		$socid		Id of company. If this is filled, function will return the first entry found (matching $default and $type)
 	 *  @param	int		$default	If id of company filled, we say if we want first record among all (-1), default record (1) or non default record (0)
-	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
+	 *  @param	string	$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index c8e4d1b95d6..0c4f32536ec 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France     <frederic.france@netlogic.fr>
  *
  * 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
@@ -70,7 +70,7 @@ class CompanyPaymentMode extends CommonObject
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -212,7 +212,7 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -232,10 +232,10 @@ class CompanyPaymentMode extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$idpayment = $this->createCommon($user, $notrigger);
 
@@ -338,10 +338,10 @@ class CompanyPaymentMode extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -349,17 +349,17 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -431,7 +431,7 @@ class CompanyPaymentMode extends CommonObject
 	 * Set a Payment mode as Default
 	 *
 	 * @param   int     $id    		Payment mode ID
-	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
+	 * @param	int 	$alltypes	1=The default is for all payment types instead of per type
 	 * @return  int             	0 if KO, 1 if OK
 	 */
 	public function setAsDefault($id = 0, $alltypes = 0)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f4309ce0e31..bbf4d2008ad 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -171,7 +171,7 @@ class Societe extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -880,7 +880,7 @@ class Societe extends CommonObject
 
 	/**
 	 *    Create third party in database.
-	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
+	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignment.
 	 *
 	 *    @param	User	$user           Object of user that ask creation
 	 *    @param    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
@@ -1070,7 +1070,7 @@ class Societe extends CommonObject
 	 * Create a contact/address from thirdparty
 	 *
 	 * @param 	User	$user		    Object user
-	 * @param 	int		$no_email	    1=Do not send mailing, 0=Ok to recieve mailling
+	 * @param 	int		$no_email	    1=Do not send mailing, 0=Ok to receive mailing
 	 * @param 	array	$tags		    Array of tag to affect to contact
 	 * @param   int     $notrigger	    1=Does not execute triggers, 0= execute triggers
 	 * @return 	int					    Return integer <0 if KO, >0 if OK
@@ -1239,7 +1239,7 @@ class Societe extends CommonObject
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL') {
 					// Check for mandatory
-					if (getDolGlobalString('SOCIETE_EMAIL_MANDATORY') && !isValidEMail($this->email)) {
+					if (getDolGlobalString('SOCIETE_EMAIL_MANDATORY') && !isValidEmail($this->email)) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
@@ -2208,7 +2208,7 @@ class Societe extends CommonObject
 				return -1;
 			}
 		} else {
-			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+			dol_syslog("Can't remove thirdparty with id ".$id.". There are ".$objectisused." children", LOG_WARNING);
 		}
 		return 0;
 	}
@@ -2386,7 +2386,7 @@ class Societe extends CommonObject
 	 *    	@param	float	$remise     		Amount of discount
 	 *    	@param  User	$user       		User adding discount
 	 *    	@param  string	$desc				Reason of discount
-	 *      @param  string	$vatrate     		VAT rate (may contain the vat code too). Exemple: '1.23', '1.23 (ABC)', ...
+	 *      @param  string	$vatrate     		VAT rate (may contain the vat code too). Example: '1.23', '1.23 (ABC)', ...
 	 *      @param	int		$discount_type		0 => customer discount, 1 => supplier discount
 	 *      @param	string	$price_base_type	Price base type 'HT' or 'TTC'
 	 *		@return	int							Return integer <0 if KO, id of discount record if OK
@@ -3090,7 +3090,7 @@ class Societe extends CommonObject
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (!empty($this->phone)) {	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (!empty($this->phone)) {	// If a phone of thirdparty is defined, we add it to mobile of contacts
 			if (empty($this->name)) {
 				$this->name = $this->nom;
 			}
@@ -3726,7 +3726,7 @@ class Societe extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Returns if a profid sould be verified to be unique
+	 *  Returns if a profid should be verified to be unique
 	 *
 	 *  @param	int		$idprof		1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6)
 	 *  @return boolean         	true if the ID must be unique
@@ -3827,8 +3827,8 @@ class Societe extends CommonObject
 	/**
 	 *  Check the validity of a professional identifier according to the country of the company (siren, siret, ...)
 	 *
-	 *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
-	 *  @param  Societe		$soc            Objet societe
+	 *  @param	int			$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+	 *  @param  Societe		$soc            Object societe
 	 *  @return int             			Return integer <=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
@@ -3857,118 +3857,23 @@ class Societe extends CommonObject
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
-		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'ES') {
-			$string = trim($this->idprof1);
-			$string = preg_replace('/(\s)/', '', $string);
-			$string = strtoupper($string);
-
-			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
-				return 0;
-			}
-
-			$num = array();
-			for ($i = 0; $i < 9; $i++) {
-				$num[$i] = substr($string, $i, 1);
-			}
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1)) {
-					return 1;
-				} else {
-					return -1;
-				}
-			}
-
-			//algorithm checking type code CIF
-			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2) {
-				$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
-			}
-			$n = 10 - substr($sum, strlen($sum) - 1, 1);
-
-			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string)) {
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1)) {
-					return 1;
-				} else {
-					return -1;
-				}
-			}
-
-			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1)) {
-					return 2;
-				} else {
-					return -2;
-				}
-			}
-
-			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string)) {
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string)) {
-					return 3;
-				} else {
-					return -3;
-				}
-			}
-
-			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string)) {
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1)) {
-					return 3;
-				} else {
-					return -3;
-				}
-			}
-
-			//Can not be verified
-			return -4;
+			return isValidTinForES($this->idprof1);
 		}
 
 		//Verify NIF if country is PT
-		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'PT') {
-			$string = trim($this->idprof1);
-			$string = preg_replace('/(\s)/', '', $string);
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{9}$)/', $string)) {
-				return 1;
-			} else {
-				return -1;
-			}
+		if ($idprof == 1 && $soc->country_code == 'PT' && !isValidTinForPT($this->idprof1)) {
+			return -1;
 		}
 
 		//Verify NIF if country is DZ
-		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'DZ') {
-			$string = trim($this->idprof1);
-			$string = preg_replace('/(\s)/', '', $string);
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{15}$)/', $string)) {
-				return 1;
-			} else {
-				return -1;
-			}
+		if ($idprof == 1 && $soc->country_code == 'DZ' && !isValidTinForDZ($this->idprof1)) {
+			return -1;
 		}
 
-		//Verify ID Prof 1 if country is BE (xxxx.xxx.xxx) (https://economie.fgov.be/fr/themes/entreprises/banque-carrefour-des/actualites/structure-du-numero)
-		//Returns: 1 if ok, -1 if bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'BE') {
-			$string = trim($this->idprof1);
-			$string = preg_replace('/(\s)/', '', $string);
-
-			//Check
-			if (preg_match('/(^[0-9]{4}\.[0-9]{3}\.[0-9]{3}$)/', $string)) {
-				return 1;
-			} else {
-				return -1;
-			}
+		//Verify ID Prof 1 if country is BE
+		if ($idprof == 1 && $soc->country_code == 'BE' && !isValidTinForBE($this->idprof1)) {
+			return -1;
 		}
 
 		return $ok;
@@ -4201,7 +4106,7 @@ class Societe extends CommonObject
 	/**
 	 *  Set "blacklist" mailing status
 	 *
-	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to recieve mailling
+	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to receive mailing
 	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setNoEmail($no_email)
@@ -4257,7 +4162,7 @@ class Societe extends CommonObject
 
 	/**
 	 *  get "blacklist" mailing status
-	 * 	set no_email attribut to 1 or 0
+	 * 	set no_email attribute to 1 or 0
 	 *
 	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
@@ -4316,7 +4221,7 @@ class Societe extends CommonObject
 		$name = $socname;
 		$alias = $socalias ? $socalias : '';
 
-		// Positionne parametres
+		// Positionne parameters
 		$this->nom = $name; // TODO deprecated
 		$this->name = $name;
 		$this->name_alias = $alias;
@@ -4490,7 +4395,7 @@ class Societe extends CommonObject
 		$this->idprof4 = getDolGlobalString('MAIN_INFO_RCS');
 		$this->idprof5 = getDolGlobalString('MAIN_INFO_PROFID5');
 		$this->idprof6 = getDolGlobalString('MAIN_INFO_PROFID6');
-		$this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarly INTRA.
+		$this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarily INTRA.
 		$this->managers = getDolGlobalString('MAIN_INFO_SOCIETE_MANAGERS');
 		$this->capital = getDolGlobalString('MAIN_INFO_CAPITAL');
 		$this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
@@ -4667,7 +4572,7 @@ class Societe extends CommonObject
 		global $langs;
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
-		// If lib not found in language file, we get label from cache/databse
+		// If lib not found in language file, we get label from cache/database
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
@@ -4758,7 +4663,7 @@ class Societe extends CommonObject
 	 *  Return amount of proposal not yet paid and total an dlist of all proposals
 	 *
 	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
 	 */
 	public function getOutstandingProposals($mode = 'customer')
 	{
@@ -4802,7 +4707,7 @@ class Societe extends CommonObject
 	 *  Return amount of order not yet paid and total and list of all orders
 	 *
 	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
 	 */
 	public function getOutstandingOrders($mode = 'customer')
 	{
@@ -4846,7 +4751,7 @@ class Societe extends CommonObject
 	 *
 	 *  @param     string   $mode    	'customer' or 'supplier'
 	 *  @param     int      $late    	0 => all invoice, 1=> only late
-	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+	 *  @return    array				array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
 	 */
 	public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
@@ -4903,9 +4808,9 @@ class Societe extends CommonObject
 
 				if ($obj->paye == 0
 					&& $obj->status != $tmpobject::STATUS_DRAFT    		// Not a draft
-					&& $obj->status != $tmpobject::STATUS_ABANDONED	    // Not abandonned
+					&& $obj->status != $tmpobject::STATUS_ABANDONED	    // Not abandoned
 					&& $obj->status != $tmpobject::STATUS_CLOSED) {		// Not classified as paid
-					//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+					//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandoned for undefined reason
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
@@ -4975,7 +4880,7 @@ class Societe extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *	@param	string		$modele			Generator to use. Caller must set it to obj->model_pdf or GETPOST('model','alpha') for example.
-	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *	@param	Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index c4efe6be306..62219b6d990 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -62,7 +62,7 @@ class SocieteAccount extends CommonObject
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -168,7 +168,7 @@ class SocieteAccount extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -201,10 +201,10 @@ class SocieteAccount extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -310,7 +310,7 @@ class SocieteAccount extends CommonObject
 		$sql .= " AND (sa.site_account = '' OR sa.site_account IS NULL OR sa.site_account = '".$this->db->escape($site_account)."')";
 		$sql .= " ORDER BY sa.site_account DESC"; // To get the entry with a site_account defined in priority
 
-		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (example: cus_.... for stripe)", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -362,10 +362,10 @@ class SocieteAccount extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -373,11 +373,11 @@ class SocieteAccount extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 	}
@@ -404,7 +404,7 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -531,7 +531,7 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Charge les information d'ordre info dans l'objet commande
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0de0a878ab0..71da286c48a 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -223,7 +223,7 @@ if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp !=
 if (isModEnabled('barcode')) {
 	$fieldstosearchall['s.barcode'] = 'Gencod';
 }
-// Personalized search criterias. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
+// Personalized search criteria. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
 if (getDolGlobalString('THIRDPARTY_QUICKSEARCH_ON_FIELDS')) {
 	$fieldstosearchall = dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
 }
@@ -487,7 +487,7 @@ if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) {
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 
 
-// Select every potentiels, and note each potentiels which fit in search parameters
+// Select every potentials, and note each potentials which fit in search parameters
 $tab_level = array();
 $sql = "SELECT code, label, sortorder";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
@@ -1197,7 +1197,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 //$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 52e339bb588..fa1495ab87c 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1176,7 +1176,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		//($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)')
 
 		print '<!-- List of card payments -->'."\n";
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="liste centpercent">'."\n";
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Label').'</td>';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 677fce1b7ca..7d109cfc3f4 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -204,7 +204,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 		}
 
-		// additionnal list with adherents of company
+		// additional list with adherents of company
 		if (isModEnabled('adherent') && $user->hasRight('adherent', 'lire')) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 67192c08357..9b1bb4c14c2 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -86,7 +86,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($objectwebsiteaccount
 
 unset($objectwebsiteaccount->fields['fk_soc']); // Remove this field, we are already on the thirdparty
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($objectwebsiteaccount->fields as $key => $val) {
@@ -422,7 +422,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index fa4b87d88df..55b62f7fd09 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -165,7 +165,7 @@ class ActionsStripeconnect extends CommonHookActions
 		global $conf, $langs;
 
 		if (is_object($object) && $object->element == 'facture') {
-			// On verifie si la facture a des paiements
+			// Verify if the invoice has payments
 			$sql = 'SELECT pf.amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 7757f24be8b..c100bdba1ca 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -198,7 +198,7 @@ class Stripe extends CommonObject
 						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
 					}
 				} catch (Exception $e) {
-					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
+					// For example, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
 			} elseif ($createifnotlinkedtostripe) {
@@ -340,7 +340,7 @@ class Stripe extends CommonObject
 	 * @param	int		$status							    Status (0=test, 1=live)
 	 * @param	int		$usethirdpartyemailforreceiptemail	1=use thirdparty email for receipt
 	 * @param	int		$mode		                        automatic=automatic confirmation/payment when conditions are ok, manual=need to call confirm() on intent
-	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediatly after create (if conditions are ok)
+	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediately after create (if conditions are ok)
 	 * @param   string  $payment_method                     'pm_....' (if known)
 	 * @param   string  $off_session                        If we use an already known payment method to pay when customer is not available during the checkout flow.
 	 * @param	string	$noidempotency_key					Do not use the idempotency_key when creating the PaymentIntent
@@ -468,7 +468,7 @@ class Stripe extends CommonObject
 			global $dolibarr_main_url_root;
 
 			$dataforintent = array(
-				"confirm" => $confirmnow, // try to confirm immediatly after create (if conditions are ok)
+				"confirm" => $confirmnow, // try to confirm immediately after create (if conditions are ok)
 				"confirmation_method" => $mode,
 				"amount" => $stripeamount,
 				"currency" => $currency_code,
@@ -635,7 +635,7 @@ class Stripe extends CommonObject
 	 * Get the Stripe payment intent. Create it with confirmnow=false
 	 * 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),
+	 * 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 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.
@@ -646,7 +646,7 @@ class Stripe extends CommonObject
 	 * @param	string	$key							    ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int		$status							    Status (0=test, 1=live)
 	 * @param	int		$usethirdpartyemailforreceiptemail	1=use thirdparty email for receipt
-	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediatly after create (if conditions are ok)
+	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediately after create (if conditions are ok)
 	 * @return 	\Stripe\SetupIntent|null 			        Stripe SetupIntent or null if not found and failed to create
 	 */
 	public function getSetupIntent($description, $object, $customer, $key, $status, $usethirdpartyemailforreceiptemail = 0, $confirmnow = false)
@@ -695,7 +695,7 @@ class Stripe extends CommonObject
 			global $dolibarr_main_url_root;
 
 			$dataforintent = array(
-				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
+				"confirm" => $confirmnow, // Do not confirm immediately during creation of intent
 				"payment_method_types" => $paymentmethodtypes,	// When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
 				/*
 				 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
@@ -1075,7 +1075,7 @@ class Stripe extends CommonObject
 							$cs = $s->setupIntents->create($dataforintent);
 							//$cs = $s->setupIntents->update($cs->id, ['payment_method' => $sepa->id]);
 							$cs = $s->setupIntents->confirm($cs->id, ['mandate_data' => ['customer_acceptance' => ['type' => 'offline']]]);
-							// note: $cs->mandate contians ID of mandate on Stripe side
+							// note: $cs->mandate contains ID of mandate on Stripe side
 
 							if (!$cs) {
 								$this->error = 'Link SEPA <-> Customer failed';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 2a9841bad76..12551a2e7a3 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -277,7 +277,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			$db->begin();
 
-			// Si on a selectionne une demande a copier, on realise la copie
+			// When a copy request was made, make the copy
 			if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal')) {
 				if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
 					$object->ref = GETPOST('ref');
@@ -702,7 +702,7 @@ if (empty($reshook)) {
 						$desc = $productsupplier->desc_supplier;
 					}
 
-					//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+					//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 					if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 						$product_desc='';
 					}
@@ -978,7 +978,7 @@ if (empty($reshook)) {
 
 		// Add buying price
 		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
+		$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1276,7 +1276,7 @@ if ($action == 'create') {
 			print '<td colspan="2">';
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
-			// reload page to retrieve customer informations
+			// reload page to retrieve customer information
 			if (getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE')) {
 				print '<script>
 				$(document).ready(function() {
@@ -1557,7 +1557,7 @@ if ($action == 'create') {
 		// Confirm validate askprice
 		$error = 0;
 
-		// on verifie si l'objet est en numerotation provisoire
+		// Verify if the object has a temporary number
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV') {
 			$numref = $object->getNextNumRef($soc);
@@ -1647,8 +1647,8 @@ if ($action == 'create') {
 
 		// Relative and absolute discounts
 		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
 		} else {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 54574fa9325..b89ca55d36c 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -54,7 +54,7 @@ class SupplierProposals extends DolibarrApi
 	/**
 	 * Get properties of a supplier proposal (price request) object
 	 *
-	 * Return an array with supplier proposal informations
+	 * Return an array with supplier proposal information
 	 *
 	 * @param       int         $id         ID of supplier proposal
 	 * @return		Object					Object with cleaned properties
@@ -91,7 +91,7 @@ class SupplierProposals extends DolibarrApi
 	 * @param int		$page				Page number
 	 * @param string	$thirdparty_ids		Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-	 * @param string    $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                       Array of order objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $properties = '')
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index f877fddc2c2..e5f3cdee9ee 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -248,7 +248,7 @@ class SupplierProposal extends CommonObject
 	 * 	@param  int		$remise_percent  	Discount effected on Product
 	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 *
-	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
+	 *	TODO	Remplacer les appels a cette fonction par generation object Ligne
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0)
 	{
@@ -362,7 +362,7 @@ class SupplierProposal extends CommonObject
 
 	/**
 	 *    	Add a proposal line into database (linked to product/service or not)
-	 * 		Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 * 		Les parameters sont deja cense etre juste et avec valeurs finales a l'appel
 	 *		de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
 	 *		par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
 	 *		et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
@@ -586,7 +586,7 @@ class SupplierProposal extends CommonObject
 			$this->line->date_start = $date_start;
 			$this->line->date_end = $date_end;
 
-			// infos marge
+			// infos merge
 			if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
 				// When fk_fournprice is 0, we take the lowest buying price
 				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -628,7 +628,7 @@ class SupplierProposal extends CommonObject
 					}
 				}
 
-				// Mise a jour informations denormalisees au niveau de la propale meme
+				// Mise a jour information denormalisees au niveau de la propale meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
 				if ($result > 0) {
 					$this->db->commit();
@@ -662,7 +662,7 @@ class SupplierProposal extends CommonObject
 	 *  @param	  	double		$txlocaltax2		Local tax 2 rate
 	 *  @param      string		$desc            	Description
 	 *	@param	  	double		$price_base_type	HT or TTC
-	 *	@param      int			$info_bits        	Miscellaneous informations
+	 *	@param      int			$info_bits        	Miscellaneous information
 	 *	@param		int			$special_code		Special code (also used by externals modules!)
 	 * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
 	 * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
@@ -789,7 +789,7 @@ class SupplierProposal extends CommonObject
 			$this->line->ref_fourn = $ref_supplier;
 			$this->line->fk_unit = $fk_unit;
 
-			// infos marge
+			// infos merge
 			if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
 				// by external module, take lowest buying price
 				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -1787,10 +1787,10 @@ class SupplierProposal extends CommonObject
 	}
 
 	/**
-	 *	Upate ProductFournisseur
+	 *	Update ProductFournisseur
 	 *
 	 * 	@param		int 	$idProductFournPrice	id of llx_product_fournisseur_price
-	 * 	@param		Product $product				contain informations to update
+	 * 	@param		Product $product				contain information to update
 	 *	@param      User	$user					Object user
 	 *	@return     int         					Return integer <0 if KO, >0 if OK
 	 */
@@ -1911,7 +1911,7 @@ class SupplierProposal extends CommonObject
 
 			if (!$error) {
 				$this->status = self::STATUS_DRAFT;
-				$this->statut = self::STATUS_DRAFT;	// dperecated
+				$this->statut = self::STATUS_DRAFT;	// deprecated
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1931,7 +1931,7 @@ class SupplierProposal extends CommonObject
 	 *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
 	 *    @param	int		$draft				0=not draft, 1=draft
 	 *    @param	int		$notcurrentuser		0=all user, 1=not current user
-	 *    @param    int		$socid				Id third pary
+	 *    @param    int		$socid				Id third party
 	 *    @param    int		$limit				For pagination
 	 *    @param    int		$offset				For pagination
 	 *    @param    string	$sortfield			Sort criteria
@@ -2120,7 +2120,7 @@ class SupplierProposal extends CommonObject
 	public function info($id)
 	{
 		$sql = "SELECT c.rowid, ";
-		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
+		$sql .= " c.datec as date_creation, c.date_valid as date_validation, c.date_cloture as date_closure,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 		$sql .= " WHERE c.rowid = ".((int) $id);
@@ -2133,9 +2133,9 @@ class SupplierProposal extends CommonObject
 
 				$this->id                = $obj->rowid;
 
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-				$this->date_cloture      = $this->db->jdate($obj->dateo);
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_validation   = $this->db->jdate($obj->date_validation);
+				$this->date_cloture      = $this->db->jdate($obj->date_closure);
 
 				$this->user_creation_id = $obj->fk_user_author;
 				$this->user_validation_id = $obj->fk_user_valid;
@@ -2313,7 +2313,7 @@ class SupplierProposal extends CommonObject
 			}
 		}
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
@@ -2500,7 +2500,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *	@param      int		$withpicto					Add picto into link
 	 *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
-	 *	@param      string	$get_params    				Parametres added to url
+	 *	@param      string	$get_params    				Parameters added to url
 	 *  @param	    int   	$notooltip					1=Disable tooltip
 	 *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @param		int		$addlinktonotes				Add link to show notes
@@ -2877,14 +2877,14 @@ class SupplierProposalLine extends CommonObjectLine
 	public $marge_tx;
 	public $marque_tx;
 
-	public $special_code; // Tag for special lines (exlusive tags)
+	public $special_code; // Tag for special lines (exclusive tags)
 	// 1: frais de port
 	// 2: ecotaxe
 	// 3: option line (when qty = 0)
 
 	public $info_bits = 0; // Liste d'options cumulables:
-	// Bit 0: 	0 si TVA normal - 1 si TVA NPR
-	// Bit 1:	0 ligne normale - 1 si ligne de remise fixe
+	// Bit 0: 	0 si TVA normal - 1 if TVA NPR
+	// Bit 1:	0 ligne normal - 1 if fixed reduction
 
 	public $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
 	public $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
@@ -2955,7 +2955,7 @@ class SupplierProposalLine extends CommonObjectLine
 	public $multicurrency_total_ttc;
 
 	/**
-	 * 	Class line Contructor
+	 * 	Class line Constructor
 	 *
 	 * 	@param	DoliDB	$db	Database handler
 	 */
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 4d461c2a76a..c5b95580701 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -1028,7 +1028,7 @@ if ($resql) {
 				print '<div class="box-flex-container kanban">';
 			}
 			// Output Kanban
-			// TODO Use a cahe on user
+			// TODO Use a cache on user
 			$userstatic->fetch($obj->fk_user_author);
 			$objectstatic->delivery_date = $obj->dp;
 			print $objectstatic->getKanbanView('', array('thirdparty'=>$companystatic, 'userauthor'=>$userstatic, 'selected' => in_array($obj->id, $arrayofselected)));
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 6b00b74b7d3..6dd506f02a7 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -130,7 +130,7 @@ if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) {
 }
 define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
 
-define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
+define('DOL_CLASS_PATH', 'class/'); // Filesystem path to class dir
 define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : ''));
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
@@ -166,7 +166,7 @@ if (empty($conf->db->user)) {
 }
 
 
-// Defini objet langs
+// Defini object langs
 $langs = new Translate('..', $conf);
 if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09'));
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index c9890212a9b..e049a2e7b60 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -144,7 +144,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', '');
 
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name")."</td>\n";
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 17dfdd71629..7da3994c4a5 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -16,7 +16,7 @@
  */
 
 // This page return an image of public photos of a category or product.
-// Test to check image can be publically viewed is done inside the viewimage.php wrapper.
+// Test to check image can be publicly viewed is done inside the viewimage.php wrapper.
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d6e414b515b..f3ea8f68e40 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -400,7 +400,7 @@ function LoadProducts(position, issubcat) {
 			}
 			$("#prowatermark"+ishow).hide();
 			ishow++; //Next product to show after print data product
-			idata++; //Next data everytime
+			idata++; //Next data every time
 		}
 	});
 
@@ -475,7 +475,7 @@ function MoreProducts(moreorless) {
 			}
 			$("#prowatermark"+ishow).hide();
 			ishow++; //Next product to show after print data product
-			idata++; //Next data everytime
+			idata++; //Next data every time
 		}
 	});
 
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 5f27b1a1f21..7afd29f7bf2 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -82,7 +82,7 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
 
 
 /**
- * Abort invoice creationg with a given error message
+ * Abort invoice creation with a given error message
  *
  * @param   string  $message        Message explaining the error to the user
  * @return	void
@@ -434,7 +434,7 @@ if (empty($reshook)) {
 			$line->fk_parent_line = $fk_parent_line;
 
 			$line->subprice = -$line->subprice; // invert price for object
-			$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
+			$line->pa_ht = $line->pa_ht; // we chose to have the buy/cost price always positive, so no inversion of the sign here
 			$line->total_ht = -$line->total_ht;
 			$line->total_tva = -$line->total_tva;
 			$line->total_ttc = -$line->total_ttc;
@@ -446,7 +446,7 @@ if (empty($reshook)) {
 			$line->multicurrency_total_tva = -$line->multicurrency_total_tva;
 			$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
 
-			$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
+			$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount already linked
 
 			$creditnote->lines[] = $line; // insert new line in current object
 
@@ -766,7 +766,7 @@ if (empty($reshook)) {
 
 	// Action to delete or discard an invoice
 	if ($action == "delete" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
-		// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
+		// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at beginning of page works.
 		if ($placeid > 0) {
 			$result = $invoice->fetch($placeid);
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index bfccf8ef34e..e80a4a49c09 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -447,7 +447,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 				console.log("error when capturing paymentIntent", result.error);
 			  } else {
 				document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentValidated'); ?></div>';
-				console.log("Capture paymentIntent successfull "+paymentIntentId);
+				console.log("Capture paymentIntent successful "+paymentIntentId);
 				  parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay=CB&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
 			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
 				console.log("Close popup");
diff --git a/htdocs/theme/dolistore_logo.svg b/htdocs/theme/dolistore_logo.svg
old mode 100755
new mode 100644
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 43a78873655..b8138bacd63 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -3,7 +3,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 }
 ?>
-/* Badge style is based on boostrap framework */
+/* Badge style is based on bootstrap framework */
 
 .badge {
 	display: inline-block;
@@ -24,7 +24,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 
 .badge-status {
 	font-size: 0.95em;
-	padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
+	padding: .19em .35em;			/* more than 0.19 generate a change into height of lines */
 }
 .tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
 	font-size: 1.1em;
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 802908746c7..3b191b2dff1 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -255,7 +255,7 @@ a.btnTitle.btnTitleSelected {
 	text-decoration: none;
 	box-shadow: none;
 }
-/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */
+/* The buttonplus isgrowing on hover (don't know why). This is to avoid to have the cellegrowing too */
 .btnTitlePlus:hover {
 	max-width: 24px;
 	max-height: 40px;
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index d1445a929f0..de150845d05 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -2,7 +2,7 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > dont remove this line it's an ide hack */
+/* <style type="text/css" > don't remove this line it's an ide hack */
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/eldy/flags-sprite.inc.php b/htdocs/theme/eldy/flags-sprite.inc.php
index 99e0b241761..56300e37e3f 100644
--- a/htdocs/theme/eldy/flags-sprite.inc.php
+++ b/htdocs/theme/eldy/flags-sprite.inc.php
@@ -2,7 +2,7 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > dont remove this line it's an ide hack */
+/* <style type="text/css" > don't remove this line it's an ide hack */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 8436b416804..e4c5987e375 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1587,7 +1587,7 @@ div.fiche {
 .thumbstat150 {
 	min-width: 168px;
 	max-width: 169px;
-	/* width: 168px; If I use with, there is trouble on size of flex boxes solved with min+max that is a little bit higer than min */
+	/* width: 168px; If I use with, there is trouble on size of flex boxes solved with min+max that is a little bit higher than min */
 }
 .thumbstat, .thumbstat150 {
 <?php if ($conf->browser->name == 'ie') { ?>
@@ -1934,7 +1934,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		width: <?php print dol_size(300, 'width'); ?>px;
 	}
 
-	/* intput, input[type=text], */
+	/* input, input[type=text], */
 	select {
 		width: 98%;
 		min-width: 40px;
@@ -2308,7 +2308,7 @@ div.secondcolumn div.box {
 }*/
 
 
-/* Force values on one colum for small screen */
+/* Force values on one column for small screen */
 @media only screen and (max-width: 1000px)
 {
 	div.fiche {
@@ -2351,7 +2351,7 @@ div.secondcolumn div.box {
 	}
 }
 
-/* Force values on one colum for small screen */
+/* Force values on one column for small screen */
 @media only screen and (max-width: 1499px)
 {
 	div.fichehalfleft-lg {
@@ -4314,7 +4314,7 @@ div.liste_titre .tagtd {
 	vertical-align: middle;
 }
 div.liste_titre {
-	min-height: 26px !important;	/* We cant use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
+	min-height: 26px !important;	/* We can't use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
 
 	padding-top: 2px;
 	padding-bottom: 2px;
@@ -4645,7 +4645,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 		margin-bottom: 8px;
 		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
 		max-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(161, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
-		/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higer than min) */
+		/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higher than min) */
 	}
 	.dashboardlineindicator {
 		float: left;
@@ -7023,7 +7023,7 @@ a.ui-link {
 	text-overflow: clip; /* "hidden" : do not exists as a text-overflow value (https://developer.mozilla.org/fr/docs/Web/CSS/text-overflow) */
 }
 
-/* Warning: setting this may make screen not beeing refreshed after a combo selection */
+/* Warning: setting this may make screen not being refreshed after a combo selection */
 /*.ui-body-c {
 	background: #fff;
 }*/
@@ -7604,7 +7604,7 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint  {
 }
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
-	display: inline-block;	/* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
+	display: inline-block;	/* this will be modify on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
 	color: transparent;
 	white-space: nowrap;
 	overflow-x: hidden;
@@ -7621,7 +7621,7 @@ div.clipboardCPValue.hidewithsize {
 	display: none;
 }
 
-/* To make a div popup, we must use a position aboluste inside a position relative */
+/* To make a div popup, we must use a position absolute inside a position relative */
 .clipboardCPText {
 	position: relative;
 }
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 0157de99161..03cee9e6a94 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -4,7 +4,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 } ?>
 /* <style type="text/css" > */
 /*
- progress style is based on boostrap and admin lte framework
+ progress style is based on bootstrap and admin lte framework
  */
 
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 204d14c6d05..2b5a3ab6677 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -95,15 +95,15 @@ $badgeDanger    = '#af4705'; // See $textDanger
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
-// badge color ajustement for color blind
+// badge color adjustment for color blind
 $colorblind_deuteranopes_badgeSuccess   = '#37de5d'; //! text color black
 $colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
 $colorblind_deuteranopes_badgeWarning   = '#e4e411';
 $colorblind_deuteranopes_badgeDanger    = $badgeDanger; // currently not tested with a color blind people so use default color
 
-/* default color for status : After a quick check, somme status can have oposite function according to objects
+/* default color for status : After a quick check, somme status can have opposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
-*  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*  TODO: use color definition vars above for define badges color status X -> example $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
 $badgeStatus0 = '#cbd3d3'; // draft
 $badgeStatus1 = '#bc9526'; // validated
@@ -120,7 +120,7 @@ $badgeStatus9 = '#e7f0f0';
 $badgeStatus10 = '#993013';
 $badgeStatus11 = '#15a540';
 
-// status color ajustement for color blind
+// status color adjustment for color blind
 $colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
 $colorblind_deuteranopes_badgeStatus_textColor4 = $colorblind_deuteranopes_badgeStatus_textColor7 = '#000';
 $colorblind_deuteranopes_badgeStatus1 = $colorblind_deuteranopes_badgeWarning;
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 4723bca01f3..c5bf486c311 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -5,7 +5,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 ?>
 /* <style type="text/css" > */
 /*
- Badge style is based on boostrap framework
+ Badge style is based on bootstrap framework
  */
 
 .badge {
@@ -27,7 +27,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 
 .badge-status {
 	font-size: 1em;
-	padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
+	padding: .19em .35em;			/* more than 0.19 generate a change into height of lines */
 }
 .tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
 	font-size: 1.1em;
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 70104df5df1..51db97c557b 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -379,7 +379,7 @@ div.pagination .btnTitle:hover .btnTitle-label{
 	border-color: #ddd;
 }
 
-/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */
+/* The buttonplus isgrowing on hover (don't know why). This is to avoid to have the cellegrowing too */
 .btnTitlePlus:hover {
 	max-width: 24px;
 	max-height: 40px;
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index b1f60f4a2b8..634ea3c7c71 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -2,7 +2,7 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > dont remove this line it's an ide hack */
+/* <style type="text/css" > don't remove this line it's an ide hack */
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/md/flags-sprite.inc.php b/htdocs/theme/md/flags-sprite.inc.php
index 99e0b241761..56300e37e3f 100644
--- a/htdocs/theme/md/flags-sprite.inc.php
+++ b/htdocs/theme/md/flags-sprite.inc.php
@@ -2,7 +2,7 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > dont remove this line it's an ide hack */
+/* <style type="text/css" > don't remove this line it's an ide hack */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 9e4d5687eb0..370050732f2 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -517,7 +517,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 }
 
 
-/* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
+/* USING IMAGES FOR WEATHER INSTEAD OF FONT AWESOME */
 /* For other themes just uncomment this part */
 /*.info-box-weather-level0,
 .info-box-weather-level1,
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a4249781a0d..f7bc529bec0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2165,7 +2165,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		width: <?php print dol_size(300, 'width'); ?>px;
 	}
 
-	/* intput, input[type=text], */
+	/* input, input[type=text], */
 	select {
 		width: 98%;
 		min-width: 40px;
@@ -2501,7 +2501,7 @@ div.fichehalfright {
 	} ?>
 }
 
-/* Force values on one colum for small screen */
+/* Force values on one column for small screen */
 @media only screen and (max-width: 1499px)
 {
 	div.fichehalfleft-lg {
@@ -2525,7 +2525,7 @@ div.secondcolumn div.box {
 	padding-left: 10px;
 }*/
 
-/* Force values on one colum for small screen */
+/* Force values on one column for small screen */
 @media only screen and (max-width: 900px)
 {
 	div.fiche {
@@ -4450,7 +4450,7 @@ div.liste_titre .tagtd {
 	vertical-align: middle;
 }
 div.liste_titre {
-	min-height: 26px !important;	/* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
+	min-height: 26px !important;	/* We can't use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
 
 	padding-top: 2px;
 	padding-bottom: 2px;
@@ -6971,7 +6971,7 @@ a.ui-link {
 	text-overflow: clip; /* "hidden" : do not exists as a text-overflow value (https://developer.mozilla.org/fr/docs/Web/CSS/text-overflow) */
 }
 
-/* Warning: setting this may make screen not beeing refreshed after a combo selection */
+/* Warning: setting this may make screen not being refreshed after a combo selection */
 /*.ui-body-c {
 	background: #fff;
 }*/
@@ -7553,7 +7553,7 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint {
 }
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
-	display: inline-block;	/* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
+	display: inline-block;	/* this will be modify on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
 	color: transparent;
 	white-space: nowrap;
 	overflow-x: hidden;
@@ -7570,7 +7570,7 @@ div.clipboardCPValue.hidewithsize {
 	display: none;
 }
 
-/* To make a div popup, we must use a position aboluste inside a position relative */
+/* To make a div popup, we must use a position absolute inside a position relative */
 
 .clipboardCPText {
 	position: relative;
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 8ed47b35bca..11e695f0c00 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -90,15 +90,15 @@ $badgeDanger    = '#8c4446'; // See $textDanger
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
-// badge color ajustement for color blind
+// badge color adjustment for color blind
 $colorblind_deuteranopes_badgeSuccess   = '#37de5d'; //! text color black
 $colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
 $colorblind_deuteranopes_badgeWarning   = '#e4e411';
 $colorblind_deuteranopes_badgeDanger    = $badgeDanger; // currently not tested with a color blind people so use default color
 
-/* default color for status : After a quick check, somme status can have oposite function according to objects
+/* default color for status : After a quick check, somme status can have opposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
-*  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*  TODO: use color definition vars above for define badges color status X -> example $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
 $badgeStatus0 = '#cbd3d3'; // draft
 $badgeStatus1 = '#bc9526'; // validated
@@ -115,7 +115,7 @@ $badgeStatus9 = '#e7f0f0';
 $badgeStatus10 = '#993013';
 $badgeStatus11 = '#15a540';
 
-// status color ajustement for color blind
+// status color adjustment for color blind
 $colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
 $colorblind_deuteranopes_badgeStatus_textColor4 = $colorblind_deuteranopes_badgeStatus_textColor7 = '#000';
 $colorblind_deuteranopes_badgeStatus1 = $colorblind_deuteranopes_badgeWarning;
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
old mode 100755
new mode 100644
index 0d6f2db0d43..6c1b3cba18a
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -92,7 +92,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -519,7 +519,7 @@ if (empty($reshook)) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			if ($object->delete($user) > 0) {
 				setEventMessages('<div class="confirm">'.$langs->trans('TicketDeletedSuccess').'</div>', null, 'mesgs');
-				Header("Location: ".DOL_URL_ROOT."/ticket/list.php");
+				header("Location: ".DOL_URL_ROOT."/ticket/list.php");
 				exit;
 			} else {
 				$langs->load("errors");
@@ -1240,7 +1240,7 @@ if ($action == 'create' || $action == 'presend') {
 		$actionobject->viewTicketOriginalMessage($user, $action, $object);
 
 		// Classification of ticket
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="noborder tableforfield centpercent margintable">';
 		print '<tr class="liste_titre">';
 		print '<td>';
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index fd6cc58281e..08520e854f9 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -179,7 +179,7 @@ class ActionsTicket extends CommonHookActions
 	/**
 	 * Show ticket original message
 	 *
-	 * @param 	User		$user		User wich display
+	 * @param 	User		$user		User which display
 	 * @param 	string 		$action    	Action mode
 	 * @param	Ticket		$object		Object ticket
 	 * @return	void
@@ -198,7 +198,7 @@ class ActionsTicket extends CommonHookActions
 		}
 
 		// Initial message
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="noborder centpercent margintable margintable">';
 		print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
 		print $langs->trans("InitialMessage");
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index cba87aa04a9..ea8b54d139e 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -63,7 +63,7 @@ class Tickets extends DolibarrApi
 	/**
 	 * Get properties of a Ticket object.
 	 *
-	 * Return an array with ticket informations
+	 * Return an array with ticket information
 	 *
 	 * @param	int				$id			ID of ticket
 	 * @return  Object						Object with cleaned properties
@@ -80,7 +80,7 @@ class Tickets extends DolibarrApi
 	/**
 	 * Get properties of a Ticket object from track id
 	 *
-	 * Return an array with ticket informations
+	 * Return an array with ticket information
 	 *
 	 * @param	string			$track_id	Tracking ID of ticket
 	 * @return	array|mixed					Data without useless information
@@ -99,7 +99,7 @@ class Tickets extends DolibarrApi
 	/**
 	 * Get properties of a Ticket object from ref
 	 *
-	 * Return an array with ticket informations
+	 * Return an array with ticket information
 	 *
 	 * @param	string			$ref		Reference for ticket
 	 * @return	array|mixed					Data without useless information
@@ -117,7 +117,7 @@ class Tickets extends DolibarrApi
 
 	/**
 	 * Get properties of a Ticket object
-	 * Return an array with ticket informations
+	 * Return an array with ticket information
 	 *
 	 * @param	int				$id			ID of ticket
 	 * @param	string			$track_id	Tracking ID of ticket
@@ -194,7 +194,7 @@ class Tickets extends DolibarrApi
 	 * @param int		$limit		Limit for list
 	 * @param int		$page		Page number
 	 * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 *
 	 * @return array Array of ticket objects
 	 *
@@ -292,7 +292,7 @@ class Tickets extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->ticket->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -331,7 +331,7 @@ class Tickets extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->ticket->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -375,7 +375,7 @@ class Tickets extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->ticket->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 9033587e2df..8acf6a2db91 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -80,7 +80,7 @@ class CTicketCategory extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -178,7 +178,7 @@ class CTicketCategory extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -222,10 +222,10 @@ class CTicketCategory extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -443,10 +443,10 @@ class CTicketCategory extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -455,10 +455,10 @@ class CTicketCategory extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -469,10 +469,10 @@ class CTicketCategory extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  false=launch triggers after, true=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -484,7 +484,7 @@ class CTicketCategory extends CommonObject
 
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 75e106f0454..2b8bb10fb60 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 class Ticket extends CommonObject
 {
 	/**
-	 * @var DoliDb Database handler
+	 * @var DoliDB Database handler
 	 */
 	public $db;
 
@@ -74,7 +74,7 @@ class Ticket extends CommonObject
 
 
 	/**
-	 * @var string Hash to identify ticket publically
+	 * @var string Hash to identify ticket publicly
 	 */
 	public $track_id;
 
@@ -302,7 +302,7 @@ class Ticket extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -353,7 +353,7 @@ class Ticket extends CommonObject
 	/**
 	 *  Constructor
 	 *
-	 *  @param DoliDb $db Database handler
+	 *  @param DoliDB $db Database handler
 	 */
 	public function __construct($db)
 	{
@@ -627,7 +627,7 @@ class Ticket extends CommonObject
 	 *  @param	string		$email_msgid	Email msgid
 	 *  @return int              			Return integer <0 if KO, >0 if OK
 	 */
-	public function fetch($id = '', $ref = '', $track_id = '', $email_msgid = '')
+	public function fetch($id = 0, $ref = '', $track_id = '', $email_msgid = '')
 	{
 		global $langs;
 
@@ -762,7 +762,7 @@ class Ticket extends CommonObject
 	 * @param  array  $filter    	Filter for query
 	 * @return int 					Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = '', $offset = 0, $arch = '', $filter = '')
+	public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = 0, $offset = 0, $arch = 0, $filter = [])
 	{
 		global $langs, $extrafields;
 
@@ -1525,7 +1525,7 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
@@ -1863,7 +1863,7 @@ class Ticket extends CommonObject
 	 *    Close a ticket
 	 *
 	 *    @param    User    $user      	User that close
-	 *    @param	int		$mode		0=Close solved, 1=Close abandonned
+	 *    @param	int		$mode		0=Close solved, 1=Close abandoned
 	 *    @return   int		           	Return integer <0 if KO, 0=nothing done, >0 if OK
 	 */
 	public function close(User $user, $mode = 0)
@@ -1944,7 +1944,7 @@ class Ticket extends CommonObject
 	 *     @param  string 		$clause  		Clause for filters
 	 *     @return array|int    		   		Array of thirdparties object
 	 */
-	public function searchSocidByEmail($email, $type = '0', $filters = array(), $clause = 'AND')
+	public function searchSocidByEmail($email, $type = 0, $filters = array(), $clause = 'AND')
 	{
 		$thirdparties = array();
 		$exact = 0;
@@ -2004,11 +2004,11 @@ class Ticket extends CommonObject
 	 *     Search and fetch contacts by email
 	 *
 	 *     @param  string 		$email 		Email
-	 *     @param  array  		$socid 		Limit to a thirdparty
+	 *     @param  int  		$socid 		Limit to a thirdparty
 	 *     @param  string 		$case  		Respect case
 	 *     @return array|int        		Array of contacts object
 	 */
-	public function searchContactByEmail($email, $socid = '', $case = '')
+	public function searchContactByEmail($email, $socid = 0, $case = '')
 	{
 		$contacts = array();
 
@@ -2129,7 +2129,7 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 *  Retrieve informations about internal contacts
+	 *  Retrieve information about internal contacts
 	 *
 	 *  @param    int     $status     Status of user or company
 	 *  @return array                 Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
@@ -2150,7 +2150,7 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 * Retrieve informations about external contacts
+	 * Retrieve information about external contacts
 	 *
 	 *  @param    int     $status     Status of user or company
 	 *  @return array                 Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
@@ -2339,7 +2339,7 @@ class Ticket extends CommonObject
 	 * @param	Societe		$thirdparty		Thirdparty
 	 * @return 	string   					Reference
 	 */
-	public function getDefaultRef($thirdparty = '')
+	public function getDefaultRef($thirdparty = null)
 	{
 		global $conf;
 
@@ -2760,7 +2760,7 @@ class Ticket extends CommonObject
 								}
 							}
 
-							// dont try to send email if no recipient
+							// don't try to send email if no recipient
 							if (!empty($sendto)) {
 								$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
 							}
@@ -2855,7 +2855,7 @@ class Ticket extends CommonObject
 									}
 								}
 
-								// Dont try to send email when no recipient
+								// Don't try to send email when no recipient
 								if (!empty($sendto)) {
 									$result = $this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
 									if ($result) {
@@ -2870,7 +2870,7 @@ class Ticket extends CommonObject
 				}
 
 				// Set status back to "In progress" if not set yet, but only if internal user and not a private message
-				// Or set status to "In porgress" if the client has answered and if the ticket has started
+				// Or set status to "In progress" if the client has answered and if the ticket has started
 				// So we are sure to leave the STATUS_DRAFT, STATUS_NEED_INFO.
 				if (($object->status < self::STATUS_IN_PROGRESS && !$user->socid && !$private) ||
 					($object->status > self::STATUS_IN_PROGRESS && $public_area)
@@ -2895,7 +2895,7 @@ class Ticket extends CommonObject
 	 * @param string $subject          	  Email subject
 	 * @param string $message          	  Email message
 	 * @param int    $send_internal_cc 	  Receive a copy on internal email ($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)
-	 * @param array  $array_receiver   	  Array of receiver. exemple array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
+	 * @param array  $array_receiver   	  Array of receiver. example array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
 	 * @param array	 $filename_list       List of files to attach (full path of filename on file system)
 	 * @param array	 $mimetype_list       List of MIME type of attached files
 	 * @param array	 $mimefilename_list   List of attached file name in message
diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index 41fc4b0f69a..95f807f0ebf 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -18,14 +18,14 @@
 /**
  *       \file       /ticket/class/ticketstats.class.php
  *       \ingroup    ticket
- *       \brief      Fichier de la classe de gestion des stats des tickets
+ *       \brief      File for class to manage the ticket stats
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
 require_once 'ticket.class.php';
 
 
 /**
- * Classe permettant la gestion des stats des deplacements et notes de frais
+ * Class to manage the ticket stats
  */
 class TicketStats extends Stats
 {
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 08529aa0c04..b79c2501b85 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -157,7 +157,7 @@ if ($action == 'deletecontact' && $user->hasRight('ticket', 'write')) {
 		$result = $object->delete_contact($lineid);
 
 		if ($result >= 0) {
-			Header("Location: ".$url_page_current."?id=".$object->id);
+			header("Location: ".$url_page_current."?id=".$object->id);
 			exit;
 		}
 	}
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 79668bb3c8c..b45f9bd8b11 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -66,7 +66,7 @@ $object = new Ticket($db);
 // Security check
 //$result = restrictedArea($user, 'ticket|knowledgemanagement', 0, '', '', '', '');
 if (!$user->hasRight('ticket', 'read') && !$user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
-	accessforbidden('Not enought permissions');
+	accessforbidden('Not enough permissions');
 }
 
 
@@ -123,7 +123,7 @@ if (empty($endyear)) {
 
 $startyear = $endyear - 1;
 
-// Change default WIDHT and HEIGHT (we need a smaller than default for both desktop and smartphone)
+// Change default WIDTH and HEIGHT (we need a smaller than default for both desktop and smartphone)
 $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
 if (empty($conf->dol_optimize_smallscreen)) {
 	$HEIGHT = '200';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 31c24fbfd53..95cfbad7bc7 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -110,7 +110,7 @@ if (GETPOST('search_fk_status', 'alpha') == 'non_closed') {
 	$_GET['search_fk_statut'][] = 'openall'; // For backward compatibility
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = (GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -829,7 +829,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<div class="div-table-responsive-inside">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index a0f0fa1f3cd..1cd1bc64a5f 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -617,7 +617,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
-			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -678,7 +678,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
-			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -736,7 +736,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
-			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -793,7 +793,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank_account');
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="liste centpercent">';
 
 	print '<tr class="liste_titre">';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 865161adc5f..d4bcece87d5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -680,7 +680,7 @@ if (empty($reshook)) {
 			// Echec
 			setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
 		} else {
-			// Succes
+			// Success
 			if ($action == 'confirm_passwordsend' && $confirm == 'yes') {
 				if ($object->send_password($user, $newpassword) > 0) {
 					setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
@@ -1411,7 +1411,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 		}
 
-		// Connexion ldap
+		// Connection ldap
 		// pour recuperer passDoNotExpire et userChangePassNextLogon
 		if (isModEnabled('ldap') && !empty($object->ldap_sid)) {
 			$ldap = new Ldap();
@@ -1463,14 +1463,14 @@ if ($action == 'create' || $action == 'adduserldap') {
 		$head = user_prepare_head($object);
 
 		/*
-		 * Confirmation reinitialisation mot de passe
+		 * Confirmation reinitialisation password
 		 */
 		if ($action == 'password') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("ReinitPassword"), $langs->trans("ConfirmReinitPassword", $object->login), "confirm_password", '', 0, 1);
 		}
 
 		/*
-		 * Confirmation envoi mot de passe
+		 * Confirmation envoi password
 		 */
 		if ($action == 'passwordsend') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("SendNewPassword"), $langs->trans("ConfirmSendNewPassword", $object->login), "confirm_passwordsend", '', 0, 1);
@@ -2087,7 +2087,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 					print load_fiche_titre($langs->trans("ListOfGroupsForUser"), '', '');
 
-					// On selectionne les groupes auquel fait parti le user
+					// We select the groups that the users belongs to
 					$exclude = array();
 
 					$usergroup = new UserGroup($db);
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index ce9307081af..b6e4f1378b7 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -66,7 +66,7 @@ class Users extends DolibarrApi
 	 * @param string	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
 	 * @param int       $category   Use this param to filter list by category
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of User objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '0', $category = 0, $sqlfilters = '', $properties = '')
@@ -325,7 +325,7 @@ class Users extends DolibarrApi
 				throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->useraccount->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -391,7 +391,7 @@ class Users extends DolibarrApi
 				}
 			}
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->useraccount->context['caller'] = $request_data['caller'];
 				continue;
 			}
@@ -526,7 +526,7 @@ class Users extends DolibarrApi
 	 * @param int		$page		Page number
 	 * @param string	$group_ids   Groups ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of User objects
 	 *
 	 * @throws RestException 404 User not found
@@ -595,7 +595,7 @@ class Users extends DolibarrApi
 	/**
 	 * Get properties of an group object
 	 *
-	 * Return an array with group informations
+	 * Return an array with group information
 	 *
 	 * @url	GET /groups/{group}
 	 *
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index dc4a6af1735..fff151edf5d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -393,7 +393,7 @@ class User extends CommonObject
 	/**
 	 *    Constructor of the class
 	 *
-	 *    @param   DoliDb  $db     Database handler
+	 *    @param   DoliDB  $db     Database handler
 	 */
 	public function __construct($db)
 	{
@@ -1590,7 +1590,7 @@ class User extends CommonObject
 		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		// Check parameters
-		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEMail($this->email)) {
+		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEmail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -1993,7 +1993,7 @@ class User extends CommonObject
 		// Check parameters
 		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
-		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEMail($this->email)) {
+		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEmail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -3334,7 +3334,7 @@ class User extends CommonObject
 		// When password is modified
 		if (!empty($this->pass)) {
 			if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
-				$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = mot de passe non crypte
+				$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = unencrypted password
 			}
 			if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 				$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
@@ -3352,7 +3352,7 @@ class User extends CommonObject
 			} elseif (!empty($this->pass_indatabase)) {
 				// Use $this->pass_indatabase value if exists
 				if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
-					$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
+					$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = unencrypted password
 				}
 				if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 					$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 2f984f8472a..ebf3c37d443 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -144,9 +144,9 @@ class UserGroup extends CommonObject
 
 
 	/**
-	 *    Constructor de la classe
+	 *    Class constructor
 	 *
-	 *    @param   DoliDb  $db     Database handler
+	 *    @param   DoliDB  $db     Database handler
 	 */
 	public function __construct($db)
 	{
@@ -156,7 +156,7 @@ class UserGroup extends CommonObject
 
 
 	/**
-	 *  Charge un objet group avec toutes ses caracteristiques (except ->members array)
+	 *  Charge un object group avec toutes ses caracteristiques (except ->members array)
 	 *
 	 *	@param      int		$id				Id of group to load
 	 *	@param      string	$groupname		Name of group to load
@@ -458,7 +458,7 @@ class UserGroup extends CommonObject
 		if (!empty($rid)) {
 			$module = $perms = $subperms = '';
 
-			// Si on a demande supression d'un droit en particulier, on recupere
+			// Si on a demande suppression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
@@ -489,7 +489,7 @@ class UserGroup extends CommonObject
 			}
 
 			// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
-			// TODO A virer quand sera gere par l'appelant
+			// TODO To remove when this will be implemented by the caller
 			//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
 		} else {
 			// Add permission of the list $wherefordel
@@ -565,10 +565,10 @@ class UserGroup extends CommonObject
 
 
 	/**
-	 *  Charge dans l'objet group, la liste des permissions auquels le groupe a droit
+	 *  Load the list of permissions for the user into the group object
 	 *
 	 *  @param      string	$moduletag	 	Name of module we want permissions ('' means all)
-	 *	@return     int						Return integer <0 if KO, >=0 if OK
+	 *  @return     int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function getrights($moduletag = '')
 	{
@@ -790,7 +790,7 @@ class UserGroup extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the user card (with optionaly the picto)
+	 *  Return a link to the user card (with optionally the picto)
 	 *  Use this->id,this->lastname, this->firstname
 	 *
 	 *  @param  int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
@@ -912,7 +912,7 @@ class UserGroup extends CommonObject
 	/**
 	 *	Initialize the info array (array of LDAP values) that will be used to call LDAP functions
 	 *
-	 *	@return		array		Tableau info des attributs
+	 *	@return		array		Tableau info des attributes
 	 */
 	public function _load_ldap_info()
 	{
@@ -960,7 +960,7 @@ class UserGroup extends CommonObject
 	{
 		global $conf, $user, $langs;
 
-		// Initialise parametres
+		// Initialise parameters
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 2e36a90fdfe..566839648b6 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -62,7 +62,7 @@ if ($id) {
 	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write"))
 	|| (($user->id != $id) && $user->hasRight("user", "user", "write")));
 	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password"))
-	|| (($user->id != $id) && $user->hasRight("user", "user", "passsword")));
+	|| (($user->id != $id) && $user->hasRight("user", "user", "password")));
 }
 
 $permissiontoadd = $caneditfield;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
@@ -199,7 +199,7 @@ if ($object->id) {
 	}
 	print '</tr>';
 
-	// Nunber of files
+	// Number of files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 
 	// Total size
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index fef64149a62..ae333616dc2 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -401,7 +401,7 @@ if ($action == 'create') {
 
 			print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
 
-			// On selectionne les users qui ne sont pas deja dans le groupe
+			// Select the users that do not belong to the group yet
 			$exclude = array();
 
 			if (!empty($object->members)) {
@@ -420,7 +420,7 @@ if ($action == 'create') {
 					print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
 					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print '<input type="hidden" name="action" value="adduser">';
-					print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+					print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 					print '<table class="noborder centpercent">'."\n";
 					print '<tr class="liste_titre"><td class="titlefield liste_titre">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
 					print '<td class="liste_titre">';
@@ -439,7 +439,7 @@ if ($action == 'create') {
 				 * Group members
 				 */
 
-				print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+				print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre">';
 				print '<td class="liste_titre">'.$langs->trans("Login").'</td>';
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index f9c0de59212..f16ad223d35 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -20,7 +20,7 @@
 /**
  *       \file       htdocs/user/group/ldap.php
  *       \ingroup    ldap
- *       \brief      Page fiche LDAP groupe
+ *       \brief      Page Record LDAP Group
  */
 
 // Load Dolibarr environment
@@ -162,7 +162,7 @@ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 
 
 
-// Affichage attributs LDAP
+// Affichage attributes LDAP
 print load_fiche_titre($langs->trans("LDAPInformationsForThisGroup"));
 
 print '<table class="noborder centpercent">';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index eca5150dc9c..c905682e1b6 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -102,7 +102,7 @@ if (!$user->hasRight("user", "user", "read") && !$user->admin) {
 	accessforbidden();
 }
 
-// Defini si peux lire/modifier utilisateurs et permisssions
+// Defini si peux lire/modifier utilisateurs et permissions
 $caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 $permissiontodelete = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 5fa3ae5b937..a9fdcd8ce56 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -197,7 +197,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="liste nohover centpercent">';
 
 	print '<tr class="liste_titre_filter">';
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index bd44fafdaf8..dfb01dba524 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -19,7 +19,7 @@
 /**
  *      \file       htdocs/user/info.php
  *      \ingroup    core
- *		\brief      Page des informations d'un utilisateur
+ *		\brief      Page des information d'un utilisateur
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index c4503ba477f..fcc81a3a3cc 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -169,7 +169,7 @@ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 
 
 
-// Affichage attributs LDAP
+// Affichage attributes LDAP
 print load_fiche_titre($langs->trans("LDAPInformationsForThisUser"));
 
 print '<table class="noborder centpercent">';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index f59b473c767..f2ea4def68c 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -83,7 +83,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -735,7 +735,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index a0958a4d6fc..4f718ceddf3 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members'));
 
-// Defini si peux lire/modifier permisssions
+// Defini si peux lire/modifier permissions
 $canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 
 $id = GETPOST('id', 'int');
@@ -438,7 +438,7 @@ if ($action == 'edit') {
 	print dol_get_fiche_end();
 
 
-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index cf2404301da..b16afb3b037 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -82,7 +82,7 @@ class ProductAttribute extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -156,7 +156,7 @@ class ProductAttribute extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -1100,7 +1100,7 @@ class ProductAttribute extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 4d4dc87f74a..7636df31290 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -61,7 +61,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 7a2212ca55b..aea5abea6d9 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -165,7 +165,7 @@ class ProductCombination
 		}
 
 		if (!is_array($this->combination_price_levels)
-			|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
+			|| empty($fk_price_level) // if fetch an unique level don't erase all already fetched
 		) {
 			$this->combination_price_levels = array();
 		}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index e7913c9750c..e3e11b96f6f 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -497,7 +497,7 @@ if (!empty($id) || !empty($ref)) {
 
 	$listofvariantselected = '';
 
-	// Create or edit a varian
+	// Create or edit a variant
 	if ($action == 'add' || ($action == 'edit')) {
 		if ($action == 'add') {
 			$title = $langs->trans('NewProductCombination');
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 4ef25ddbacd..c687b476e41 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -75,7 +75,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -509,7 +509,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table id="tableattributes" class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index e2429115974..0c22ac89a53 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -70,6 +70,10 @@ if (isset($_GET["modulepart"])) {
 	if ($_GET["modulepart"] == 'medias') {
 		$needlogin = 0;
 	}
+	// Common files (files into /public/theme/common)
+	if ($_GET["modulepart"] == 'common') {
+		$needlogin = 0;
+	}
 	// User photo when user has made its profile public (for virtual credi card)
 	if ($_GET["modulepart"] == 'userphotopublic') {
 		$needlogin = 0;
@@ -195,8 +199,7 @@ if (!empty($hashp)) {
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
 	} else {
-		$langs->load("errors");
-		httponly_accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 403, 1);
+		httponly_accessforbidden("ErrorFileNotFoundWithSharedLink", 403, 1);
 	}
 }
 
@@ -231,7 +234,7 @@ if ($refname == 'thumbs') {
 
 // Check that file is allowed for view with viewimage.php
 if (!empty($original_file) && !dolIsAllowedForPreview($original_file)) {
-	httponly_accessforbidden('This file is not qualified for preview', 403);
+	httponly_accessforbidden('This file extension is not qualified for preview', 403);
 }
 
 // Security check
@@ -256,7 +259,9 @@ if (!empty($hashp)) {
 	$sqlprotectagainstexternals = '';
 } elseif (GETPOSTINT("publictakepos")) {
 	if (getDolGlobalString('TAKEPOS_AUTO_ORDER') && in_array($modulepart, array('product', 'category'))) {
-		$accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories
+		$accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories with no login
+		// TODO Replace this with a call of getPublicImageOfObject like used by website so
+		// only shared images are visible
 	}
 } else {
 	// Basic protection (against external users only)
@@ -344,8 +349,8 @@ if ($modulepart == 'barcode') {
 	// Output files on browser
 	dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
 
-	// This test is to avoid error images when image is not available (for example thumbs).
-	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"])) {
+	if (!dol_is_file($fullpath_original_file) && !GETPOSTINT("noalt", 1)) {
+		// This test is to replace error images with a nice "notfound image" when image is not available (for example when thumbs not yet generated).
 		$fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
 		/*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
 		print $error;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index c13638662eb..0ee668af87f 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -81,7 +81,7 @@ class Target extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -173,7 +173,7 @@ class Target extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -217,10 +217,10 @@ class Target extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, ID of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$resultcreate = $this->createCommon($user, $notrigger);
 		$this->ref = $this->id;
@@ -445,10 +445,10 @@ class Target extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -456,11 +456,11 @@ class Target extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -471,10 +471,10 @@ class Target extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
 	 *  @return int         		>0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -502,7 +502,7 @@ class Target extends CommonObject
 
 		// Protection
 		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
 			return 0;
 		}
 
@@ -691,7 +691,7 @@ class Target extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -974,7 +974,7 @@ class Target extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
@@ -1057,7 +1057,7 @@ class TargetLine extends CommonObjectLine
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 58f182852d9..69cc920f1c5 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -56,7 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index f3e53503698..a3609a34d41 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -87,7 +87,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
@@ -511,7 +511,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 04e61a48c4d..6c70a42cd95 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -37,7 +37,7 @@ if (!$user->admin) {
 
 $actionsave = GETPOST("save");
 
-// Sauvegardes parametres
+// Sauvegardes parameters
 if ($actionsave) {
 	$i = 0;
 
diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
old mode 100755
new mode 100644
index 96460e75b29..c9bdf61ff45
--- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
@@ -34,7 +34,7 @@ $WS_METHOD_CREATE = 'createActionComm';
 $WS_METHOD_GET_C_LIST = 'getListActionCommType';
 $ns='http://www.dolibarr.org/ns/';
 
-//Chosse action to do
+//Chose action to do
 //$action='get';
 //$action='getlist';
 $action='create';
diff --git a/htdocs/webservices/demo_wsclient_category.php-NORUN b/htdocs/webservices/demo_wsclient_category.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/webservices/demo_wsclient_invoice.php-NORUN b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/webservices/demo_wsclient_other.php-NORUN b/htdocs/webservices/demo_wsclient_other.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
old mode 100755
new mode 100644
index e7d057f3dfc..2650b696a75
--- a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
@@ -35,7 +35,7 @@ $WS_METHOD_UPDATETHIRDSPARTY = 'updateThirdParty';
 $WS_METHOD_GETTHIRDSPARTYLIST = 'getListOfThirdParties';
 $ns='http://www.dolibarr.org/ns/';
 
-//Chosse action to do
+//Chose action to do
 //$action='get';
 //$action='create';
 //$action='update';
@@ -124,8 +124,8 @@ if ($action=='create')
 	'capital'=>'3000',
 	'vat_used'=>'0',
 	'vat_number'=>''
-	//,'options_attr1'=>'Attr1 balbal', //Extra field exemple where field code is attr1
-	//'options_attr2'=>'Attr2 balbal' //Extra field exemple where field code is attr2
+	//,'options_attr1'=>'Attr1 balbal', //Extra field example where field code is attr1
+	//'options_attr2'=>'Attr2 balbal' //Extra field example where field code is attr2
 	);
 	
 	
@@ -173,8 +173,8 @@ if ($action=='update')
 	'capital'=>'3000',
 	'vat_used'=>'0',
 	'vat_number'=>''
-	//,'options_attr1'=>'Attr1 balbal', //Extra field exemple where field code is attr1
-	//'options_attr2'=>'Attr2 balbal' //Extra field exemple where field code is attr2
+	//,'options_attr1'=>'Attr1 balbal', //Extra field example where field code is attr1
+	//'options_attr2'=>'Attr2 balbal' //Extra field example where field code is attr2
 	);
 
 
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index ae289048795..6e3e66bc205 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -109,7 +109,7 @@ $server->wsdl->addComplexType(
 );
 
 /*
- * Les catégories filles, sous tableau dez la catégorie
+ * The child categories, sub-tables of the category
  */
 $server->wsdl->addComplexType(
 	'FillesArray',
@@ -255,20 +255,20 @@ function getCategory($authentication, $id)
 
 				$cats = $categorie->get_filles();
 				if (count($cats) > 0) {
-					foreach ($cats as $fille) {
+					foreach ($cats as $child_cat) {
 						$dir = (!empty($conf->categorie->dir_output) ? $conf->categorie->dir_output : $conf->service->dir_output);
-						$pdir = get_exdir($fille->id, 2, 0, 0, $categorie, 'category').$fille->id."/photos/";
+						$pdir = get_exdir($child_cat->id, 2, 0, 0, $categorie, 'category').$child_cat->id."/photos/";
 						$dir = $dir.'/'.$pdir;
 						$cat['filles'][] = array(
-							'id'=>$fille->id,
+							'id'=>$child_cat->id,
 							'id_mere' => $categorie->id_mere,
-							'label'=>$fille->label,
-							'description'=>$fille->description,
-							'socid'=>$fille->socid,
-							//'visible'=>$fille->visible,
-							'type'=>$fille->type,
+							'label'=>$child_cat->label,
+							'description'=>$child_cat->description,
+							'socid'=>$child_cat->socid,
+							//'visible'=>$child_cat->visible,
+							'type'=>$child_cat->type,
 							'dir' => $pdir,
-							'photos' => $fille->liste_photos($dir, $nbmax)
+							'photos' => $child_cat->liste_photos($dir, $nbmax)
 						);
 					}
 				}
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 1e35c000926..6fe3799c253 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -245,7 +245,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 	if (!$error) {
 		$fuser->getrights();
 
-		// Suppression de la chaine de caractere ../ dans $original_file
+		// Suppression de la chaine de character ../ dans $original_file
 		$original_file = str_replace("../", "/", $original_file);
 
 		// find the subdirectory name as the reference
@@ -279,7 +279,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 		}
 
 		// Security:
-		// Limite acces si droits non corrects
+		// Limit access si droits non corrects
 		if (!$accessallowed) {
 			$errorcode = 'NOT_PERMITTED';
 			$errorlabel = 'Access not allowed';
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 7794fb9166c..37ec4d8f2de 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -772,7 +772,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				$arraythirdparties[] = array('id'=>$obj->socRowid,
 					'ref'=>$obj->ref,
 					'ref_ext'=>$obj->ref_ext,
-					'adress'=>$obj->adress,
+					'address'=>$obj->address,
 					'zip'=>$obj->zip,
 					'town'=>$obj->town,
 					'country'=>$obj->country,
@@ -861,7 +861,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					$error++;
 					$errorcode = 'KO';
 					$errorlabel = $thirdparty->error;
-					dol_syslog("Function: deleteThirdParty cant delete");
+					dol_syslog("Function: deleteThirdParty can't delete");
 				}
 			} else {
 				$error++;
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index f5a4ec292bd..c90626da003 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -131,7 +131,7 @@ class Website extends CommonObject
 	public $use_manifest;
 
 	/**
-	 * @var int	Postion
+	 * @var int	Position
 	 */
 	public $position;
 
@@ -148,7 +148,7 @@ class Website extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -159,11 +159,10 @@ class Website extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      	User that creates
-	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
-	 *
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
 	 * @return int 				Return integer <0 if KO, 0 if already exists, ID of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -487,12 +486,11 @@ class Website extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  int 	$notrigger 	0=launch triggers after, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -599,12 +597,11 @@ class Website extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      	User that deletes
-	 * @param bool $notrigger 	false=launch triggers, true=disable triggers
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param User 	$user      	User that deletes
+	 * @param int 	$notrigger 	0=launch triggers, 1=disable triggers
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		global $conf;
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 9b4fe24dbc3..85053622db3 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -146,7 +146,7 @@ class WebsitePage extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
@@ -197,7 +197,7 @@ class WebsitePage extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -208,10 +208,10 @@ class WebsitePage extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
 		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
@@ -236,7 +236,7 @@ class WebsitePage extends CommonObject
 	 *                                  - If this is 0, the value into $page will be used. If not found or $page not defined, the default page of website_id will be used or the first page found if not set.
 	 *                                  - If value is < 0, we must exclude this ID.
 	 * @param string    $website_id     Web site id (page name must also be filled if this parameter is used)
-	 * @param string    $page           Page name (website id must also be filled if this parameter is used). Exemple 'myaliaspage' or 'fr/myaliaspage'
+	 * @param string    $page           Page name (website id must also be filled if this parameter is used). Example 'myaliaspage' or 'fr/myaliaspage'
 	 * @param string    $aliasalt       Alternative alias to search page (slow)
 	 *
 	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
@@ -555,10 +555,10 @@ class WebsitePage extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
 		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
@@ -592,11 +592,11 @@ class WebsitePage extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -740,7 +740,7 @@ class WebsitePage extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the user card (with optionaly the picto)
+	 *  Return a link to the user card (with optionally the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 19818831462..162fc6520d5 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -783,7 +783,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 
 			$urltograbdirwithoutslash = dirname($urltograb.'.');
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograbdirwithoutslash);
-			// Exemple, now $urltograbdirwithoutslash is https://www.dolimed.com/screenshots
+			// Example, now $urltograbdirwithoutslash is https://www.dolimed.com/screenshots
 			// and $urltograbdirrootwithoutslash is https://www.dolimed.com
 		}
 
@@ -1150,7 +1150,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 		// Define id of page the new page is translation of
 		$pageidfortranslation = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		if ($pageidfortranslation > 0) {
-			// Check if the page we are translation of is alreayd a translation of a source page. if yes, we will use source id instead
+			// Check if the page we are translation of is already a translation of a source page. if yes, we will use source id instead
 			$objectpagetmp = new WebsitePage($db);
 			$objectpagetmp->fetch($pageidfortranslation);
 			if ($objectpagetmp->fk_page > 0) {
@@ -2709,7 +2709,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 				$i++;
 			}
 
-			// Adding a RSS feed into a sitemap should nto be required. The RSS contains pages that are already included into
+			// Adding a RSS feed into a sitemap should not be required. The RSS contains pages that are already included into
 			// the sitemap and RSS feeds are not shown into index.
 			if ($addrsswrapper && getDolGlobalInt('WEBSITE_ADD_RSS_FEED_INTO_SITEMAP')) {
 				$url = $domtree->createElement('url');
@@ -2982,7 +2982,7 @@ if (!GETPOST('hide_websitemenu')) {
 			print '</span>';
 		}
 
-		// Refresh / Reload web site (for non javascript browers)
+		// Refresh / Reload web site (for non javascript browsers)
 		if (empty($conf->use_javascript_ajax)) {
 			print '<span class="websiteselection">';
 			print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
@@ -3342,7 +3342,7 @@ if (!GETPOST('hide_websitemenu')) {
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 
-				print '<div class="inline-block marginrightonly">';	// Button include dynamic contant
+				print '<div class="inline-block marginrightonly">';	// Button includes dynamic content
 				print $langs->trans("ShowSubcontainers");
 				if (!getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
@@ -3537,10 +3537,14 @@ if (!GETPOST('hide_websitemenu')) {
 		if ($action == 'editsource' || $action == 'editcontent' || GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha')) {
 			$url = 'https://wiki.dolibarr.org/index.php/Module_Website';
 
-			$htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
+			$htmltext = '<small>';
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource1", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource3", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
 			$htmltext .= '<br>';
+			$htmltext .= '</small>';
 			if ($conf->browser->layout == 'phone') {
 				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
 			} else {
@@ -5021,7 +5025,7 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 		// $filecss
 		// $filephp
 
-		// Ouput page under the Dolibarr top menu
+		// Output page under the Dolibarr top menu
 		$objectpage->fetch($pageid);
 
 		$jscontent = @file_get_contents($filejs);
@@ -5111,7 +5115,7 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 			try {
 				$res = include $filephp;
 				if (empty($res)) {
-					print "ERROR: Failed to include file '".$filephp."'. Try to edit and re-save page ith this ID.";
+					print "ERROR: Failed to include file '".$filephp."'. Try to edit and re-save page with this ID.";
 				}
 			} catch (Exception $e) {
 				print $e->getMessage();
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 59fed2107bc..3637a6e9c7e 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -51,7 +51,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 303e20b9f14..c3a03763d8f 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -79,7 +79,7 @@ class Workstation extends CommonObject
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -191,7 +191,7 @@ class Workstation extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -232,10 +232,10 @@ class Workstation extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $db;
 
@@ -492,10 +492,10 @@ class Workstation extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 
 		// Usergroups
@@ -531,11 +531,11 @@ class Workstation extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
@@ -546,10 +546,10 @@ class Workstation extends CommonObject
 	 *
 	 *	@param  User	$user       User that delete
 	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
+	 *  @param 	int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 *  @return int         		Return >0 if OK, <0 if KO
 	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
+	public function deleteLine(User $user, $idline, $notrigger = 0)
 	{
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
@@ -629,7 +629,7 @@ class Workstation extends CommonObject
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
@@ -928,7 +928,7 @@ class Workstation extends CommonObject
 	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param		Translate	$outputlangs	object lang a utiliser pour traduction
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 7d8f2d63eba..eb32971ba73 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -70,7 +70,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 4667af3ac8c..fc936018a29 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -84,7 +84,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Initialize array of search criterias
+// Initialize array of search criteria
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 
@@ -494,7 +494,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index ef9bce784f4..a0ef0d7761b 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -65,7 +65,7 @@ class Zapier extends DolibarrApi
 	/**
 	 * Get properties of a hook object
 	 *
-	 * Return an array with hook informations
+	 * Return an array with hook information
 	 *
 	 * @param   int             $id		ID of hook
 	 * @return  Object					Object with cleaned properties
@@ -94,7 +94,7 @@ class Zapier extends DolibarrApi
 	/**
 	 * Get list of possibles choices for module
 	 *
-	 * Return an array with hook informations
+	 * Return an array with hook information
 	 *
 	 * @return  array     data
 	 *
@@ -136,7 +136,7 @@ class Zapier extends DolibarrApi
 	 * @param int              $limit               Limit for list
 	 * @param int              $page                Page number
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
+	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
@@ -241,7 +241,7 @@ class Zapier extends DolibarrApi
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
 				$this->hook->context['caller'] = $request_data['caller'];
 				continue;
 			}
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 41e1d2161d9..2d13df89dee 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -68,7 +68,7 @@ class Hook extends CommonObject
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -252,7 +252,7 @@ class Hook extends CommonObject
 	/**
 	 * Constructor
 	 *
-	 * @param DoliDb $db Database handler
+	 * @param DoliDB $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
@@ -288,10 +288,10 @@ class Hook extends CommonObject
 	 * Create object into database
 	 *
 	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
-	public function create(User $user, $notrigger = false)
+	public function create(User $user, $notrigger = 0)
 	{
 		return $this->createCommon($user, $notrigger);
 	}
@@ -468,10 +468,10 @@ class Hook extends CommonObject
 	 * Update object into database
 	 *
 	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  int 	$notrigger 0=launch triggers after, 1=disable triggers
 	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
-	public function update(User $user, $notrigger = false)
+	public function update(User $user, $notrigger = 0)
 	{
 		return $this->updateCommon($user, $notrigger);
 	}
@@ -479,18 +479,18 @@ class Hook extends CommonObject
 	/**
 	 *  Delete object in database
 	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             Return integer <0 if KO, >0 if OK
+	 * @param User 	$user       User that deletes
+	 * @param int 	$notrigger  0=launch triggers after, 1=disable triggers
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param  string  $option                     On what the link point to ('nolink', ...)
diff --git a/phpstan.neon b/phpstan.neon
index 6ec75a416c6..cc4562d57b2 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,4 +1,11 @@
 parameters:
+	tmpDir: ./.github/tmp
+	parallel:
+		jobSize: 20
+		processTimeout: 600.0
+		maximumNumberOfProcesses: 8
+		minimumNumberOfJobsPerProcess: 2
+		buffer: 134217728 # 128 MB
 	customRulesetUsed: true
 	level: 2
 	fileExtensions:
@@ -9,14 +16,11 @@ parameters:
 	excludePaths:
 		analyseAndScan:
 		- htdocs/custom/*
-		- htdocs/dev/*
-		- htdocs/doc/*
 		- htdocs/documents/*
 		- htdocs/install/doctemplates/*
 		- htdocs/langs/*
 		- htdocs/modulebuilder/template/test/*
 		- htdocs/support/*
-		- htdocs/test/*
 		analyse:
 		- htdocs/includes/*
 	checkAlwaysTrueCheckTypeFunctionCall: false
@@ -24,7 +28,7 @@ parameters:
 	checkAlwaysTrueStrictComparison: false
 	checkClassCaseSensitivity: false
 	checkFunctionArgumentTypes: false
-	checkFunctionNameCase: false
+	checkFunctionNameCase: true
 	checkArgumentsPassedByReference: false
 	checkMaybeUndefinedVariables: false
 	checkNullables: false
@@ -39,38 +43,16 @@ parameters:
 	reportMagicMethods: false
 	reportMagicProperties: false
 	ignoreErrors:
-		- '#Undefined variable: \$langs#'
-		- '#Undefined variable: \$user#'
-		- '#Undefined variable: \$db#'
-		- '#Undefined variable: \$conf#'
-		- '#Undefined variable: \$hookmanager#'
-		- '#Undefined variable: \$mysoc#'
-		- '#Undefined variable: \$error#'
-		- '#Undefined variable: \$errors#'
-		- '#Undefined variable: \$form#'
-		- '#has an unused parameter \$param#'
-		- '#Function llxHeader invoked with#'
-		- '#Function llxHeaderVierge invoked with#'
-		- '#Function llxFooter invoked with#'
-		- '#Function llxFooterVierge invoked with#'
-		- '#If condition is always true#'
-		- '#always exists and is not falsy#'
-		- '#is always true#'
-		- '#is always fal#'
-		- '#has no return type specified#'
-		- '#always exists and is not nullable#'
-		- '#PHPDoc tag @return has invalid value#'
-		- '#type has no value type specified in iterable type array#'
-		- '#with no value type specified in iterable type array#'
-		- '#Empty array passed to foreach#'
 		- '#Result of function fieldList#'
-		- '#in isset\(\) is not nullable#'
-		- '#in isset\(\) is never defined#'
-		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Caught class Stripe#'
+		- '#Function llx.* invoked with#'
+		- '#always exists and is not falsy#'
+		- '#is always fal#'
+		- '#always exists and is not nullable#'
+		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
-		- '#Constructor of class DolEditor has an unused parameter \$toolbarlocation#'
-		- '#Constructor of class DoliDB\w+ has an unused parameter \$type#'
+		- '#Constructor of class .* has an unused parameter #'
+		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 	    nodesByFileCountMax: 512
diff --git a/phpstan_action.neon b/phpstan_action.neon
deleted file mode 100644
index aa63c928bab..00000000000
--- a/phpstan_action.neon
+++ /dev/null
@@ -1,104 +0,0 @@
-parameters:
-	bootstrapFiles:
-		- build/phpstan/bootstrap_action.php
-	tmpDir: ./.github/tmp
-	parallel:
-		jobSize: 20
-		processTimeout: 600.0
-		maximumNumberOfProcesses: 8
-		minimumNumberOfJobsPerProcess: 2
-		buffer: 134217728 # 128 MB
-	customRulesetUsed: true
-	level: 2
-	fileExtensions:
-		- php
-	paths:
-		- htdocs
-		- scripts
-	excludePaths:
-		analyseAndScan:
-		- htdocs/custom/*
-		- htdocs/documents/*
-		- htdocs/install/doctemplates/*
-		- htdocs/langs/*
-		- htdocs/modulebuilder/template/test/*
-		- htdocs/support/*
-		analyse:
-		- htdocs/includes/*
-	checkAlwaysTrueCheckTypeFunctionCall: false
-	checkAlwaysTrueInstanceof: false
-	checkAlwaysTrueStrictComparison: false
-	checkClassCaseSensitivity: false
-	checkFunctionArgumentTypes: false
-	checkFunctionNameCase: false
-	checkArgumentsPassedByReference: false
-	checkMaybeUndefinedVariables: false
-	checkNullables: false
-	checkThisOnly: true
-	checkUnionTypes: false
-	checkExplicitMixedMissingReturn: false
-	reportMaybes: false
-	reportMaybesInMethodSignatures: false
-	reportStaticMethodSignatures: false
-	polluteScopeWithLoopInitialAssignments: true
-	polluteScopeWithAlwaysIterableForeach: true
-	reportMagicMethods: false
-	reportMagicProperties: false
-	ignoreErrors:
-		- '#Result of function fieldList#'
-		- '#Caught class Stripe#'
-		- '#Function llx.* invoked with#'
-		- '#always exists and is not falsy#'
-		- '#is always fal#'
-		- '#always exists and is not nullable#'
-		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
-		- '#Sprain\\SwissQrBill\\#'
-		- '#Constructor of class .* has an unused parameter #'
-		- '#Default value of the parameter#'
-	internalErrorsCountLimit: 50
-	cache:
-		nodesByFileCountMax: 512
-		nodesByStringCountMax: 512
-	reportUnmatchedIgnoredErrors: false
-	universalObjectCratesClasses:
-		- stdClass
-		- SimpleXMLElement
-	earlyTerminatingMethodCalls: []
-	dynamicConstantNames:
-		- ICONV_IMPL
-		- PHP_VERSION
-		- PHP_MAJOR_VERSION
-		- PHP_MINOR_VERSION
-		- PHP_RELEASE_VERSION
-		- PHP_VERSION_ID
-		- PHP_EXTRA_VERSION
-		- PHP_ZTS
-		- PHP_DEBUG
-		- PHP_MAXPATHLEN
-		- PHP_OS
-		- PHP_OS_FAMILY
-		- PHP_SAPI
-		- PHP_EOL
-		- PHP_INT_MAX
-		- PHP_INT_MIN
-		- PHP_INT_SIZE
-		- PHP_FLOAT_DIG
-		- PHP_FLOAT_EPSILON
-		- PHP_FLOAT_MIN
-		- PHP_FLOAT_MAX
-		- DEFAULT_INCLUDE_PATH
-		- PEAR_INSTALL_DIR
-		- PEAR_EXTENSION_DIR
-		- PHP_EXTENSION_DIR
-		- PHP_PREFIX
-		- PHP_BINDIR
-		- PHP_BINARY
-		- PHP_MANDIR
-		- PHP_LIBDIR
-		- PHP_DATADIR
-		- PHP_SYSCONFDIR
-		- PHP_LOCALSTATEDIR
-		- PHP_CONFIG_FILE_PATH
-		- PHP_CONFIG_FILE_SCAN_DIR
-		- PHP_SHLIB_SUFFIX
-		- PHP_FD_SETSIZE
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000000..810261cad54
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,15 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[tool.codespell]
+skip = "*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css"
+
+quiet-level=2
+ignore-regex = '\\[fnrstv]'
+builtin = "clear,rare,informal,usage,code,names"
+#D = "-"
+#dictionary = "dev/tools/codespell/codespell-dict.txt"
+
+[tool.setuptools]
+include-package-data = false
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 80a9cea0f42..522bc5680a9 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -117,7 +117,7 @@ if ($result <= 0) {
 	print "Export for bank account ".$acct->ref." (".$acct->label.").\n";
 }
 
-// Creation de la classe d'export du model ExportXXX
+// Create the export class for the model ExportXXX
 $dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 $file = "export_".$model.".modules.php";
 $classname = "Export".$model;
@@ -249,7 +249,7 @@ if ($resql) {
 
 		// Libelle
 		$reg = array();
-		preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
+		preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parentheses on tente recherche de traduction
 		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1]) != $reg[1]) {
 			$description = $langs->transnoentitiesnoconv($reg[1]);
 		} else {
diff --git a/scripts/clicktodial/ekiga.sh b/scripts/clicktodial/ekiga.sh
index 4fce22f63cb..897926c7309 100755
--- a/scripts/clicktodial/ekiga.sh
+++ b/scripts/clicktodial/ekiga.sh
@@ -6,5 +6,5 @@
 # More information on https://wiki.dolibarr.org/index.php/Module_ClickToDial_En
 #---------------------------------------------------------
 
-ekiga -c $1 &
+ekiga -c "$1" &
 
diff --git a/scripts/clicktodial/linphone.sh b/scripts/clicktodial/linphone.sh
index ee013526c69..24178c23543 100755
--- a/scripts/clicktodial/linphone.sh
+++ b/scripts/clicktodial/linphone.sh
@@ -8,6 +8,8 @@
 # More information on https://wiki.dolibarr.org/index.php/Module_ClickToDial_En
 #---------------------------------------------------------
 
+# shellcheck disable=2006,2086
+
 # Note: Adding handler into gconf-tools seems to do nothing
 # gconftool-2 -t string -s /desktop/gnome/url-handlers/sip/command "linphone-3 -c %s"
 # gconftool-2 -s /desktop/gnome/url-handlers/sip/needs_terminal false -t bool
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index 962e0e6d951..7d31bb0f79d 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -139,7 +139,7 @@ if ($resql) {
 		$info = $contact->_load_ldap_info();
 		$dn = $contact->_load_ldap_dn($info);
 
-		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->add($dn, $info, $user); // Will fail if already exists
 		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0) {
 			print " - ".$langs->trans("OK");
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index d893db4118e..1d513151d96 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -218,7 +218,7 @@ if (empty($option) && count($filter) <= 0) {
 	rebuild_merge_pdf_usage();
 	exit(-1);
 }
-// Check if there is no uncompatible choice
+// Check if there is no incompatible choice
 if (in_array('payments', $filter) && in_array('nopayment', $filter)) {
 	rebuild_merge_pdf_usage();
 	exit(-1);
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index ae01a088393..705ffb17852 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -148,7 +148,7 @@ if ($resql) {
 		$info = $member->_load_ldap_info();
 		$dn = $member->_load_ldap_dn($info);
 
-		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->add($dn, $info, $user); // Will fail if already exists
 		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0) {
 			print " - ".$langs->transnoentities("OK");
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 90dd86b0ad6..eb2e0a60828 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -192,7 +192,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_MEMBER_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_MEMBER_DN'), getDolGlobalString('LDAP_KEY_MEMBERS'), $required_fields, 'member'); // Fiter on 'member' filter param
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_MEMBER_DN'), getDolGlobalString('LDAP_KEY_MEMBERS'), $required_fields, 'member'); // Filter on 'member' filter param
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index 5fd145e0926..8c118fbcc5b 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -106,7 +106,7 @@ if ($resql) {
 			$info = $membertype->_load_ldap_info();
 			$dn = $membertype->_load_ldap_dn($info);
 
-			$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+			$result = $ldap->add($dn, $info, $user); // Will fail if already exists
 			$result = $ldap->update($dn, $info, $user, $olddn);
 			if ($result > 0) {
 				print " - ".$langs->trans("OK");
diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index 7ab54549411..c64c9532d78 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -18,6 +18,8 @@
 # If you got this error: javaldx failed! Warning: failed to read path from javaldx with no return to prompt when running soffice --headless -env:UserInstallation=file:"/tmp" --convert-to pdf --outdir xxx ./yyy.odt,
 # check that directory defined into env:UserInstallation parameters exists and is writeable.
 
+# shellcheck disable=2046,2086,2268
+
 
 if [ "x$1" == "x" ]
 then
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index 2c37c96dd4e..4dbdf3ae5eb 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -21,7 +21,7 @@
 /**
  * \file scripts/user/sync_groups_dolibarr2ldap.php
  * \ingroup ldap core
- * \brief Script de mise a jour des groupes dans LDAP depuis base Dolibarr
+ * \brief Script to update the groups in LDAP from the Dolibarr DB
  */
 
 if (!defined('NOSESSION')) {
@@ -97,7 +97,7 @@ if ($resql) {
 		$info = $fgroup->_load_ldap_info();
 		$dn = $fgroup->_load_ldap_dn($info);
 
-		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->add($dn, $info, $user); // Will fail if already exists
 		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0) {
 			print " - ".$langs->trans("OK");
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 88d39ea2cd5..a737f412301 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -172,8 +172,8 @@ if ($result >= 0) {
 
 			// print_r($group);
 
-			// Gestion des utilisateurs associés au groupe
-			// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
+			// Management of the users associated with the group
+			// 1 - Association of users in the LDAP group with the Dolibarr group
 			$userList = array();
 			$userIdList = array();
 			foreach ($ldapgroup[getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS')] as $tmpkey => $userdn) {
@@ -184,7 +184,7 @@ if ($result >= 0) {
 					// Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if (getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS') === 'memberUid') {
 						$userKey = array($userdn);
-					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
+					} else { // Pour les autres schémas, les membres sont listés sous forme de DN completes
 						$userFilter = explode(',', $userdn);
 						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', getDolGlobalString('LDAP_KEY_USERS'));
 					}
@@ -207,14 +207,14 @@ if ($result >= 0) {
 
 				$userIdList[$userdn] = $fuser->id;
 
-				// Ajout de l'utilisateur dans le groupe
+				// Add the user in the group
 				if (!in_array($fuser->id, array_keys($group->members))) {
 					$fuser->SetInGroup($group->id, $group->entity);
 					echo $fuser->login.' added'."\n";
 				}
 			}
 
-			// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
+			// 2 - Delete users from the Dolibarr group that are no longer in the LDAP group
 			foreach ($group->members as $guser) {
 				if (!in_array($guser->id, $userIdList)) {
 					$guser->RemoveFromGroup($group->id, $group->entity);
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 6ecad166ca1..4241d56ba5a 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -21,7 +21,7 @@
 /**
  * \file scripts/user/sync_users_dolibarr2ldap.php
  * \ingroup ldap core
- * \brief Script de mise a jour des users dans LDAP depuis base Dolibarr
+ * \brief Script to update users in LDAP from Dolibarr DB
  */
 
 if (!defined('NOSESSION')) {
@@ -96,7 +96,7 @@ if ($resql) {
 		$info = $fuser->_load_ldap_info();
 		$dn = $fuser->_load_ldap_dn($info);
 
-		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->add($dn, $info, $user); // Will fail if already exists
 		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0) {
 			print " - ".$langs->trans("OK");
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 34e0c0b4382..f3feb6084c0 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -177,7 +177,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_SYNCHRO_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_USER_DN'), getDolGlobalString('LDAP_KEY_USERS'), $required_fields, 'user'); // Fiter on 'user' filter param
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_USER_DN'), getDolGlobalString('LDAP_KEY_USERS'), $required_fields, 'user'); // Filter on 'user' filter param
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
@@ -264,8 +264,8 @@ if ($result >= 0) {
 			print "\n";
 			// print_r($fuser);
 
-			// Gestion des groupes
-			// TODO : revoir la gestion des groupes (ou script de sync groupes)
+			// Management of the groups
+			// TODO : Review the group management (or script for syncing groups)
 			/*
 			 * if(!$error) {
 			 * foreach ($ldapuser[getDolGlobalString('LDAP_FIELD_USERGROUPS') as $groupdn) {
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index 237ff9919aa..f07e52c71d9 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -19,7 +19,7 @@
 /**
  * \file scripts/website/migrate_news_joomla2dolibarr.php
  * \ingroup scripts
- * \brief Migrate news from a Joomla databse into a Dolibarr website
+ * \brief Migrate news from a Joomla database into a Dolibarr website
  */
 
 if (!defined('NOSESSION')) {
@@ -54,7 +54,7 @@ if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($w
 	print '***** '.$script_file.' *****'."\n";
 	print "Usage: $script_file (test|confirm) website login:pass@serverjoomla/tableprefix/databasejoomla [nbmaxrecord]\n";
 	print "\n";
-	print "Load joomla news and create them into Dolibarr database (if they don't alreay exist).\n";
+	print "Load joomla news and create them into Dolibarr database (if they don't already exist).\n";
 	exit(-1);
 }
 
diff --git a/test/acceptance/README.md b/test/acceptance/README.md
index 141370208d0..c3b15f62e12 100644
--- a/test/acceptance/README.md
+++ b/test/acceptance/README.md
@@ -57,7 +57,7 @@ Now we can run selenium by two ways:
    npm update
    ```
 
-* In *nightwatch.conf.js* file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration.
+* Copy the file *nightwatch.conf.js* inside the root directory of the project and inside this configuration file set the following environment variable. We can change the default values according to our local configuration.
 
    ```
     const admin_username = process.env.ADMIN_USERNAME || 'admin';
diff --git a/nightwatch.conf.js b/test/acceptance/nightwatch.conf.js
similarity index 100%
rename from nightwatch.conf.js
rename to test/acceptance/nightwatch.conf.js
diff --git a/test/awbot/awbot.test.conf b/test/awbot/awbot.test.conf
index d01e356c245..54bf878967e 100644
--- a/test/awbot/awbot.test.conf
+++ b/test/awbot/awbot.test.conf
@@ -31,7 +31,7 @@ SERVER = "localhostdolibarr"	# Domain name of main server to test (www.mysite.co
 #PROXYSERVER = "http://my.proxy.server:port/"	# If the web application to test is after a proxy
 
 BOTNAME = "AWBot"			# String value to force bot name used in the user agent string
-DELAY = 0					# Delay beetween each HTTP request (-1 wait a key, 0 no delay, n number of seconds)
+DELAY = 0					# Delay between each HTTP request (-1 wait a key, 0 no delay, n number of seconds)
 MAXSIZE = 0					# Maximum size of HTTP response (0 = no limit)
 TIMEOUT = 120				# Timeout (when waiting for a server response after sending a request)
 LANG = "en"					# Choose output language
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index 8bd7653970b..23f453c7e90 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -86,7 +86,7 @@ class AccountingAccountTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('accounting')) {
-			print __METHOD__." module accouting must be enabled.\n";
+			print __METHOD__." module accounting must be enabled.\n";
 			exit(-1);
 		}
 
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 5e19e42eed0..10cfda909e7 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -240,7 +240,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 					// Must not found $this->db->
 					$ok=true;
 					$matches=array();
-					// Check string $this->db-> into a non class.php file (it shoud be $db-> into such classes)
+					// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
 					preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
 						$ok=false;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index d343ba99b8d..15ad2ce5652 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -455,7 +455,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 
 		$filterdatatoexport='';
 		//$filterdatatoexport='';
-		//$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Mut be fields found into declaration of dataset
+		//$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Must be fields found into declaration of dataset
 
 		// Load properties of arrays to make export
 		$objexport=new Export($db);
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index be1365e79c7..7de77b42a88 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -141,13 +141,13 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$result=dol_basename('adir/afile');
+		$result=dol_basename('adir/a_file');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile', $result);
+		$this->assertEquals('a_file', $result);
 
-		$result=dol_basename('adir/afile/');
+		$result=dol_basename('adir/a_file/');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile', $result);
+		$this->assertEquals('a_file', $result);
 
 		$result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
 		print __METHOD__." result=".$result."\n";
@@ -597,7 +597,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		dol_copy($file, $dirsrcpath.'/file.csv');
 		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertTrue($result, 'move of directory with file whitout rename needed in directory');
+		$this->assertTrue($result, 'move of directory with file without rename needed in directory');
 
 		// To test a move with a directory to rename in src directory
 		dol_mkdir($dirsrcpath);
@@ -613,6 +613,6 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		dol_mkdir($dirsrcpath.'/notorename');
 		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertTrue($result, 'move of directory with directory whitout rename needed in directory');
+		$this->assertTrue($result, 'move of directory with directory without rename needed in directory');
 	}
 }
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 59ae8e4f7ac..f2adfeff992 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -170,7 +170,7 @@ class Functions2LibTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testIsValidMailDomain()
 	{
-		$mail = 'bidon@unvalid.unvalid';
+		$mail = 'bidon@invalid.invalid';
 		$result = isValidMailDomain($mail);
 		$this->assertEquals(0, $result, 'Email isValidMailDomain('.$mail.') should return 0 (not valid) but returned '.$result);
 
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 745e3439493..83ee4fbcd66 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -156,7 +156,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
@@ -181,7 +181,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
 		$result=$numbering->getNextValue($mysoc, $localobject2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
+		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reset)
 		$result2=$localobject2->create($user, 1);
 		print __METHOD__." result2=".$result."\n";
 		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
@@ -228,7 +228,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3nd invoice, same day');	// counter must be now 1
+		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3rd invoice, same day');	// counter must be now 1
 
 		// Same but we add month after year
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
@@ -259,7 +259,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$result2=$localobject2->create($user, 1);
 		$result3=$localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
+		$this->assertEquals('192101-0001', $result);			// counter must be reset to 1
 		$result=$localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
@@ -293,7 +293,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$result2=$localobject2->create($user, 1);
 		$result3=$localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
+		$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2nd invoice');			// counter must be now 2
 		$result=$localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
@@ -681,7 +681,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
+		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
 		$numbering=new mod_expedition_safor();
 		$result=$numbering->getNextValue($mysoc, $localobject);
 
diff --git a/test/phpunit/RepositoryTest.php b/test/phpunit/RepositoryTest.php
index 74ed813a1cd..44bef47e8d4 100644
--- a/test/phpunit/RepositoryTest.php
+++ b/test/phpunit/RepositoryTest.php
@@ -170,12 +170,12 @@ class RepositoryTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		// Scan dir to guarante we don't have library jquery twice
+		// Scan dir to guarantee we don't have library jquery twice
 		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.js) twice');
 
-		// Scan dir to guarante we don't have library jquery twice
+		// Scan dir to guarantee we don't have library jquery twice
 		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.min\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.min.js) twice '.(empty($foundfiles[0]) ? '' : $foundfiles[0]['fullname']).' '.(empty($foundfiles[1]) ? '' : $foundfiles[1]['fullname']));
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 04be9b63b55..70c280b64c4 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -188,8 +188,8 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 		echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
 		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, 'Parsing of json result must not be null');
-		$this->assertEquals('401', $result['http_code'], 'Return code is not 401');
-		$this->assertEquals('401', (empty($object['error']['code']) ? '' : $object['error']['code']), 'Error code is not 401');
+		$this->assertEquals('400', $result['http_code'], 'Test to push a document on a non existing dir does not return 400');
+		$this->assertEquals('400', (empty($object['error']['code']) ? '' : $object['error']['code']), 'Test to push a document on a non existing dir does not return 400');
 
 
 		// Send to existent directory
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 8ef6ca5a65e..679db13cfe2 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -202,7 +202,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testRestCreateUser()
 	{
-		// attemp to create without mandatory fields :
+		// attempt to create without mandatory fields :
 		$url = $this->api_url.'/users?api_key='.$this->api_key;
 		$addheaders=array('Content-Type: application/json');
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 4615efe8c22..84f43da843e 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -351,7 +351,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject mmm');
 
 
-		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
+		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
 		$result=testSqlAndScriptInject($test, 0);	// result must be 0
 		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject mmm, result should be 0 and is not');
 
@@ -408,7 +408,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param12"]='<!DOCTYPE html><html>aaa</html>';
 		$_POST["param13"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
 		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
-		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
+		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
 		$_POST["param15"]="<img onerror<=alert(document.domain)> src=>0xbeefed";
 		//$_POST["param15b"]="<html><head><title>Example HTML</title></head><body><div><p>This is a paragraph.</div><ul><li>Item 1</li><li>Item 2</li></ol></body><html>";
 		$_POST["param16"]='<a style="z-index: 1000">abc</a>';
@@ -577,7 +577,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 		$result=GETPOST("param14", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals("Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)", $result, 'Test 14');
+		$this->assertEquals("Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)", $result, 'Test 14');
 
 		$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result=".$result."\n";
@@ -588,7 +588,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('<a href="&lpar;alert(document.cookie)&rpar;">XSS</a>', $result, 'Test 19');
 
 
-		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML only to test disabling of bad atrributes
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML only to test disabling of bad attributes
 
 		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
 		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
@@ -615,7 +615,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		//$this->assertEquals('"c:\this is a path~1\aaan 110;" abcdef', $result);		// ... on other PHP and libxml versions, we got a HTML that has been cleaned
 
 
-		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY only to test disabling of bad atrributes
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY only to test disabling of bad attributes
 
 		if (extension_loaded('tidy') && class_exists("tidy")) {
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
@@ -639,7 +639,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		}
 
 
-		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY to test disabling of bad atrributes
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY to test disabling of bad attributes
 
 		if (extension_loaded('tidy') && class_exists("tidy")) {
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
@@ -663,7 +663,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		}
 
 
-		// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad atrributes
+		// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad attributes
 
 		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML);
 		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY);
@@ -814,23 +814,23 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	{
 		$stringtotest = '<a href="javascript:aaa">bbbڴ';
 		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 1');
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correctly with test 1');
 
 		$stringtotest = '<a href="java'.chr(0).'script:aaa">bbbڴ';
 		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 2');
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correctly with test 2');
 
 		$stringtotest = '<a href="javascript&colon;aaa">bbbڴ';
 		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 3');
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correctly with test 3');
 
 		$stringtotest = 'text <link href="aaa"> text';
 		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1, 0, array(), 0);
-		$this->assertEquals('text  text', $decodedstring, 'Function did not sanitize correclty with test 4a');
+		$this->assertEquals('text  text', $decodedstring, 'Function did not sanitize correctly with test 4a');
 
 		$stringtotest = 'text <link href="aaa"> text';
 		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1, 0, array(), 1);
-		$this->assertEquals('text <link href="aaa"> text', $decodedstring, 'Function did not sanitize correclty with test 4b');
+		$this->assertEquals('text <link href="aaa"> text', $decodedstring, 'Function did not sanitize correctly with test 4b');
 
 		return 0;
 	}
@@ -844,12 +844,12 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	{
 		$stringtotest = 'eée';
 		$decodedstring = dol_string_onlythesehtmlattributes($stringtotest);
-		$this->assertEquals('e&eacute;e', $decodedstring, 'Function did not sanitize correclty with test 1');
+		$this->assertEquals('e&eacute;e', $decodedstring, 'Function did not sanitize correctly with test 1');
 
 		$stringtotest = '<div onload="ee"><a href="123"><span class="abc">abc</span></a></div>';
 		$decodedstring = dol_string_onlythesehtmlattributes($stringtotest);
 		$decodedstring = preg_replace("/\n$/", "", $decodedstring);
-		$this->assertEquals('<div><a href="123"><span class="abc">abc</span></a></div>', $decodedstring, 'Function did not sanitize correclty with test 2');
+		$this->assertEquals('<div><a href="123"><span class="abc">abc</span></a></div>', $decodedstring, 'Function did not sanitize correctly with test 2');
 
 		return 0;
 	}
@@ -1182,7 +1182,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 
 
-		// For a string that is already HTML (contains HTML tags) with special tags but badly formated
+		// For a string that is already HTML (contains HTML tags) with special tags but badly formatted
 		$stringtotest = "&quot;&gt;";
 		$stringfixed = "&quot;&gt;";
 		//$result = dol_htmlentitiesbr($stringtotest);
@@ -1194,7 +1194,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($stringfixed, $result, 'Error');    // Expected '' because should failed because login 'auto' does not exists
 
 
-		// For a string that is already HTML (contains HTML tags) with special tags but badly formated
+		// For a string that is already HTML (contains HTML tags) with special tags but badly formatted
 		$stringtotest = "testA\n<h1>hhhh</h1><z>ddd</z><header>aaa</header><footer>bbb</footer>";
 		if (getDolGlobalString("MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY")) {
 			$stringfixed = "testA\n<h1>hhhh</h1>\nddd\n<header>aaa</header>\n<footer>bbb</footer>\n";
@@ -1210,7 +1210,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($stringfixed, $result, 'Error');
 
 
-		// For a string that is already HTML (contains HTML tags) but badly formated
+		// For a string that is already HTML (contains HTML tags) but badly formatted
 		$stringtotest = "testB\n<h1>hhh</h1>\n<td>td alone</td><h1>iii</h1>";
 		if (getDolGlobalString("MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY")) {
 			$stringfixed = "testB\n<h1>hhh</h1>\n<h1>iii</h1>\n<table>\n<tr>\n<td>td alone</td>\n</tr>\n</table>\n";
diff --git a/test/phpunit/functional/TakePosFunctionalTest.php b/test/phpunit/functional/TakePosFunctionalTest.php
index 3ff050f8403..1492096c024 100644
--- a/test/phpunit/functional/TakePosFunctionalTest.php
+++ b/test/phpunit/functional/TakePosFunctionalTest.php
@@ -187,7 +187,7 @@ class TakePosFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		} else {
 			// Disable the module
 			$this->byHref('modTakePos')->click();
-			// Reenable the module
+			// Re-enable the module
 			$this->byHref('modTakePos')->click();
 		}
 		// Page reloaded, we need a new Xpath
diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml
old mode 100755
new mode 100644
index 4556cebeca2..e44b6f08910
--- a/test/soapui/Dolibarr-soapui-project.xml
+++ b/test/soapui/Dolibarr-soapui-project.xml
@@ -27815,4 +27815,4 @@
          </order>
       </ns:updateOrder>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>