diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b221f3115fe..1eae1b063b0 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,28 +1,41 @@
How to contribute to Dolibarr
=============================
-Bug reports and feature requests
---------------------------------
+Submit a Bug report or a Feature request
+---------------------------------------
-*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
+*Note*: **GitHub Issues is not a support forum.**
+If you have questions about Dolibarr or need help on using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
-Default **language here is English**. So please prepare your contributions in English.
+Issues to inform about a bug or a development trouble and requests for a new feature, are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
+Default **language here is English**. So please prepare your contributions in English (we recommend using an online translation service if you don't speak English).
-1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
+1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if anyone else has already reported your issue.
2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
3. Tell us the version you are using! (look at /htdocs/admin/system/dolibarr.php? and check if you are using the latest version)
4. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging information whenever possible).
5. Delete unnecessary submissions.
-6. **Check your Message at Preview before sending.**
+6. **Check your Message at Preview before submitting.**
-Submit code
+
+
+Submit code
---------------------
+This process describes how a Developer can submit code to the project so it can be analyzed and validated by the PR Maintainer (we call this a Pull Request).
+
+Definition:
+- Developer: is the human knowing the development language of the application that wants to change some part of the code by modifying the sources of the project.
+- PR Maintainer: is the human knowing the development language and code who checks that the code submitted for approbation is correct to validate it, in other words, the PR Maintainer is the approbator of commits.
+- Release Maintainer: is the human that validates that a freeze/beta version is ok to be released officially as a stable version.
+
+
### Basic workflow
+As the Developer:
+
1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
2. Clone your fork.
3. Choose a branch(See the [Branches](#branches) section below).
@@ -30,27 +43,47 @@ Default **language here is English**. So please prepare your contributions in En
5. Commit and push your changes.
6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+As the PR Maintainer:
+
+7. The PR Maintainer will check and decide if he approves or not the commits. During this step, the PR Maintainer can modify your own code to make it valid for approbation or ask you to make the change yourself. For this the PR Maintainer may add commits to a PR. Depending on the tools used (can be done from github directly or from an IDE), such commits may be done directly after validating your PR (for example to complete it).
+
+As the Release Maintainer:
+
+8. A tag will be added to take a snapshot of the code with all the changes approved by PR Maintainers, when ready to do a release.
+
+
+Note: Project leader(Master Yoda and BDFL) retains all above roles and can directly commit to the project without a PR. Of course anyone can check commit history and comment!
+
+
### Branches
Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
-If you're fixing a bug, it is preferred that you cook your fix and pull request it against an oldest version affected.
+If you're fixing a bug, it is preferred that you make a pull request against the oldest version affected.
-We recommend to push it into N - 2 for N the latest version available, if not possible into version N - 1, and finally into develop.
-This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into
-higher versions.
+We recommend to push it into N - 2 where N is the latest version available, if not possible into version N - 1, and finally into develop.
+
+The rule N - 2 is just a tip if you don't know which version to choose to get the best compromise between ease of correction and number of potential beneficiaries of the correction.
+
+If you push a bug fix on a very old version it is still going to be merged and propagated into newer versions(choose wisely because old versions depend on old deprecated/unsupported versions of PHP and external libraries).
-The rule N - 2 is just a tip if you don't know which version to choose to get the best the best compromise between ease of correction
-and number of potential beneficiaries of the correction.
### General rules
-Please don't edit the ChangeLog file. This file is generated from all commit messages during release process by the project manager.
+
+- As the Developer, please don't edit the ChangeLog file. This file is generated from all commit messages during the release process by the Project releaser.
+
+- As the Developer: Do not submit changes into files xx_XX/afile.lang. They are language files and are updated/synced automatically from Transifex. If you need to add a new language file, just add it for the en_US language.
+
+- As the Release Maintainer: The Release Maintainer will decide to make a new release as soon as the planning of the release is reached and the code in the branch to release reach the status of "No more known serious bugs".
-### Commits
+
+
+### Commits
+
Use clear commit messages with the following structure:
```plaintext
@@ -106,9 +139,9 @@ FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. I
or
CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
or
-NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
+NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #xxx)
or
-Short description (when the commit is not introducing feature nor closing a bug)
+Short description (when the commit is not introducing a feature nor closing a bug)
Long description (Can span across multiple lines).
@@ -125,11 +158,11 @@ a process to follow to optimize the chance to have PRs merged efficiently...
* When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.
-* A screenshot will be always required for any PR of change/addition of a GUI behaviour.
+* A screenshot will be always required for any PR of change/addition of a GUI behavior.
Also, some code changes need a prior approbation:
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please contact the core project manager first (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
* if you add new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
@@ -137,12 +170,12 @@ Once a PR has been submitted, you may need to wait for its integration. It is co
If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
-If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
+If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several months later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
-If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
+If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explains why your PR has not been integrated yet.
+In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag asks you. The majority of open PRs are waiting an action of the author of the PR.
-Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%.
+Statistics on Dolibarr project shows that 95% of submitted PRs are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PRs in Open Source world for a major project. Don't expect the core team to reach 100%.
A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
@@ -157,9 +190,9 @@ All other translations are managed online at [Transifex](https://www.transifex.c
Translations done on transifex are available in the next major release.
-Note: Sometimes, the source text (English) is modified. In such a case, the translation is reset. Transifex assume that if the original source
+Note: Sometimes, the source text (English) is modified. In such a case, the translation is reset. Transifex assumes that if the original source
has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
+to retrieve all old translations of a source text and restore the translation in one click with no need to retranslate it if there is no need to.
### Resources
diff --git a/.github/workflows/cache-clean-pr.yml b/.github/workflows/cache-clean-pr.yml
index 51a4282a0e9..bad5d6837df 100644
--- a/.github/workflows/cache-clean-pr.yml
+++ b/.github/workflows/cache-clean-pr.yml
@@ -19,17 +19,17 @@ jobs:
- name: Cleanup
run: |
gh extension install actions/gh-actions-cache
- REPO=${{ github.repository }}
- BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
+ REPO="${{ github.repository }}"
+ BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
echo "Fetching list of cache key"
- cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+ cacheKeysForPR=$(gh actions-cache list -R "$REPO" -B "$BRANCH" | cut -f 1 )
- ## Setting this to not fail the workflow while deleting cache keys.
+ ## Setting this to not fail the workflow while deleting cache keys.
set +e
echo "Deleting caches..."
for cacheKey in $cacheKeysForPR
do
- gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+ gh actions-cache delete "$cacheKey" -R "$REPO" -B "$BRANCH" --confirm
done
echo "Done"
env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 39edbc3496b..7e2854a9522 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,16 +10,17 @@ jobs:
phan:
uses: ./.github/workflows/phan.yml
secrets: inherit
+ needs: [pre-commit]
with:
gh_event: ${{ github.event_name }}
phpstan:
uses: ./.github/workflows/phpstan.yml
secrets: inherit
- needs: [pre-commit, phan]
+ needs: [pre-commit]
with:
gh_event: ${{ github.event_name }}
windows-ci:
- needs: [pre-commit, phan]
+ needs: [pre-commit, phpstan, phan]
secrets: inherit
uses: ./.github/workflows/windows-ci.yml
with:
@@ -35,6 +36,6 @@ jobs:
# Note (not tested, from https://github.com/orgs/community/discussions/38361)
-# To cancel jobs if one failes, the following action may help
+# To cancel jobs if one fails, the following action may help
# - if: "failure()"
# uses: "andymckay/cancel-action@0.3"
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index 3b1b2f656e0..420ca085cad 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -4,10 +4,8 @@ name: "Exakat analysis"
on:
# execute once a month, the 1st
schedule:
- - cron: "0 20 1 * *"
+ - cron: "0 20 1 * *"
workflow_dispatch:
- branches:
- - develop
permissions:
contents: read
@@ -19,6 +17,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 1
+ ref: develop
- name: Exakat
uses: docker://exakat/exakat-ga
with:
diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
index 56a33ef76c7..c1c1d610048 100644
--- a/.github/workflows/phan.yml
+++ b/.github/workflows/phan.yml
@@ -17,8 +17,7 @@ concurrency:
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
- PHAN_CONFIG: >
- ${{ 'dev/tools/phan/config.php' }}
+ PHAN_CONFIG: dev/tools/phan/config.php
PHAN_BASELINE: dev/tools/phan/baseline.txt
PHAN_MIN_PHP: 7.0
PHAN_QUICK: ${{ github.event.schedule && '' || '--quick' }}
@@ -43,7 +42,8 @@ jobs:
tools: cs2pr,phan
- name: Run Phan analysis
run: |
- phan $PHAN_QUICK -k $PHAN_CONFIG -B $PHAN_BASELINE --analyze-twice --minimum-target-php-version $PHAN_MIN_PHP --output-mode=checkstyle -o _phan.xml
+ # shellcheck disable=2086
+ phan $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=checkstyle -o _phan.xml
- name: Add results to PR
if: ${{ always() }}
run: |
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 8adc5051bc2..f2056f63a14 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -32,7 +32,7 @@ jobs:
# This is faster for a big repo.
- name: Get all changed php files (if PR)
id: changed-php
- uses: tj-actions/changed-files@v44
+ uses: tj-actions/changed-files@v45
if: env.gh_event == 'pull_request'
with:
files: |
@@ -67,12 +67,12 @@ jobs:
run: |
set -o pipefail
pre-commit gc
- pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
+ pre-commit run --show-diff-on-failure --color=always --all-files | tee "${RAW_LOG}"
# The next uses git, which is slow for a bit repo.
# - name: Get all changed php files (if PR)
# id: changed-php
- # uses: tj-actions/changed-files@v44
+ # uses: tj-actions/changed-files@v45
# if: env.gh_event == 'pull_request'
# with:
# files: |
@@ -105,7 +105,8 @@ jobs:
ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
run: |
set -o pipefail
- pre-commit run php-cs --files ${ALL_CHANGED_FILES} | tee -a ${RAW_LOG}
+ # shellcheck disable=2086
+ pre-commit run php-cs --files ${ALL_CHANGED_FILES} | tee -a "${RAW_LOG}"
- name: Run some pre-commit hooks on all files on push to "main" branches
if: |
@@ -117,8 +118,8 @@ jobs:
run: |
set -o pipefail
ln -sf ~/.cache .cache # Absolute path in .pre-commit-config.yaml
- pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a ${RAW_LOG}
- pre-commit run --hook-stage manual -a sqlfluff-lint | tee -a ${RAW_LOG}
+ pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a "${RAW_LOG}"
+ pre-commit run --hook-stage manual -a sqlfluff-lint | tee -a "${RAW_LOG}"
ls -l ~/.cache/pre-commit/
- name: Convert Raw Log to Annotations
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index e7d330324dd..976a5415a42 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -61,7 +61,7 @@ jobs:
KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
- enableCrossOsArchive: true
+ enableCrossOsArchive: true
path: |
./db_init.sql
./db_init.sql.md5
@@ -116,6 +116,7 @@ jobs:
# Note this is bash (MSYS) on Windows
shell: bash
run: |
+ # shellcheck disable=SC2129
ECHO "#[group]Directory contents to verify cache files, ..."
ls -l
ECHO "#[endgroup]"
@@ -130,10 +131,12 @@ jobs:
ls -l
ECHO "#[endgroup]"
# Export some tool paths to reuse the from CMD shell.
- echo "TAIL=$(cygpath -w "$(which tail)")" >> "$GITHUB_ENV"
- echo "GREP=$(cygpath -w "$(which grep)")" >> "$GITHUB_ENV"
- echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
- echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
+ {
+ echo "TAIL=$(cygpath -w "$(which tail)")"
+ echo "GREP=$(cygpath -w "$(which grep)")"
+ echo "TEE=$(cygpath -w "$(which tee)")"
+ echo "BASEDIR=$(realpath .)"
+ } >> "$GITHUB_ENV"
- name: Run PHPUnit tests
# continue-on-error: true
@@ -186,7 +189,7 @@ jobs:
if: ${{ ! cancelled() }}
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
- enableCrossOsArchive: true
+ enableCrossOsArchive: true
key: ${{ steps.cache.outputs.cache-primary-key }}
path: |
./db_init.sql
diff --git a/.gitignore b/.gitignore
index 2964b1ead0f..830429de679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ htdocs/includes/php-parallel-lint/
htdocs/includes/sebastian/
htdocs/includes/squizlabs/
htdocs/includes/webmozart/
+htdocs/install/install.forced.php
htdocs/.well-known/apple-developer-merchantid-domain-association
/factory/
/output/
diff --git a/.mailmap b/.mailmap
index f5486ee8634..6a8ff802293 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,7 +5,7 @@ Laurent Destailleur Laurent Destailleur eldy
Laurent Destailleur Laurent Destailleur
Laurent Destailleur eldy10
-Laurent Destailleur Laurent Destailleur
+Laurent Destailleur Laurent Destailleur
Regis Houssin Regis Houssin
Regis Houssin Régis Houssin
Juanjo Menent simnandez
@@ -94,4 +94,4 @@ Anthony Berton Berton Anthony
Anthony Berton BB2A-Anthony
Anthony Berton Anthony Berton
Anthony Berton Berton Anthony
-Anthony Berton BB2A-Anthony
\ No newline at end of file
+Anthony Berton BB2A-Anthony
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 79ec8b049e9..c2b29ef90af 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,9 @@
---
-exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.[^/]*/.*))$
+exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.(?!github/workflows)[^/]*/.*))$
repos:
# Several miscellaneous checks and fix (on yaml files, end of files fix)
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.5.0
+ rev: v4.6.0
hooks:
# This hook tests the name of the branch and return an error if the name is
# 'develop' or an official version 'x.y'
@@ -58,12 +58,18 @@ repos:
# Check that there are no files that have are the same when uppercased (conflict on windows)
- id: check-case-conflict
- # Beautify shell scripts
+ # Gitleaks is a SAST tool for detecting and preventing hardcoded secrets like passwords, api keys, and tokens in git repos
- repo: https://github.com/gitleaks/gitleaks.git
rev: v8.16.1
hooks:
- id: gitleaks
+ # Check github actions
+ - repo: https://github.com/rhysd/actionlint
+ rev: v1.7.3
+ hooks:
+ - id: actionlint
+
# Beautify shell scripts
- repo: https://github.com/lovesegfault/beautysh.git
rev: v6.2.1
@@ -183,7 +189,7 @@ repos:
# Check format of yaml files
- repo: https://github.com/adrienverge/yamllint.git
- rev: v1.33.0
+ rev: v1.35.1
hooks:
- id: yamllint
args:
@@ -193,7 +199,7 @@ repos:
# Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
- repo: https://github.com/codespell-project/codespell
- rev: v2.2.6
+ rev: v2.3.0
hooks:
- id: codespell
# Due to a current limitation of configuration files,
@@ -210,7 +216,7 @@ repos:
- -x
- dev/tools/codespell/codespell-lines-ignore.txt
exclude_types: [image]
- exclude: (?x)^(.phan/stubs/.*)$
+ exclude: (?x)^(.phan/stubs/.*|phpstan\.neon.*)$
additional_dependencies: [tomli]
- alias: codespell-lang-en_US
# Only for translations with specialised exceptions
@@ -236,30 +242,31 @@ repos:
# Check some shell scripts
- repo: https://github.com/shellcheck-py/shellcheck-py
- rev: v0.9.0.6
+ rev: v0.10.0.1
hooks:
- id: shellcheck
args: [-W, "100"]
+ # Check sql file syntax
- repo: https://github.com/sqlfluff/sqlfluff
- rev: 3.0.4
+ rev: 3.1.0
hooks:
- id: sqlfluff-lint
stages: [pre-commit, manual] # manual needed for ci
exclude: (?x)^
- (htdocs/includes/.*
- |htdocs/install/doctemplates/websites/.*_template
+ (dev/initdemo/mysqldump_.*\.sql
|htdocs/core/menus/init_menu_auguria\.sql
- |htdocs/install/doctemplates/websites/website_template-.*\.sql
- |(htdocs/install/mysql/data/(llx_20_c_departements\.sql
- |llx_accounting_account_.*\.sql)
- |(htdocs/install/mysql/migration/3\.[256]\.0-.*\.sql)
- )
+ |htdocs/includes/.*
+ |htdocs/install/doctemplates/websites/.*_template
+ |htdocs/install/doctemplates/websites/website_template.*\.sql
+ |htdocs/install/mysql/data/llx_20_c_departements\.sql
+ |htdocs/install/mysql/data/llx_accounting_account_.*\.sql
+ |htdocs/install/mysql/migration/3\..*\.sql
|htdocs/install/mysql/migration/(1[0-5]|[456789])\.0\.0-.*\.sql
- |htdocs/install/mysql/migration/3\.([0134789])\.0-.*\.sql
|htdocs/install/mysql/migration/repair\.sql
|htdocs/install/mysql/tables/llx_bookcal_availabilities-bookcal\.sql
- |htdocs/install/mysql/tables/llx_categorie(_(account|actioncomm|contact|fournisseur|knowledgemanagement-knowledgemanagement|member|product|project|societe|ticket-ticket|user|warehouse|website_page-website)?\.key\.sql)
+ |htdocs/install/mysql/tables/llx_categorie.*\.key\.sql
|htdocs/install/mysql/tables/llx_rights_def\.key\.sql
- |htdocs/install/pgsql/functions/functions(-(don|loan|mailing|opensurvey|partnership|recruitment|website))?\.sql
+ |htdocs/install/pgsql/functions/functions.*\.sql
+ |htdocs/modulebuilder/template/sql/.*\.sql
)$
diff --git a/.travis.yml b/.travis.yml
index 7129c93d9f1..162e0480659 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -492,6 +492,9 @@ script:
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
+ php upgrade.php 20.0.0 21.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade20002100.log || cat $TRAVIS_BUILD_DIR/upgrade20002100.log
+ php upgrade2.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-2.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-2.log
+ php step5.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-3.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-3.log
set +e
echo
diff --git a/COPYRIGHT b/COPYRIGHT
index 80604483109..e979d87fcf3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -47,7 +47,7 @@ Sabre 4.6.0 BSD Yes
Swift Mailer 5.4.2-DEV MIT License Yes Comprehensive mailing tools for PHP
Symfony/var-dumper ??? MIT License Yes Library to make var dump (used by DebugBar)
Stripe 10.7.0 MIT Licence Yes Library for Stripe module
-TCPDF 6.3.2 LGPL-3+ Yes PDF generation
+TCPDF 6.7.5 LGPL-3+ Yes PDF generation
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
bacon, dasprid, swiss-qr-bill, kmukku, symfony/validator
diff --git a/ChangeLog b/ChangeLog
index ee320d33ba3..4fc1a613681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,31 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+***** ChangeLog for 21.0.0 compared to 20.0 *****
+
+For users:
+----------
+NEW Add option THEME_STICKY_TOPMENU = 'scrollleftmenu_after_mainpage' (or 'disabled')
+NEW value for FICHINTER_DISABLE_DETAILS. If FICHINTER_DISABLE_DETAILS is set to '2' details are disabled only on intervention list.
+
+For developers:
+---------------
+QUAL line classes for various business object classes have been moved to individual files.
+
+
+WARNING:
+--------
+
+The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Prepare your module for deprecation of triggers code XXX_INSERT to support also XXX_CREATE.
+* More class properties (with old name in french) are now deprecated in favor of the property name in english.
+* The json emulator dol_json_encode/decode() is removed. The native json PHP module must be enabled/available (this is the case by default with most PHP installation).
+* The experimental and deprecated module WebserviceClient is completely removed (SOAP technology is deprecated). May be replaced with the stable module Webhook.
+* The dynamic properties ->no_button_delete, ->no_button_edit, ->no_button_copy for $object Product that could be set by an external module must no more
+ be set (not allowed by PHP 8.2). A module can already return an array with key 'no_button_delete', 'no_button_edit', 'no_button_copy' for same purpose.
+* The old function dol_bc($var, $moreclass = '') has been removed. If you called it, just stop to call it.
+* The trigger code CATEGORY_LINK and CATEGORY_UNLINK has been replaced with code CATEGORY_MODIFY. You can read ->context['linkto'] or ->context['unlinkoff' to detect we want to make a link or unlink.
+
***** ChangeLog for 20.0.1 compared to 20.0.0 *****
FIX: #30960 show and search extrafields (#31026)
@@ -52,7 +77,6 @@ FIX: when qty is not an integer, apply price() (#31138)
FIX: Wrong price for BOM with workstation (#31142)
FIX: determine multi-currency price on object line create tpl (#28021)
-
***** ChangeLog for 20.0.0 compared to 19.0 *****
For users:
@@ -190,7 +214,7 @@ NEW: Module Website: Can link/unlink translation between web pages
NEW: Move dir of cache for widgets
NEW: multiselect with checkbox in categories/tags search for thirdparty list (#28335)
NEW: new consts to redirect from massaction createbills (#29436)
-NEW: new global string to preselect yes for one bill per thirparty in orderlist massaction (#29359)
+NEW: new global string to preselect yes for one bill per third party in orderlist massaction (#29359)
NEW: notification action triggers for cancelling orders and invoices
NEW: now button when editing an event
NEW: online signature of shipments (#29559)
@@ -306,7 +330,6 @@ QUAL: professional identifiers - remove TODO by adding profid.lib.php
QUAL: Properties ->date_update and ->date_modification were merged
QUAL: removed duplicate language file
QUAL: Remove the external js library jstimezonedetect
-QUAL: Remove use of customurl filter. Must use the USF syntax.
QUAL: Rename all input fields "tel" into "phone"
QUAL: Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989)
QUAL: replace $conf->global with getDolGlobalString()
@@ -327,6 +350,7 @@ The following changes may create regressions for some external modules, but were
See https://wiki.dolibarr.org/index.php?title=Universal_Search_Filter_Syntax
* The parameter $filter of methods fetchAll() does not accept array of SQL commands but must be a string of an Universal Search Filter syntax.
See https://wiki.dolibarr.org/index.php?title=Universal_Search_Filter_Syntax
+* The use of 'customurl' into $filter has been removed. Must use the USF syntax.
* Some API HTTP return code were moved from 401 to 403 to better follow REST specification.
* More class properties (with old name in french) are now deprecated in favor of the property name in english.
* dolibarrtriggers class VERSION_XXX constants have been deprecated. Please use array dictionary VERSIONS['XXX'].
@@ -345,7 +369,7 @@ The following changes may create regressions for some external modules, but were
* Removed trigger BILLREC_CREATEBILL. This trigger was not a CRUD event. If you used it, you can already use the trigger BILL_CREATE and
test that ($object->fac_rec > 0) to know if creation trigger is from a recurring invoice or not. Also this old trigger was never enabled
into table llx_c_action_trigger.
-* Renamings in expedition line table and class, fk_origin_line is now fk_elementdet in table and class.
+* Renaming into expedition line table and class: fk_origin_line is now fk_elementdet in table and class.
* The signature of method fetch() of class CompanyBankAccount has been modified to match the signature of method Account->fetch()
@@ -1747,7 +1771,7 @@ NEW: Add link to create an element from the category page
NEW: add margin infos to takepos invoice lines
NEW: Add max size send for "backup and link to mail" option
NEW: Add method httponly_accessforbidden()
-NEW: Add more advices into the Setup security page
+NEW: Add more advice into the Setup security page
NEW: Add new global variable for keeping the previous signature information on proposal (case of reopening a proposal)
NEW: Add objectLink on shipment
NEW: Add option --force on CLI cron_run_jobs.php
@@ -3165,8 +3189,8 @@ NEW: add option in Workflow module to set a shipment as closed
for Admins
-NEW: Add a security center page with all information and advices related to the security of your instance
-NEW: Add a performance center page with all information and advices related to the performance of your instance
+NEW: Add a security center page with all information and advice related to the security of your instance
+NEW: Add a performance center page with all information and advice related to the performance of your instance
Modules
NEW: Module Recruitment is now stable
@@ -3328,7 +3352,7 @@ FIX: fix checkbox displayed according to module project setup parameters - work
FIX: inconsistency in margin recording with option "Force to sale price"
FIX: invoice PDF generation after payment
FIX: mask selector fournisseur if module not activate
-FIX: merge thirparty also work for bank URL entry
+FIX: merge third party also works for bank URL entry
FIX: Missing extrafields into export of agenda record
FIX: missing parameter in select for POP
FIX: missing return edit if update error
@@ -7184,7 +7208,7 @@ NEW: Add index and constraints keys on supplier proposal detail table
NEW: Add phpunit to check the engine is defined into sql create files.
NEW: Add project and Hook to Loan
NEW: Add REST API to push a file.
-NEW: Allow extrafields list select to be dependands on other standard list and not only other extrafields list
+NEW: Allow extrafields list select to be dependent on other standard list and not only other extrafields list
NEW: Architecture to manage search criteria persistence (using save_lastsearch_values=1 on exit links and restore_lastsearch_values=1 in entry links)
NEW: data files are now also parsed by phpunit for sql syntax
NEW: Hook to allow inserting custom product head #6001
@@ -8208,7 +8232,7 @@ NEW: The clicktodial module is now able to provide link "tel:" on phone numbers.
NEW: The conditional IF into ODT templates works also on not defined var so we can show data only if defined. Close #3819
NEW: The free text in PDF footers can now be a HTML content. So the WYSIWYG editor is on by default to edit it into module setup.
NEW: The thirdparties tabs, the contacts tabs and the members tabs are now presented using a new "top banner", saving space and using a same way to show address, status and navigation arrows.
-NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
NEW: Translate extrafield's labels.
NEW: Use new select2 component for juridical status, country and state selection.
NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available.
@@ -8807,7 +8831,7 @@ NEW: [ task #851 ] Add a new field: Commercial name
NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
NEW: The line where mouse is over can be highlight with option THEME_ELDY_USE_HOVER (on by default)
NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user.
-NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
NEW: Title of page project contains project ref and label
NEW: update skeleton and class builder
NEW: Use new select2 component for juridical status, country and state selection.
@@ -9958,7 +9982,7 @@ For users:
prices, radio).
- New: [ task #798 ] Add range limit date on product/services as it is done on order
and invoice.
-- New: [ task #814 ] Add extrafield feature for projects ands tasks.
+- New: [ task #814 ] Add extrafield feature for projects and tasks.
- New: [ task #770 ] Add ODT document generation for Projects module.
- New: [ task #741 ] Add intervention box.
- New: [ task #826 ] Optional increase stock when deleting an invoice already validated.
diff --git a/README-FR.md b/README-FR.md
index 5cc91a5c3fa..c1c474f2597 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -10,13 +10,15 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f

+
## LICENCE
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
+
## INSTALLER DOLIBARR
-### Configuration simple
+### Installation simple
Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
@@ -26,7 +28,7 @@ Si vous avez peu de compétences techniques et que vous souhaitez installer Doli
Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
-### Configuration avancée
+### Installation recommandée/avancée
Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
@@ -54,6 +56,7 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
- Suivez les instructions de l'installateur
+
## METTRE A JOUR DOLIBARR
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
@@ -70,10 +73,12 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+
## CE QUI EST NOUVEAU
Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog).
+
## CE QUE DOLIBARR PEUT FAIRE
### Modules principaux (tous optionnels)
@@ -143,6 +148,7 @@ Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/Ch
Dolibarr peut aussi être étendu à volonté avec l'ajout de modules/applications externes développées par des développeurs tiers, disponible sur [DoliStore](https://www.dolistore.com).
+
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
@@ -152,22 +158,26 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
- Dolibarr n'embarque pas de Webmail intégré nativement.
- Dolibarr ne fait pas le café (pas encore).
+
## DOCUMENTATION
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
+
## CONTRIBUER
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
+
## CREDITS
Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
+
## ACTUALITES ET RESEAUX SOCIAUX
Suivez le projet Dolibarr sur les réseaux francophones
diff --git a/README.md b/README.md
index 253f46f0506..b81d632a728 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
[](https://github.com/Dolibarr/dolibarr)
[](https://bestpractices.coreinfrastructure.org/projects/5521)
-Dolibarr ERP & CRM is a modern software package that helps manage your organization's activities (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package that helps manage your organization's activities (contacts, quotes, invoices, orders, stocks, agenda, human resources, ecm, manufacturing…).
It's an Open-Source Software suite (written in PHP with JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
@@ -17,6 +17,7 @@ Dolibarr has a large community ready to help you, free forums and [preferred par

+
## LICENSE
Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 3 of the License, or (at your option) any later version (GPL-3+).
@@ -25,9 +26,12 @@ See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) fil
Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
+
## INSTALLING
-### Simple setup
+There is a lot of different solutions to install Dolibarr.
+
+### Using packages
If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
@@ -37,12 +41,9 @@ If you have low technical skills and you're looking to install Dolibarr ERP/CRM
Releases can be downloaded from [official website](https://www.dolibarr.org/).
-### Recommended setup
+### Using the generic step by step setup (recommended)
-You can use any web server supporting PHP (Apache, Nginx, ...) and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
-
-
-#### Generic install steps
+You can use any web server supporting PHP (Apache, Nginx, ...) and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version:
- Verify that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
@@ -68,12 +69,17 @@ You can use any web server supporting PHP (Apache, Nginx, ...) and a supported d
`http://yourdolibarrvirtualhost/install/`
-- Follow the installer instructions
+- Follow the installer instructions;;;
-### SaaS/Cloud Setup
+### Using Docker images
+
+Dolibarr is also available as a [Docker image](https://hub.docker.com/r/dolibarr/dolibarr). Installation instructions are available [here](https://github.com/Dolibarr/dolibarr-docker).
+
+### Using ready to use SaaS/Cloud offers
If you lack the time to install it yourself, consider exploring commercial 'ready-to-use' Cloud offerings (refer to https://saas.dolibarr.org). Keep in mind that this third option comes with associated costs.
+
## UPGRADING
Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
@@ -86,10 +92,12 @@ Follow these step-by-step instructions to seamlessly upgrade Dolibarr to the lat
- At your next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
+
## WHAT'S NEW
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
+
## FEATURES
### Main application/modules (all optional)
@@ -211,6 +219,7 @@ See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequ
Dolibarr can be extended with a lot of other external applications or modules from third-party developers available at the [DoliStore](https://www.dolistore.com).
+
## WHAT DOLIBARR CAN'T DO YET
These are features that Dolibarr does **not** yet fully support:
@@ -220,10 +229,12 @@ These are features that Dolibarr does **not** yet fully support:
- Native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
- Dolibarr can't do coffee (yet)
+
## DOCUMENTATION
Administrator, user, developer and translator's documentation are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
+
## CONTRIBUTING
This project exists thanks to all the people who contribute.
@@ -233,12 +244,14 @@ A View on Contributors:
[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
+
## CREDITS
Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
+
## NEWS AND SOCIAL NETWORKS
Follow Dolibarr project on:
@@ -250,6 +263,7 @@ Follow Dolibarr project on:
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)
-### Sponsors
+
+## Sponsors
Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
diff --git a/SECURITY.md b/SECURITY.md
index b822f100b9c..809681c74d1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,6 +1,6 @@
# Security Policy
-This file contains some policies about the security reports on Dolibarr ERP CRM project, one of the most popular Open Source ERP and CRM in the world.
+This file contains some policies about the security reports on Dolibarr ERP CRM project, a popular Open Source ERP and CRM used by millions of users.
## Supported Versions for security reports
diff --git a/build/docker-dev/README.md b/build/docker-dev/README.md
index 6daf6d6bd5c..66358bf2bbe 100644
--- a/build/docker-dev/README.md
+++ b/build/docker-dev/README.md
@@ -2,7 +2,7 @@
The docker-compose.yml file is a sample of a config file to use to build and run Dolibarr in the current workspace with Docker.
This docker image is intended for development usage.
-For production usage you should consider other contributor reference like https://hub.docker.com/r/tuxgasy/dolibarr
+For production usage you should consider other contributor reference like https://hub.docker.com/r/dolibarr/dolibarr
Before build/run, define the variable HOST_USER_ID as following:
diff --git a/build/docker/README.md b/build/docker/README.md
index 7dc8aac3bb0..dc6147ef855 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -1,6 +1,17 @@
# How to use it ?
+This directory is experimental. Scope of its used is not clear and not documented.
+If you are looking for a process to run Dolibarr as an official Docker image, you can find it on https://hub.docker.com/r/dolibarr/dolibarr
+
+
+# For experimental dev - TO REMOVE.
+
+But if you want to execute the version of Dolibarr that is into this current directory as a docker process, you can do it with this commands.
+
export HOST_USER_ID=$(id -u)
+export HOST_GROUP_ID=$(id -g)
export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9
+ * Copyright (C) 2024 Frédéric France
*
* 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
@@ -199,7 +200,7 @@ fputs($fp, ' '."\n");
fputs($fp, ''."\n");
asort($checksumconcat); // Sort list of checksum
-//var_dump($checksumconcat);
+
fputs($fp, ''."\n");
fputs($fp, md5(join(',', $checksumconcat))."\n");
fputs($fp, ''."\n");
diff --git a/dev/resources/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF b/build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF
similarity index 100%
rename from dev/resources/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
rename to build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index d2f4c1c35ba..23f59227f7c 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -113,24 +113,9 @@ PHP TCPDF:
to
* @public
-* Replace in tcpdf.php:
- if (isset($this->imagekeys)) {
- foreach($this->imagekeys as $file) {
- unlink($file);
- }
- }
-with
- if (isset($this->imagekeys)) {
- foreach($this->imagekeys as $file) {
- // DOL CHANGE If we keep this, source image files are physically destroyed
- // unlink($file);
- }
- }
-
* Replace in tcpdf.php:
$preserve = array(
'file_id',
- 'internal_encoding',
'state',
'bufferlen',
'buffer',
@@ -138,7 +123,6 @@ with
with
$preserve = array(
'file_id',
- 'internal_encoding',
'state',
'bufferlen',
'buffer',
@@ -147,16 +131,16 @@ with
'imagekeys',
* Replace in tcpdf.php:
- if (!@TCPDF_STATIC::file_exists($file)) {
+ if (!@this->fileExists($file)) {
return false;
}
with
- if (!@TCPDF_STATIC::file_exists($file)) {
+ if (!@this->fileExists($file)) {
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
- //var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
+ //var_dump($file.' '.(!@this->fileExists($file)));
//return false;
$tfile = str_replace(' ', '%20', $file);
- if (@TCPDF_STATIC::file_exists($tfile)) {
+ if (@this->fileExists($tfile)) {
$file = $tfile;
}
}
@@ -191,7 +175,7 @@ with
}
elseif (strpos($filename, '://') === false)
-* To avoid to have QRcode changed because generated with a random mask, replace:
+* In tecnickcom/tcpdf/include/barcodes/qrcode.php To avoid to have QRcode changed because generated with a random mask, replace:
define('QR_FIND_FROM_RANDOM', 2);
with
define('QR_FIND_FROM_RANDOM', false);
@@ -215,19 +199,6 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
- protected $default_monospaced_font = 'courier';
+ protected $default_monospaced_font = 'freemono';
-* In tecnickcom/tcpdf/include/tcpdf_static, in function intToRoman, right at the beginning
- of the function, replace:
-
- $roman = '';
-
- with:
-
- $roman = '';
- if ($number >= 4000) {
- // do not represent numbers above 4000 in Roman numerals
- return strval($number);
- }
-
* Add this at begin of tcpdf_autoconfig.php
// @CHANGE LDR DOCUMENT_ROOT fix for IIS Webserver
@@ -384,7 +355,9 @@ PHP PARSEDOWN
PHP OAUTH
---------
-Add into Class Google of file OAuth2/Service/Google:
+Restore old OAuth2/Service/Google.php file and OAuth2/Service/Microsoft.php and OAuth2/Service/Microsoft2.php
+
+Or add into Class Google of file OAuth2/Service/Google:
// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
public $approvalPrompt='auto';
@@ -398,6 +371,17 @@ Add into Class Google of file OAuth2/Service/Google:
}
+Modify function
+
+ public function getAuthorizationEndpoint()
+ {
+ // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+ //return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
+ $url = 'https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
+ return new Uri($url);
+ }
+
+
JS JSGANTT:
-----------
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 442d991a453..9bc83dec400 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -2,6 +2,7 @@
* Copyright (C) 2016 Juanjo Menent
+ * Copyright (C) 2024 Frédéric France
* 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
* the Free Software Foundation; either version 3 of the License, or
@@ -225,7 +226,6 @@ if (!empty($argv[4])) {
$user=new User($db);
}
-//var_dump($user->db->database_name);
$ret=$user->fetch('', 'admin');
if (! $ret > 0) {
print 'An admin user with login "admin" must exists to use this script.'."\n";
diff --git a/dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf b/dev/resources/iso-normes/accountancy/Accountancy-format_Ebp_txt.pdf
similarity index 100%
rename from dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
rename to dev/resources/iso-normes/accountancy/Accountancy-format_Ebp_txt.pdf
diff --git a/dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf b/dev/resources/iso-normes/accountancy/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf
similarity index 100%
rename from dev/resources/iso-normes/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf
rename to dev/resources/iso-normes/accountancy/Accountancy-format_Winfic-eWinfic-WinSisCompta.pdf
diff --git a/dev/resources/iso-normes/format_FEC - Lien_outil_de_test_agréé.pdf b/dev/resources/iso-normes/accountancy/format_FEC - Lien_outil_de_test_agréé.pdf
similarity index 100%
rename from dev/resources/iso-normes/format_FEC - Lien_outil_de_test_agréé.pdf
rename to dev/resources/iso-normes/accountancy/format_FEC - Lien_outil_de_test_agréé.pdf
diff --git a/dev/resources/iso-normes/format_FEC - fie example.txt b/dev/resources/iso-normes/accountancy/format_FEC - fie example.txt
similarity index 88%
rename from dev/resources/iso-normes/format_FEC - fie example.txt
rename to dev/resources/iso-normes/accountancy/format_FEC - fie example.txt
index 4285a9403a5..d7d3f1abecf 100644
--- a/dev/resources/iso-normes/format_FEC - fie example.txt
+++ b/dev/resources/iso-normes/accountancy/format_FEC - fie example.txt
@@ -1,16 +1,16 @@
JOURNALCODE JOURNALLIB ECRITURENUM ECRITUREDATE COMPTENUM COMPTELIB COMPAUXNUM COMPAUXLIB PIECEREF PIECEDATE ECRITURELIB DEBIT CREDIT ECRITURELET DATELET VALIDDATE MONTANTDEVISE IDEVISE
-Banque Banque 17293 20170109 401PPRO PUBLI-PROV L08 20170109 PPRO domiciliation 1TR 187,20 0,00 20170109
-Banque Banque 17293 20170109 5121CRA CR AGRICOLE L08 20170109 PPRO domiciliation 1TR 0,00 187,20 20170109
-Banque Banque 17295 20170109 401ORPA ORANGE PARIS Report 20170109 ORPA adsl par 12 96,00 0,00 20170109
-Banque Banque 17295 20170109 5121CRA CR AGRICOLE Report 20170109 ORPA adsl par 12 0,00 96,00 20170109
-Banque Banque 17302 20170105 401ORVI ORANGE VEBRON INTERNET Report 20170105 ORVI adsl veb 12 26,00 0,00 20170109
-Banque Banque 17302 20170105 5121CRA CR AGRICOLE Report 20170105 ORVI adsl veb 12 0,00 26,00 20170109
-Fournisseurs Fournisseurs 17305 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170119
-Fournisseurs Fournisseurs 17305 20170119 622200 Courtages s/ ventes A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170119
-Banque Banque 17306 20170119 5121CRA CR AGRICOLE A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170119
-Banque Banque 17306 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170119
-Banque Banque 17307 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170131
-Banque Banque 17307 20170119 5121CRA CR AGRICOLE A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170131
+Banque Banque 17293 20170109 401PPRO PUBLI-PROV L08 20170109 PPRO domiciliation 1TR 187,20 0,00 20170109
+Banque Banque 17293 20170109 5121CRA CR AGRICOLE L08 20170109 PPRO domiciliation 1TR 0,00 187,20 20170109
+Banque Banque 17295 20170109 401ORPA ORANGE PARIS Report 20170109 ORPA adsl par 12 96,00 0,00 20170109
+Banque Banque 17295 20170109 5121CRA CR AGRICOLE Report 20170109 ORPA adsl par 12 0,00 96,00 20170109
+Banque Banque 17302 20170105 401ORVI ORANGE VEBRON INTERNET Report 20170105 ORVI adsl veb 12 26,00 0,00 20170109
+Banque Banque 17302 20170105 5121CRA CR AGRICOLE Report 20170105 ORVI adsl veb 12 0,00 26,00 20170109
+Fournisseurs Fournisseurs 17305 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170119
+Fournisseurs Fournisseurs 17305 20170119 622200 Courtages s/ ventes A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170119
+Banque Banque 17306 20170119 5121CRA CR AGRICOLE A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170119
+Banque Banque 17306 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170119
+Banque Banque 17307 20170119 401ZDAV SANDRA DAVILA A01 20170119 ZDAV courtage s/ ventes 508,00 0,00 20170131
+Banque Banque 17307 20170119 5121CRA CR AGRICOLE A01 20170119 ZDAV courtage s/ ventes 0,00 508,00 20170131
diff --git a/dev/resources/iso-normes/format_FEC.pdf b/dev/resources/iso-normes/accountancy/format_FEC.pdf
similarity index 100%
rename from dev/resources/iso-normes/format_FEC.pdf
rename to dev/resources/iso-normes/accountancy/format_FEC.pdf
diff --git a/dev/resources/iso-normes/accountancy/import-ofx-format.txt b/dev/resources/iso-normes/accountancy/import-ofx-format.txt
new file mode 100644
index 00000000000..8ba29403a46
--- /dev/null
+++ b/dev/resources/iso-normes/accountancy/import-ofx-format.txt
@@ -0,0 +1,2 @@
+OFX is an old Financial format:
+See https://stackoverflow.com/questions/15735330/how-to-parse-a-ofx-version-1-0-2-file-in-php
diff --git a/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt b/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt
index 4030cfda6e3..d84486d27e9 100644
--- a/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt
+++ b/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt
@@ -11,6 +11,7 @@ List of QR Code format we found on some invoices
------------------------------------------
https://en.wikipedia.org/wiki/EPC_QR_code#Generators
+Experimental support can be enabled in Dolibarr by setting INVOICE_ADD_EPC_QR_CODE = 1
* For ZATCA QR Code format (Saudi Arabia). Used when INVOICE_ADD_ZATCA_QR_CODE is set
@@ -19,11 +20,14 @@ https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide
https://www.tecklenborgh.com/post/ksa-zatca-publishes-guide-on-how-to-develop-a-fatoora-compliant-qr-code
-Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php
+Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php
-* FOR QR-Bill in switzerland - Facture-QR
------------------------------------------
-Syntax of QR Code - See file ig-qr-bill-v2.2-fr.pdf (more doc on https://www.swiss-qr-invoice.org/downloads/)
-Syntax of complementary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
+* FOR QR-Bill in switzerland - Facture-QR or QR-Facture
+-------------------------------------------------------
+- Syntax of QR Code - See file ig-qr-bill-v2.2-fr.pdf (more doc on https://www.swiss-qr-invoice.org/downloads/)
+- Syntax of complementary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
To test/validate: https://www.swiss-qr-invoice.org/validator/
+
+Experimental support to show the QR code can be enabled in dolibarr by setting INVOICE_ADD_SWISS_QR_CODE = 1.
+If setting value to "bottom", the complete top banner can be added at bottom of invoice PDF. Note: an external PHP library may be requested at first PDF generation.
diff --git a/dev/resources/iso-normes/qr-bar-codes/ig-qr-bill-v2.2-fr.pdf b/dev/resources/iso-normes/qr-bar-codes/ig-qr-bill-v2.2-fr.pdf
index 92e071f99db..f7fe64b79b5 100644
--- a/dev/resources/iso-normes/qr-bar-codes/ig-qr-bill-v2.2-fr.pdf
+++ b/dev/resources/iso-normes/qr-bar-codes/ig-qr-bill-v2.2-fr.pdf
@@ -30,8 +30,8 @@ endobj
/Type /Metadata
/Subtype /XML
>>
-stream
-
+stream
+
endstream
endobj
3 0 obj
@@ -3490,10 +3490,10 @@ endobj
/Length 1147
/Filter /FlateDecode
>>
-stream
+stream
xœ½X]oÛ6}7àÿp¥a¦ù)‘C IÚ4Ã
´³±=}Pe9`ˮ¬¤ȿíkþÅî¥íֳÍ-‹¥% MÓW:ç~R¾ª›ršå
œ�
_5M–.&p;/–‡ãÇe1|ŸݕU֔‹j8ºÿÔÐÒÛ"›õù9\\]Âðz”ÀݪßûÒïqÆéÏÚT�Ÿ«„ ã�JËRuÑïýùTý-KÿSé70àLhç$M¤qÎ@>ï÷†7óì®0pµ€{0¯¥Û( VKÆõÎí/ÆxéŽiãi¿'<” ‘hæ µŽ càp‡¦×#çýàpÝïÝF„ñ¯ýÞk¼Í�E[xýãˆìŢióppß,Í÷à¶à¬I—
Óú‡³ÿˆMTÄÕñ@G+¤ñ �$ÃuùBÿƒL$G.Àä¥Ñ^£Éch–qqíŒK.ÏÛvOHf€'ºw
/PGѨy¸” ŒóÛHâ
%Cwぐ‘h�F¢Úwúß:èùڄ�ÖKö:B¤û^j–˜4¿Hެصÿ!>b«>-·¶Ԩ‘(•(D
nAfä½�ÙÚ&‚%úÀf�…éqÉ^0iAhrf?;£›¼ò}’¨lÊR‚²y¤�_àRÆ:‚›x ÖVȼ¢/ÙìHZ_JP ½Ð†{õ³�>Gˬ¢п»¼¹>ü-«î šփ˷ñËtó¿ñ¢*@»$±Dï tØLiôGŒ—W;#øñ½·ÉpL¢G?ÎqT$·8¯üØàh7öë{ҊÞ\µ¶™ì¬Ô;+«“ZÙì;¬bƆÞËı4ˆҀõ€,’£™)K‰Ý̗T›³XpŒ¬�±ô“ª¡Y«;0Fé«à:Æðߗ,ëbVV±�ЬbZ[b!è+},Ñ`AË5•;àìÃï'êæ¡[
-…S‰�[ƒðR–¨j:ÝÄ)9�ái^ãæ†FyÉnËËà'žM}‰ù”—Ó2Ç2ØTSEņ¥B’H’SÑ|ÆØUå\¼÷‹TJØìͶ„¦‹*§2Ü^_y«ٌ֊Ózùhº�fZ…Ü:õ4r/eN„ð|ËÁ,þ¤X¬Š|۔µöÉlsŠ%�1Ø'³ô›Ò(”€9r*ü¾Ö@†É~ ª9±Å.úZâ°Â\&¤Ƴ¿ÜÈÄ.*Úg/SìbOÚÖt êK\tÒ~½pÁ\»oOp¦‚xô.Y«1‰Où޾ýö#£§öY¤¸É³úÕU«.�ÅáS)�LëõÓ(=‡âFÎHcO}"=ä!ðð�QJÿõsû%"Üe(¤C$R3¥O~¯؞qH„¾Ūƒª•»R…(}κ¡3WI|êH$üHÐVrߨŒ»hû…'eiú?⹄™ ^úÇ9½ÏàMŸ¨”Hôê� …ýÔ™
”½ŸԸ%ø—$¼ƒó6§ó}XYR<{ìSßÉ“}Òç&ÛËþ_©�w*
+…S‰�[ƒðR–¨j:ÝÄ)9�ái^ãæ†FyÉnËËà'žM}‰ù”—Ó2Ç2ØTSEņ¥B’H’SÑ|ÆØUå\¼÷‹TJØìͶ„¦‹*§2Ü^_y«ٌ֊Ózùhº�fZ…Ü:õ4r/eN„ð|ËÁ,þ¤X¬Š|۔µöÉlsŠ%�1Ø'³ô›Ò(”€9r*ü¾Ö@†É~ ª9±Å.úZâ°Â\&¤Ƴ¿ÜÈÄ.*Úg/SìbOÚÖt êK\tÒ~½pÁ\»oOp¦‚xô.Y«1‰Où޾ýö#£§öY¤¸É³úÕU«.�ÅáS)�LëõÓ(=‡âFÎHcO}"=ä!ðð�QJÿõsû%"Üe(¤C$R3¥O~¯؞qH„¾Ūƒª•»R…(}κ¡3WI|êH$üHÐVrߨŒ»hû…'eiú?⹄™ ^úÇ9½ÏàMŸ¨”Hôê� …ýÔ™
”½ŸԸ%ø—$¼ƒó6§ó}XYR<{ìSßÉ“}Òç&ÛËþ_©�w*
endstream
endobj
89 0 obj
@@ -3654,10 +3654,10 @@ endobj
/Type /XObject
/Width 94
>>
-stream
+stream
xœíY±JAý¿À/HÀÚø‰µA[-´ÒÊJKÁ>çäzÅÚB;¬,DB!HÂ$ˆÈùÂAˆ;»·»³³Á`Û$w™÷òîvfg7υñ=βv«¼۩W^7ִCùIo¿1•Lq@"Ё”'òmkÝQd †W%\âÎÌHAU$x
ݝM+]$gŠå/OˆÈØϙrsEò€ ëÎÕˆъô²EęÁÙ!
ÛiTÇ7éäéA;|�1ň(;$¹ˆìl»‹ôÅøºMGÎɰ€ՙr€Žj€°Ù
(Cô†,M¼X¼0y¼§Œ¾q�@J•@.}ÜÝÒK�ϗgZûú'{ŒPáÎ VÄ@Þ*rp~Ĉïmžï6k¾+®"ÎL%5kּÊéå¿è«×‰Æs€€ò%ÒuT[hž‡L.v@)grÃi…6ÏÏ�É
å©8$l9"åùewFû¢Šäù¥žMH\tWA*Ï/.×+²X[£¡AŠE¬j;tFÖ~ÜâÅH�ÌJ�tµƕéªxêºÙl¶Œ݁¾k·Ã*tFûìì¥í_ÀXí@dºЕ*F
-ì»f‘ÚÝf*ßÐÛ@„¦à֔õ+}5kⶸ8ã%ÒÔպtU¼¯“Üí4‹tl9ÿŽ-‚ÎXEʚƒªç»Gç‘Sw‘#·S•.LØ,M¢¶íø'q�*Oäô$.Mðۅ�ĭ°ÂÆ£ÇÁ
+ì»f‘ÚÝf*ßÐÛ@„¦à֔õ+}5kⶸ8ã%ÒÔպtU¼¯“Üí4‹tl9ÿŽ-‚ÎXEʚƒªç»Gç‘Sw‘#·S•.LØ,M¢¶íø'q�*Oäô$.Mðۅ�ĭ°ÂÆ£ÇÁ
endstream
endobj
97 0 obj
@@ -3672,7 +3672,7 @@ endobj
/Type /XObject
/Width 1430
>>
-stream
+stream
xœìÁ €�ÿ«ë
€ٻÏ%9Ž+£ïÿ@+‰¢(RËÕR4o»ºÚ{ï}ulõ‰à’È6çÄ÷SŠ ‚ÀÌͫª, öQ§ÓÕg®Ýé6ÍúaöþÿiÝno0ý¦ñx2�ÎÞ6_,Vo×Ûí6ô_ €`’$Y<™ÏçÃáè¹^¯ßnwžkµ;µZ½Zý¦J¥šÏr’tJ=f²Òg.Åï,—/>W,•+•ô÷rZ«7š´V«�þ*O놣Ñ8m·™¥¿êçϛ�ô·è 8u›Íf¹\N&ÓtVIç–ÎóÿoUoŠ¥´tÚI¡ۻ‡«ëÛ˫›7gç?½ùýøә$é=?ÌJ´ßì=¢lî¹lZœ/Ëi•j½V«7[íV»Óíöúƒáp8Ovk�ù|‘Žëõ:ñø ðÁ’$yÞNÃt¸h¶Z•j-�:Ò!äþ!ss{v~ùÔś³]–’ôê?�JŸݺãi㑍w»Ž8WHK�Ry÷¬G£ÑìtyÈc2�Ng‹Åb¹\7¯º À‰XV³Ù,z½~³Ù*Wªé´ð¹»¸¼>¿¸:;¿|ÞNã%é~¨”ö°ÌϋŽ|çsùB¾P|z®ã靖V»×Éd÷Ëb±LG��- ާ§)V“é4ý…ÞétÓßðé¯û‡ÇèúæîòêæüâʎB’ö³àGEép‹²¹݊#·[q‹»»;jõf»Ýé÷£Ñø—7VVëõÆ5 Äf³Y,ž_ý4ÍB±œ‰²·w÷WçWÖ’tX?JGÜnűÛo”Š¥r¹²{„£Ýîöƒñxòö:ŽM’x~ >Þó“³Ùl05›b±œyº6óòêæìü2øÔ-Iúø‚ñ¤“-»{E¥ø´Üؽ Òzzxc<™,ž>8ûüä†å ¼Óæy_1ŸÃ_^É\]ßZVHÒü'é÷EÙ\~·ܨT«»»7º½þh4žÏç»g666 œœôw_úKp±\†ÃF£õv_ñæì"ø8-Iúl?©Iúð2Qç
ŧ¯§4Ÿ6ãñx>_¼]kØl pÒßkéo·ÙlÞéôʕj&Ê^ßÜÙWH҉üD&éã{Þl”J•z½ÙîtÃa:ò×k;
Eú+I’étÚlµ‹ÅÒýCæüâ*ø¨,Iګ‚Ÿ¼$}º¢l®P,×ê�ÝZc0œNg«õ:ôˆ
@@ -3830,7 +3830,7 @@ _% O
‚`µZ·Zí|áZ|0a£er»ûœ&’K|¿ H¸þ`Èi"¢߳§Ó튥ŸÈ ~’Ҳœ&K|¼ H¸§Ó$“)/1ˆˆþ˜ëºýÁ°T®ð‰àÙyJã4 �Lâã juc±à4 Ñ_SÊßOn«µo—yññ„ÁéÙ§I€_. ðH7kۖžDD¡.‚ù|a˜|êxr|zÎK iÄg ü‡Ó$DDfÛNÛê\å‹â¤erû‡œ&’E|³ À³¶ÕUJI/"¢häûþ`8*•+âC�òã4ɑø¤°5⃠~ֻëóUO"¢Í{üɜϺnò©O$SJËî숯* Û!¾V à£ñXzE¬ l۱¬ÎÓõUéE lÙyJû¼³'>¬ l�øT€_ÔêÆl6—^DD‘ÌuÝápT¹es—â»ؚÓó_õ’@|ª Àï꺹^¯¥w QTSJ-KÃlðµO$§I€$ß) ðG†Ùt]WzE¸ ÇéÝõKå
É@ìi™ÜÁщø¼ð¡ÄG
üM«mù¾/½ ˆˆ"ŸçyÓ鬮—Wñ™ |œ´–ÝÝ?_X >ŽøB€ôz}ŸÓ$DDïQ«õºÓé]—n².AL¥9MĚø<€—�Æ÷ÜW%"zǔR“ÉT×Mþ’�XºHg>}ÙßY >‚ø6€—Uk:§Iˆˆ>"Ûvº½~ñºœã/ˆ—3N“ 1%¾M àÕêÆjmK?éŶéln˜Ío—yñá ¼—N“ q$>L `��ÖÎÃô3>Qœóå%3â« 6Ôjw”RÒøDDño½¶-«[,–Ä(ðZ&·wp$>¸ ¼#ñI ›ët︯JD´�”R³ÙÌl4ùà'¢+e¿ršˆñ= ›«ÖôÁpÈi"¢õø“ëºîp8®Vë|(Qt‘Î|ùº'>» ¼ñ= ÿ¤V×'“™ô=Qâò}mÛÝÞÝM¥ÊíDËÙEšûª@<ˆ� øWuÝ\,WÒÏòDD M)µ\®ÚV§T®ð*QqrvÁW=�_" ð
-†ÙpGú)žˆ(Ñyž7Ÿ/ÍVñºÌù„œ–É�œñˆ:ñ ¯Óh¶9MBD†\ϛNg†Ù,K¼Ê@hi™Üþá±øþðâ ^Íêôøª'QxzpÝûû‰n4ò…k^e „ÒZv‡Ó$@”‰ x‹Á`ÄK"¢°åzÞøǫŒ«|‘W•”–å4 ]âë Þh:å4 QHSJM&ÓF³ū„ÇyJãƒ@D‰O x£jM_rš„ˆ(ÜA0�͛v¡X° §I€ˆún…Þ
+†ÙpGú)žˆ(Ñyž7Ÿ/ÍVñºÌù„œ–É�œñˆ:ñ ¯Óh¶9MBD†\ϛNg†Ù,K¼Ê@hi™Üþá±øþðâ ^Íêôøª'QxzpÝûû‰n4ò…k^e „ÒZv‡Ó$@”‰ x‹Á`ÄK"¢°åzÞøǫŒ«|‘W•”–å4 ]âë Þh:å4 QHSJM&ÓF³ū„ÇyJãƒ@D‰O x£jM_rš„ˆ(ÜA0�͛v¡X° §I€ˆún…Þ
endstream
endobj
98 0 obj
@@ -3870,7 +3870,7 @@ endobj
/Length 6207
/Filter /FlateDecode
>>
-stream
+stream
xœÝ=ێÛ8–ïòB¿tyÐV‰%Jƒ °IeҝÅô¢»Ì.Ð=ŽËUñLù_ҝošO˜Ÿ™·�Úçý€å9¼H¤HËeSµ‹
�*—EçÎÃ˗›Ýüv2Ý%/^\¾Üí&ӏ³›äçË÷«õŸ/ßYÏ.˜Ü͗“Ý|µ¼|·ÿ°ƒ¯¾›Mnf›««äÕëëäÓógYšÁ¿ªâ$ɒ¢.Ҝ&£iƒÍìù³ÿ]²|þìÕûçÏ.ߐ¤NY•¼¿}þg I¥)£ ¯ê”ÐäýB4ûö]™ÜmEÏÉþU«¿¾}þìç‹dôçäý¿>öÑá�ϟ= Ñ6ùÃ÷×Ée`ίV»Ýjžö›Õjqڢa™P| æŒSU3ÀGãübvâDƒ K–€žŠÖ04ž²2�ƆÆiZ¡EŸí+?´d,úæ™øzúóÅMô5¬ʴxº5{2`çIi‰óäÕY�‹.äº~Êõ¤\ 5*h,£iQ ýiTˆ�?..6£1»Ø
”ŒÆü‚¦âû軆¢%dÞÔ� âõC{‘ь^EŸ^�æOFD¬$‚fû7œ§bº£1¡$ö0
’şô'Õ
#))“¼ ŒgiI“,央96¾ývÛ'j¥^0Ü, ˆñ:ÊҲh
¿„ÉËÖSÐ'Þ.&w3R$¯WI|-€²,¨å°—UI^¤u�'šÉ6%!©`ln¹œ¹Xκ´Y“xµJƒɸ«ùn&˜ÂùÄh\^ÌwóÏÀ9æ»/ðë÷É5±‹ä-(ØJŒ| Lî=dpê ‰hOX`„½iì'—ï֓% þû뷯“ìò�“å]rq»_7:MÅòÈT±8©Ҽ3®ŸfàªÀÆæÓ~èK iwˆ@×f?ïG„�©‹yÆFÄ¢40:k>”‘(i¥¥¾¬ìŒê�Z2mQ"m÷€©;@þ˜�Äw;x2
W’,±åj?ª$v?Á—{ ÚVËÉ.–[èÛLÍ~ÿá÷[á×;#Ἀßà³ ™Çél¤ÖñZ®¦Ðë~1ªqtÞÖâOœËþ3þ�Tÿ%�q ^3£Â>Õ׀†è÷>i¬´Fr/þøúàíôë$58øíVªøâÙ©O.¶PÂZ#í.èí�2YN磼¥s$擜׆‡§;d3bø· ¿YX3ïwâáÛÿHÄ÷6*&7¸ÕÚÈÓóÇF’š ëϓ‘ÆÆL²±þÝ@‡Ù
´(ӜÛèƒï7wúÓOˆÈ툐‹ý†¼Fº’ƹââ§bå)Îí^ý‡Ï˻Øk�S’æ¤¸ãø€ÙQ€×zû
@@ -3889,7 +3889,7 @@ W
¹O�ٲðCj0+tvñW4>££îÒÉ|{êv1Æ—t#”/Ÿˆ1º°cŒ@.cŒ–Ӵ†ðNîÿIîÛѠPÁF… ýÎg%Zž»µÖ=šI W»5Þ°Â lÞkÙÌܹ^ZDªàÒqòV‹FlEeë:(°c®ípñž•9`b0§E³šŸWóiû!\2Pk+uĶgF½ í¼V×UÛÁ–j¯·N±“ʵs¥(wõËæBéÆkK=÷º O©o¸@œ»kLkWcôBüp˜¾ò—QtHBC©<“‹-]bÜ]”.¥}"áâ€L¶¸pÚgçdýè$kÿJ՜/¿·7¶t¨O§ûft“ûQûÛ5Ù×^åñ*;œëó°&ãG^¢|køú Û#§pun´em�7£·-!ßàiö‡ë(›¼•Ïøæ§xagµ•:Cº=‹J<§$Ë̋d¬Ñ_¨›¹2Y¯?7•÷um~}¥V¸>KVò—§,©*ø¯Ûrówe¿Êýrá×íôý`çÞýUٷ´Ï}åÖíºî$“ŸmäŠd²ã~2¨?åÎÄ÷’ö¹L€ŨŒòrRÁ[�ۘ,FÂOpDY™Zù>¯�{í;’%)Êö2´�çÎÛ.\wÍ=g¾è -¢´½q©[â´ԑç-gv¡7^GxcÀg‚koy�ñ= ÷ò{éež�ǘ�*¿‰r6zãsßDJúÍô>cÁ€÷ßÃ[ÝP
¤Z'ëf&-àvÕiÅTSp¯¸¶Õ53IÏ]a;
s]´n�ɺYUy,{ɓÒâF ÝÀ× 7nQ8Ãæbñ.#ÉÏ#µqU9ÁÛԾ�2|wNëÊÊFp]K™é¹ÂÇÈ7uq§xFHѺ¬³FIîLޖÀêkV^ª.êѢ¯ò|£~¿´%6SM*ϠT“Öåœ85áB
p£pؒZ !vdGèl鬊ïHžñlœ@ݒGµrdL¯{–ËAŽÆ$÷…tãç5°o)u¦5(
-¨5€GƸ�†;8oyYöºŒÆÖ¶$iiɗ�2³Ïñ¥ȵ²ðì0ùؽ½U+
Ò)õÐÍ`9ävü`3XLsùØ0}u�ž/¯ƾ=š£- ®ÕÃI ®sW&–-ò²9eã
RðD_"¬¯ÑY¤ø×P =»&]@>Iñ?ćœ‡
+¨5€GƸ�†;8oyYöºŒÆÖ¶$iiɗ�2³Ïñ¥ȵ²ðì0ùؽ½U+
Ò)õÐÍ`9ävü`3XLsùØ0}u�ž/¯ƾ=š£- ®ÕÃI ®sW&–-ò²9eã
RðD_"¬¯ÑY¤ø×P =»&]@>Iñ?ćœ‡
endstream
endobj
101 0 obj
@@ -3956,7 +3956,7 @@ endobj
/Length 2134
/Filter /FlateDecode
>>
-stream
+stream
xœÅZ]nÛF~7à;ì[Ä"\qw¹ü)¶Ò4.R �¶@ÐY–\6¥HTМ©GèeúX÷�™åòwéª •HB.gwþg¾Y{|¾ÍWËÙ