diff --git a/.codeclimate.yml b/.codeclimate.yml
index 0c62d4ed5eb..f6fbf2fe168 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -6,7 +6,6 @@ languages:
engines:
phpcodesniffer: true
exclude_paths:
- - 'build/*'
- 'dev/*'
- 'doc/*'
- 'test/*'
diff --git a/.github/workflows/doxygen-gh-pages.yml.disabled b/.github/workflows/doxygen-gh-pages.yml.disabled
index 33dd47aa6e6..7c91b892378 100644
--- a/.github/workflows/doxygen-gh-pages.yml.disabled
+++ b/.github/workflows/doxygen-gh-pages.yml.disabled
@@ -8,7 +8,7 @@ on:
- develop
permissions:
contents: write
-
+
jobs:
build:
runs-on: ubuntu-latest
@@ -18,16 +18,16 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
- folder: build/html
- config_file: build/doxygen/dolibarr-doxygen.doxyfile
+ folder: dev/build/html
+ config_file: dev/build/doxygen/dolibarr-doxygen.doxyfile
# - name: Deploy
# uses: JamesIves/github-pages-deploy-action@v4
# with:
# branch: gh-pages
-# folder: build/html # The folder the action should deploy.
+# folder: dev/build/html # The folder the action should deploy.
# target-folder: docs/html2
-
+
#jobs:
# doxygen:
# runs-on: ubuntu-latest
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index 420ca085cad..2d53ce8f49c 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -22,6 +22,6 @@ jobs:
uses: docker://exakat/exakat-ga
with:
ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,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/'
+ ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/dev/,/doc/,/scripts/,/test/'
file_extensions: php
project_reports: Perfile
diff --git a/.github/workflows/github_ci_php71_pgsql.yml.disabled b/.github/workflows/github_ci_php71_pgsql.yml.disabled
index d324d1c1481..b2997a041b6 100644
--- a/.github/workflows/github_ci_php71_pgsql.yml.disabled
+++ b/.github/workflows/github_ci_php71_pgsql.yml.disabled
@@ -35,14 +35,14 @@ jobs:
--health-timeout 5s
--health-retries 5
ports:
- - 5432:5432
+ - 5432:5432
steps:
# git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
- uses: actions/checkout@v3
with:
fetch-depth: 1
-
+
- name: Version PHP
run: |
php -i | head -
@@ -59,7 +59,7 @@ jobs:
sudo apt install apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
sudo update-alternatives --set php /usr/bin/php7.1
php -i | head -
-
+
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^7.5 \
@@ -76,7 +76,7 @@ jobs:
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
- run: |
+ run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
@@ -107,32 +107,32 @@ jobs:
psql --version
echo "Check pgloader version"
pgloader --version
-
+
- name: Create database
run: |
pwd
- echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
+ echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
-
+
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
-
- mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-
- mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
- echo "Init postgresql database"
+ mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+
+ mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
+
+ echo "Init postgresql database"
ps fauxww | grep postgres
ls /etc/postgresql/14/main/
sudo chmod -R a+rwx /etc/postgresql/14/main/pg_hba.conf
-
+
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/14/main/pg_hba.conf
sudo cat /etc/postgresql/14/main/pg_hba.conf
@@ -144,7 +144,7 @@ jobs:
sudo mkdir -p /tmp/pgloader
sudo chmod -R a+rwx /tmp/pgloader/
-
+
echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
@@ -190,7 +190,7 @@ jobs:
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
-
+
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
@@ -199,9 +199,9 @@ jobs:
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
-
+
- name: Copy app into /var/www
- run: |
+ run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
@@ -217,7 +217,7 @@ jobs:
a2query -s
a2query -m
ls /etc/apache2/sites-available
- #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
+ #sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php7.1
@@ -245,7 +245,7 @@ jobs:
# The wget should return a page with line '
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
-
+
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
@@ -287,7 +287,7 @@ jobs:
php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
-
+
echo "\dt llx_c_paiement" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
echo "\dt llx_c_payment_term" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
@@ -324,17 +324,17 @@ jobs:
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
-
+
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
-
+
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
- run: |
+ run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
@@ -361,5 +361,4 @@ jobs:
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
- set +e
-
+ set +e
diff --git a/.github/workflows/github_ci_php81_mysql.yml.disabled b/.github/workflows/github_ci_php81_mysql.yml.disabled
index 047fcd63fb5..c303b3125c1 100644
--- a/.github/workflows/github_ci_php81_mysql.yml.disabled
+++ b/.github/workflows/github_ci_php81_mysql.yml.disabled
@@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 1
-
+
- name: Version PHP
run: |
php -i | head -
@@ -38,14 +38,14 @@ jobs:
sudo composer self-update 2.2.18
sudo chmod -R a+rwx /home/runner
composer -n config -g vendor-dir htdocs/includes
-
+
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update
sudo apt-get install -y pgloader memcached
sudo apt install apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
sudo update-alternatives --set php /usr/bin/php8.1
php -i | head -
-
+
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
@@ -56,7 +56,7 @@ jobs:
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
- run: |
+ run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
@@ -87,26 +87,26 @@ jobs:
psql --version
echo "Check pgloader version"
pgloader --version
-
+
- name: Create database
run: |
pwd
- echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
+ echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
-
+
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
-
- mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
- mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
+ mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+
+ mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
- name: Generate Dolibarr conf file
run: |
@@ -145,7 +145,7 @@ jobs:
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
-
+
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
@@ -154,9 +154,9 @@ jobs:
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
-
+
- name: Copy app into /var/www
- run: |
+ run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
@@ -172,7 +172,7 @@ jobs:
a2query -s
a2query -m
ls /etc/apache2/sites-available
- #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
+ #sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php8.1
@@ -200,7 +200,7 @@ jobs:
# The wget should return a page with line '
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
-
+
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
@@ -274,17 +274,17 @@ jobs:
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
-
+
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
-
+
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
- run: |
+ run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
@@ -311,7 +311,7 @@ jobs:
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
- set +e
+ set +e
- name: Code quality check - Lint
if: github.event_name == 'push'
@@ -325,10 +325,9 @@ jobs:
- name: Code quality check - phpcs
if: github.event_name == 'push'
run: |
- htdocs/includes/bin/phpcs -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 .;
+ htdocs/includes/bin/phpcs -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 .;
- name: Code quality check - var-dump-check
if: github.event_name == 'push'
run: |
htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
-
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 844ad46af3c..ddc3c6ccc4e 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -67,7 +67,7 @@ jobs:
- name: Run PHPStan
id: phpstan
run: |
- phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
+ phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
# continue-on-error: true
# Save cache
@@ -90,4 +90,4 @@ jobs:
# id: phpstan-baseline
# if: ${{ success() }}
# run: |
- # phpstan -vv analyse --memory-limit 7G -a build/phpstan/bootstrap_action.php --generate-baseline build/phpstan/phpstan-baseline.neon
+ # phpstan -vv analyse --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php --generate-baseline dev/build/phpstan/phpstan-baseline.neon
diff --git a/.github/workflows/phpstan_baseline.yml b/.github/workflows/phpstan_baseline.yml
index 9503c25de77..9cea77150dd 100644
--- a/.github/workflows/phpstan_baseline.yml
+++ b/.github/workflows/phpstan_baseline.yml
@@ -60,8 +60,8 @@ jobs:
github_token: ${{ env.GH_TOKEN }}
phpstan_path: phpstan
configuration_path: phpstan.neon.dist
- phpstan_additional_arguments: --memory-limit 7G -a build/phpstan/bootstrap_action.php
- baseline_path: build/phpstan/phpstan-baseline.neon
+ phpstan_additional_arguments: --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php
+ baseline_path: dev/build/phpstan/phpstan-baseline.neon
commit_name: Dolibot
commit_email: dolibarr-bot@users.noreply.github.com
commit_message: PHPStan > Update baseline
diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml
index 67075183b60..c4f20739faf 100644
--- a/.github/workflows/pr-18.yaml
+++ b/.github/workflows/pr-18.yaml
@@ -20,12 +20,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- - name: Install GitHub CLI
- run: |
- sudo apt update
- sudo apt install gh -y
+ #- name: Install GitHub CLI
+ # run: |
+ # sudo apt update
+ # sudo apt install gh -y
- - name: Assign reviewer
+ - name: Assign reviewer method 1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ url: ${{ github.event.pull_request.html_url }}
+ run: |
+ gh pr edit "$url" --add-assignee rycks --add-reviewer rycks
+ gh pr merge "$url" --merge --auto
+
+
+ - name: Assign reviewer method 2
env:
#REVIEWER: "eldy,lvessiller-opendsi,rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
REVIEWER: "rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index dc0bfbdf63c..e1f97436b60 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -9,10 +9,9 @@ on:
env:
ENVGHT: ${{ secrets.GITHUB_TOKEN }}
ENVGHU: ${{ github.token }}
- VARAAA: ${{ vars.AAA }}
- SECBBB: ${{ secrets.BBB }}
- VARREPORGCCC: ${{ vars.CCC }}
- ENVFIX: "abc"
+ TEST_ACCESS_KEY: ${{ secrets.TEST_ACCESS_KEY }}
+ TEST_VAR_REPO: ${{ vars.TEST_VAR_REPO }}
+ ENVLOCAL: "varenvlocal"
jobs:
testjob:
@@ -25,14 +24,6 @@ jobs:
echo "secrets.GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
echo "GITHUB_EVENT_PATH=$GITHUB_EVENT_PATH"
echo "repo-token: ${{secrets.GITHUB_TOKEN}}"
- echo "variable org: ${{vars.AAA}}"
- echo "env prg: ${{env.AAA}}"
- echo "env prg: ${{env.VARAAA}}"
- echo "secret org: ${{secrets.BBB}}"
- echo "variable repository of orga: ${{vars.CCC}}"
- echo "ENVGHT: ${{env.ENVGHT}}"
- echo "ENVGHU: ${{env.ENVGHU}}"
- echo "VARAAA: ${{vars.AAA}}"
- echo "ENVAAA: ${{env.VARAAA}}"
- echo "VARREPORGCCC: ${{env.VARREPORGCCC}}"
- echo "ENVFIX: ${{env.ENVFIX}}"
+ echo "secret repository TEST_ACCESS_KEY: ${{secrets.TEST_ACCESS_KEY}}"
+ echo "variable repository : ${{vars.TEST_VAR_REPO}}"
+ echo "ENVLOCAL: ${{env.ENVLOCAL}}"
diff --git a/.gitignore b/.gitignore
index 0a6e4cf6655..434764e4f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,8 @@ htdocs/.well-known/apple-developer-merchantid-domain-association
/output/
# Node Modules
-build/yarn-error.log
-build/node_modules/
+dev/build/yarn-error.log
+dev/build/node_modules/
node_modules/
vendor/
@@ -84,8 +84,8 @@ doc/install.lock
/INI_PHPUNIT
# ignore cache builds
-/build/phpstan/phpstan
-/build/phpstan/bootstrap_custom.php
+/dev/build/phpstan/phpstan
+/dev/build/phpstan/bootstrap_custom.php
phpstan_custom.neon
/.php-cs-fixer.cache
/.php_cs.cache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5f75f64fc16..2c2226fb84b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -51,8 +51,8 @@ repos:
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 )$
+ |htdocs/modulebuilder/template/.* |dev/build/debian/dolibarr.postrm |dev/build/debian/dolibarr.postinst
+ |dev/build/debian/dolibarr.config )$
# Fix the first UTF8 byte
- id: fix-byte-order-marker
# Check that there are no files that have are the same when uppercased (conflict on windows)
@@ -160,6 +160,8 @@ repos:
]
pass_filenames: false # Run on all files
- id: php-lint
+ exclude:
+ (?x)^(htdocs/includes/symfony/.*)$
- id: php-stan
stages: [manual]
files: \.(php)$
diff --git a/.travis.yml b/.travis.yml
index ad037e8fe31..22fef0806a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -313,7 +313,7 @@ before_script:
- |
echo "Setting up Apache"
sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
- sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
+ sudo cp -f dev/build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
sudo cat /etc/apache2/sites-available/000-default.conf
sudo service apache2 restart
diff --git a/ChangeLog b/ChangeLog
index bcff698e623..b7439b5e742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,25 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
+
+***** ChangeLog for 22.0.0 compared to 21.0 *****
+
+For users:
+----------
+
+
+For developers:
+----------
+
+
+WARNING:
+--------
+
+The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The directory /build has been moved into /dev/build.
+
+
+
***** ChangeLog for 21.0.0 compared to 20.0 *****
For users:
@@ -217,6 +236,66 @@ The following changes may create regressions for some external modules, but were
* If you were using the substitution key __MEMBER_CIVILITY__, you must now use __MEMBER_TITLE__
+***** ChangeLog for 20.0.3 compared to 20.0.2 *****
+FIX: 17.0 - missing error handling for FactureRec::fetch in card-rec.php
+FIX: 17.0 - warnings due to uninitialized variables + delete code that doesn't apply to recurring invoices (AFAIK, there is no recurring credit note feature)
+FIX: #31159 - TVA Account by country is not used (#31984)
+FIX: #31724 (#31885)
+FIX: #31890 store empty line extrafields (#32152)
+FIX: #31997
+FIX: #32007 missing parameter on function multiSelectArrayWithCheckbox (#32008)
+FIX: #32021
+FIX: #32171 (#32172)
+FIX: #32178: repair.php: fix missing 'as' with Postgres (#32179)
+FIX: #32259
+FIX: #32317 Error with report by month sales tax
+FIX: #32391
+FIX: #32402 Social Contribution - Update - Drop the attached employee
+FIX: #32408 Dict - module Event organisation is stable now
+FIX: #32467
+FIX: Accounting Closure Duplicates, Subledger accounts, Account Labels and more... Update bookkeeping.class.php
+FIX: add a line in expensereport refused
+FIX: All contacts were loaded even if no thirdparty was selected (#31877)
+FIX: asset: missing ref_ext field used in CommonObject::isExistingObject() (#31870)
+FIX: assets: division by zero when trying to calculate depreciation on assets that don't have it (#31858)
+FIX: avoid php8 warnings
+FIX: broken feature, check if module is enabled
+FIX: broken feature, entity can not be empty !
+FIX: broken feature, wrong GETPOSTINT parameter
+FIX: BUG #32454 (Third party creating vendor)
+FIX: calculate start date of cloned task from cloned project (#31799)
+FIX: can not convert to reduc if draft status
+FIX: comparing strings with numbers can be touchy
+FIX: Debug option not working replaced by the one that works.
+FIX: default user in stat page
+FIX: Ensure extraparams cannot be selected by the user (#32132)
+FIX: GETPOST "$check" parameter can't be empty
+FIX: Hidden dropdown download link in project
+FIX: stop doing a full closure without duplicate lines generated by an unclean database
+FIX: in projet/element.php total_time is always back to 0
+FIX: (invoice): mutlicurrency_tx correct value
+FIX: invoice: revenue stamp wrongly converted to int (#31840)
+FIX: issue #28222 Edit date extrafield displayed on all on lines (#31914)
+FIX: "location_incoterms" is a string
+FIX: missing hook parameters
+FIX: missing saving MAIN_SECURITY_MAX_NUMBER_FAILED_AUTH
+FIX: old copy not needed in supplier order create method (#31733)
+FIX: send mail to BCC when email formatted as Fullname (#31983)
+FIX: set birthday alert (#32133)
+FIX: Status not correct in Public ticket list (#31922)
+FIX: swiftmailer: correctly set errors-to header (#31826)
+FIX: TakePos barcode rule (#31857)
+FIX: Takepos: set the country of the default customer (#31915)
+FIX: Update Accounting closure with missing too many A-Nouveau #30039)
+FIX: Update on a sold line of bank entry set the type to empty, now it's fixed #22539 (#31888)
+FIX: update status on create supplier order for trigger (#31642)
+FIX: use tax with code on supplier order line give tax code missing in supplier invoice (#32018)
+FIX: warning in agenda when user have no color and AGENDA_NO_TRANSPARENT_ON_NOT_BUSY=1
+FIX: when create intervention from propal (or other object), element link is missing after creation (#32035)
+FIX: with no perm on supplier, must not see supplier of the best price
+FIX: wrong check
+FIX: wrong trigger name (MODIFY instead UPDATE)
+
***** ChangeLog for 20.0.2 compared to 20.0.1 *****
FIX: fatal when updating recurring supplier invoice line with php8 ($remise_percent is '' instead of 0) (#31713)
FIX: supplier invoice template card: buyer and seller swapped in VAT-related function calls (probably a copy-paste from customer invoice templates) (#31446)
diff --git a/build/debian/compat b/build/debian/compat
deleted file mode 100644
index 9a037142aa3..00000000000
--- a/build/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/build/debian/po/POTFILES.in b/build/debian/po/POTFILES.in
deleted file mode 100644
index 40130aadd20..00000000000
--- a/build/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] dolibarr.templates
\ No newline at end of file
diff --git a/build/debian/source/format b/build/debian/source/format
deleted file mode 100644
index 46ebe026659..00000000000
--- a/build/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
\ No newline at end of file
diff --git a/build/flatpack/org.flatpak.Dolibarr.json b/build/flatpack/org.flatpak.Dolibarr.json
deleted file mode 100644
index 69140d32372..00000000000
--- a/build/flatpack/org.flatpak.Dolibarr.json
+++ /dev/null
@@ -1 +0,0 @@
-"Help wanted..."
\ No newline at end of file
diff --git a/build/phpstan/README b/build/phpstan/README
deleted file mode 100644
index 30f7a20b24e..00000000000
--- a/build/phpstan/README
+++ /dev/null
@@ -1,26 +0,0 @@
-PHPStan (https://phpstan.org)
------------------------------
-
-PHPStan requires PHP >= 7.1
-
-Config File is: ./phpstan.neon
-
-= Installation =
-
-cd ./build/phpstan
-mkdir phpstan
-cd phpstan
-composer require --dev phpstan/phpstan
-
-
-= 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
-php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/
-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 --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"
" } { print $0"
" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
diff --git a/build/.gitignore b/dev/build/.gitignore
similarity index 100%
rename from build/.gitignore
rename to dev/build/.gitignore
diff --git a/build/README b/dev/build/README
similarity index 97%
rename from build/README
rename to dev/build/README
index dc9c743175f..d1107129de0 100644
--- a/build/README
+++ b/dev/build/README
@@ -1,13 +1,13 @@
README (English)
-Path: /dolibarr/build/README
+Path: /dolibarr/dev/build/README
##################################################
Building packages
##################################################
All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
-The build directory and all its contents is absolutely not required to make Dolibarr working.
+The build directory and all its contents is absolutely not required to make Dolibarr working.
It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
@@ -21,7 +21,7 @@ There are several tools:
See makepack-howto.txt for prerequisites.
--------------------------------------------------------------------------------------------------
-
+
- To build a theme package, launch the script
> perl makepack-dolibarrtheme.pl
diff --git a/build/composer/README b/dev/build/composer/README
similarity index 97%
rename from build/composer/README
rename to dev/build/composer/README
index 5d39336a337..6595b9200cf 100644
--- a/build/composer/README
+++ b/dev/build/composer/README
@@ -5,7 +5,7 @@
update-alternatives --config php
-* To list packages
+* To list packages
cd htdocs/includes/diroflib
composer install
@@ -37,4 +37,3 @@ Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --ignore-platform-reqs
composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp
-
diff --git a/build/debian/README.Debian b/dev/build/debian/README.Debian
similarity index 100%
rename from build/debian/README.Debian
rename to dev/build/debian/README.Debian
diff --git a/build/debian/README.howto b/dev/build/debian/README.howto
similarity index 95%
rename from build/debian/README.howto
rename to dev/build/debian/README.howto
index f01add2f013..1e8e6d56d7a 100644
--- a/build/debian/README.howto
+++ b/dev/build/debian/README.howto
@@ -43,16 +43,16 @@ END
# Complete .bashrc with DEBEMAIL and DEBFULLNAME
Example:
-export DEBFULLNAME="Laurent Destailleur (eldy)"
+export DEBFULLNAME="Laurent Destailleur (eldy)"
export DEBEMAIL=eldy@users.sourceforge.net
Other example:
-export DEBFULLNAME="Laurent Destailleur"
+export DEBFULLNAME="Laurent Destailleur"
export DEBEMAIL="eldy@destailleur.fr"
export QUILT_PATCHES=debian/patches
-# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public
+# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public
* Create an account login
* Update your ~/.ssh/config file to add:
Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
@@ -72,10 +72,10 @@ export QUILT_PATCHES=debian/patches
# podebconf-report-po --from email@email.com To send email to ask translations
# Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
# msgfmt -v -c -o /dev/null XX.po To have status of translation for language XX
-
+
# To check package integrity
-# lintian --pedantic -E -I package.deb To test a binary package
-# lintian --pedantic -E -I package.dsc To test a source package
+# lintian --pedantic -E -I package.deb To test a binary package
+# lintian --pedantic -E -I package.dsc To test a source package
# To manipulate packages
# dpkg -l List all packages
@@ -84,7 +84,7 @@ export QUILT_PATCHES=debian/patches
# 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
+# dpkg -L packagename List content of installed package
# dpkg -r packagename Remove config files and interactive saved answers
# dpkg -s packagename Give status of installed package
# dpkg --purge Remove config files and interactive saved answers
@@ -104,9 +104,9 @@ See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests conte
- Wait until you received bug number.
For first ITP submission of Dolibarr, bug id was 634783.
-- Check bug is into database by searching with id on
+- Check bug is into database by searching with id on
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
-
+
- Add a line for upstream into file changelog with bug number
- Call for a mentor on ML debian-mentors to upload packages
@@ -129,26 +129,26 @@ To set status of a bug to "pending"
> bts --smtp-host=yoursmtpserver tag 999999 +pending
or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with:
+With a message starting with:
Control: tag -1 +pending
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
-With only message
+With only message
tag 729538 +pending
To remove status of a bug without "moreinfo" (bug can be processed)
or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with:
+With a message starting with:
Control: tag -1 -moreinfo
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
-With only message
+With only message
tag 729538 -moreinfo
@@ -172,7 +172,7 @@ Pour lister les env chroot
or
> ls /srv/chroot
-Puis pour se connecter et préparer l'environnement
+Puis pour se connecter et préparer l'environnement
> 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
@@ -212,7 +212,7 @@ or better
* You can then create a PHP project from Eclipse called tcpdf-debian
from git clone dir and make link to git.
-
+
* If local branch upstream and pristine-tar does not exists, create it
from origin/upstream and origin/pristine.
@@ -220,7 +220,7 @@ from origin/upstream and origin/pristine.
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
-* Some files are removed from archive by the get-orig-source.sh
+* Some files are removed from archive by the get-orig-source.sh
* Modify the tag file to replace sRGB.icc with correct free version and rename file into
tcpdf_x.y.z+dfsgw.orig.tar.xz
@@ -243,14 +243,14 @@ Warning: Date must have format reported by "date -R"
Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
* We try to build package
-> rm -fr ../build-area;
+> rm -fr ../build-area;
> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z]
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 uncommitted file
-Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
+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
@@ -297,7 +297,7 @@ from origin/upstream and origin/pristine.
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
-* Edit orig.tar.gz file to remove
+* Edit orig.tar.gz file to remove
- debian
- htdocs/includes/ckeditor
- htdocs/includes/jquery/css
@@ -311,7 +311,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
- htdocs/includes/restler/framework/Luracast/Restler/explorer
- htdocs/includes/swiftmailer
- htdocs/includes/tcpdf or htdocs/includes/tecnickcom
-And rename file into
+And rename file into
dolibarr-x.y.z+dfsgw.tgz
(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
@@ -343,7 +343,7 @@ To update dolibarr debian package when only files into debian has changed:
To update dolibarr debian package when only files not into debian has changed:
-* Checkout the branch you want to work on: master of debian/...
+* 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 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.
@@ -358,7 +358,7 @@ ou
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 uncommitted file
-Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
+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
@@ -382,7 +382,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu
* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
http://ftp-master.debian.org/new/
-
+
* Once package is validated, you should see it into area unstable at:
http://packages.qa.debian.org
@@ -390,7 +390,7 @@ http://packages.qa.debian.org
-##### Send an unblock request to make a full update of a stable package
+##### Send an unblock request to make a full update of a stable package
Use this to move from unstable to testing.
@@ -402,7 +402,7 @@ Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
-so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
+so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
@@ -423,14 +423,14 @@ Pro are:
- Patches were already tested because deployed and used by several thousands of users.
- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
-Cons are:
+Cons are:
- The patch include more than the only one security reported fixes
So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
since it provides more stability and is for me a more secured process.
"
-##### Send an request to ask a simple fix of a stable package
+##### Send an request to ask a simple fix of a stable package
Use this to ask to apply patches on a stable version.
@@ -442,7 +442,7 @@ Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
-so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
+so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
Note: If there is a response to ask more information, don't forget to remove the tag during answer.
diff --git a/build/debian/apache/.htaccess b/dev/build/debian/apache/.htaccess
similarity index 100%
rename from build/debian/apache/.htaccess
rename to dev/build/debian/apache/.htaccess
diff --git a/build/debian/apache/dolibarr.conf b/dev/build/debian/apache/dolibarr.conf
similarity index 100%
rename from build/debian/apache/dolibarr.conf
rename to dev/build/debian/apache/dolibarr.conf
diff --git a/build/debian/changelog b/dev/build/debian/changelog
similarity index 81%
rename from build/debian/changelog
rename to dev/build/debian/changelog
index 326405a6d2b..7ad3facc917 100644
--- a/build/debian/changelog
+++ b/dev/build/debian/changelog
@@ -2,5 +2,5 @@ dolibarr (__VERSION__) UNRELEASED; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
-
- -- Laurent Destailleur (eldy) Tue, 12 May 2015 12:00:00 +0100
+
+ -- Laurent Destailleur (eldy) Tue, 12 May 2015 12:00:00 +0100
diff --git a/dev/build/debian/compat b/dev/build/debian/compat
new file mode 100644
index 00000000000..f599e28b8ab
--- /dev/null
+++ b/dev/build/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/build/debian/conf.php.install b/dev/build/debian/conf.php.install
similarity index 99%
rename from build/debian/conf.php.install
rename to dev/build/debian/conf.php.install
index c373664deef..0d5cd22ad53 100644
--- a/build/debian/conf.php.install
+++ b/dev/build/debian/conf.php.install
@@ -137,7 +137,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
# Default value: dolibarr
# Possible values: Any values found in files in htdocs/core/login directory after
# the "function_" string and before the ".php" string. You can also separate several
-# values using a ",". In this case, Dolibarr will check login/pass for each value in
+# values using a ",". In this case, Dolibarr will check login/pass for each value in
# order defined into value. However, note that this can't work with all values.
# Examples:
# $dolibarr_main_authentication='http';
@@ -235,4 +235,3 @@ $dolibarr_main_prod='0';
# dolibarr_main_distrib
# A key to identify the distribution used for first installation
$dolibarr_main_distrib = 'debian';
-
diff --git a/build/debian/control b/dev/build/debian/control
similarity index 97%
rename from build/debian/control
rename to dev/build/debian/control
index b2890253b32..73a9bc0f68c 100644
--- a/build/debian/control
+++ b/dev/build/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.6
Homepage: https://www.dolibarr.org
Build-Depends: debhelper (>= 9), po-debconf
# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
-
+
Package: dolibarr
Architecture: all
# For debian 7 or 8 or 9
@@ -35,8 +35,8 @@ Recommends: apache2 | lighttpd | httpd,
php-xml, php-mbstring, php-intl
Suggests: www-browser, php5-geoip
Description: Web based software to manage a company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software package for
- companies, foundations or freelances. It includes different
+ Dolibarr ERP & CRM is an easy to use open source/free software package for
+ companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
.
diff --git a/build/debian/copyright b/dev/build/debian/copyright
similarity index 99%
rename from build/debian/copyright
rename to dev/build/debian/copyright
index 5f1b73d9b64..719e6dc5de0 100644
--- a/build/debian/copyright
+++ b/dev/build/debian/copyright
@@ -38,7 +38,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville
2011, Herve Prot
2011, Remy Younes
2012-2013, Christophe Battarel
-
+
License: GPL-3+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
@@ -147,7 +147,7 @@ Comments:
------------------------------------------------------------
Files: doc/images/*
-Copyright: Laurent Destailleur
+Copyright: Laurent Destailleur
License: CC-BY-SA-3.0
You are free:
to Share (to copy, distribute and transmit the work) and
@@ -306,7 +306,7 @@ Comment:
Files: htdocs/includes/odtphp/*
Copyright: 2008, Julien Pauli
- 2008, Cyril PIERRE de GEYER
+ 2008, Cyril PIERRE de GEYER
2010, Laurent Destailleur
License: GPL-2+
This program is free software; you can redistribute it
diff --git a/build/debian/dolibarr.config b/dev/build/debian/dolibarr.config
old mode 100644
new mode 100755
similarity index 100%
rename from build/debian/dolibarr.config
rename to dev/build/debian/dolibarr.config
diff --git a/build/debian/dolibarr.desktop b/dev/build/debian/dolibarr.desktop
similarity index 97%
rename from build/debian/dolibarr.desktop
rename to dev/build/debian/dolibarr.desktop
index dd59be792d2..99a941d8831 100644
--- a/build/debian/dolibarr.desktop
+++ b/dev/build/debian/dolibarr.desktop
@@ -12,7 +12,7 @@ Comment[es]=Software para gestión de PYMES, profesionales independientes, auto
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
# Command to open an URL
-# For Fedora: xdg-open
+# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser
# (exo-open for xfde, gnome-open for gnome, ...)
Exec=xdg-open http://localhost/dolibarr
diff --git a/build/debian/dolibarr.docs b/dev/build/debian/dolibarr.docs
similarity index 100%
rename from build/debian/dolibarr.docs
rename to dev/build/debian/dolibarr.docs
diff --git a/build/debian/dolibarr.install b/dev/build/debian/dolibarr.install
similarity index 91%
rename from build/debian/dolibarr.install
rename to dev/build/debian/dolibarr.install
index a49ad442eb5..331be0333e3 100644
--- a/build/debian/dolibarr.install
+++ b/dev/build/debian/dolibarr.install
@@ -8,4 +8,4 @@ htdocs usr/share/dolibarr/
scripts usr/share/dolibarr/
doc/install usr/share/doc/dolibarr/
doc/user usr/share/doc/dolibarr/
-doc/index.html usr/share/doc/dolibarr/
\ No newline at end of file
+doc/index.html usr/share/doc/dolibarr/
diff --git a/build/debian/dolibarr.lintian-overrides b/dev/build/debian/dolibarr.lintian-overrides
similarity index 98%
rename from build/debian/dolibarr.lintian-overrides
rename to dev/build/debian/dolibarr.lintian-overrides
index 90120971ce9..63e742c70ec 100644
--- a/build/debian/dolibarr.lintian-overrides
+++ b/dev/build/debian/dolibarr.lintian-overrides
@@ -7,4 +7,4 @@ dolibarr: apache2-deprecated-auth-config Order
dolibarr: apache2-deprecated-auth-config Allow
# Ignore warning required for a good install process
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
-dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
\ No newline at end of file
+dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
diff --git a/build/debian/dolibarr.postinst b/dev/build/debian/dolibarr.postinst
old mode 100644
new mode 100755
similarity index 100%
rename from build/debian/dolibarr.postinst
rename to dev/build/debian/dolibarr.postinst
diff --git a/build/debian/dolibarr.postrm b/dev/build/debian/dolibarr.postrm
old mode 100644
new mode 100755
similarity index 100%
rename from build/debian/dolibarr.postrm
rename to dev/build/debian/dolibarr.postrm
diff --git a/build/debian/dolibarr.templates b/dev/build/debian/dolibarr.templates
similarity index 100%
rename from build/debian/dolibarr.templates
rename to dev/build/debian/dolibarr.templates
diff --git a/build/debian/dolibarr.templates.futur b/dev/build/debian/dolibarr.templates.futur
similarity index 99%
rename from build/debian/dolibarr.templates.futur
rename to dev/build/debian/dolibarr.templates.futur
index a6fc2c94670..0c70e8475e9 100644
--- a/build/debian/dolibarr.templates.futur
+++ b/dev/build/debian/dolibarr.templates.futur
@@ -102,4 +102,3 @@ Description: Delete database ?
# Delete also all uploaded and generated files (datas related
# to this quetion are all files found into /usr/share/dolibarr/documents,
# uploaded or generated when using Dolibarr) ?
-
\ No newline at end of file
diff --git a/build/debian/dolibarr.xpm b/dev/build/debian/dolibarr.xpm
similarity index 100%
rename from build/debian/dolibarr.xpm
rename to dev/build/debian/dolibarr.xpm
diff --git a/build/debian/get-orig-source.sh b/dev/build/debian/get-orig-source.sh
similarity index 100%
rename from build/debian/get-orig-source.sh
rename to dev/build/debian/get-orig-source.sh
diff --git a/build/debian/install.forced.php.install b/dev/build/debian/install.forced.php.install
similarity index 97%
rename from build/debian/install.forced.php.install
rename to dev/build/debian/install.forced.php.install
index 801b1b372af..64b6f8cbb32 100644
--- a/build/debian/install.forced.php.install
+++ b/dev/build/debian/install.forced.php.install
@@ -27,7 +27,7 @@ $force_install_lockinstall='444';
$force_install_distrib='debian';
// Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are
+// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are
// - not removed from package (see rm in rules file),
// - declared into dependencies (see Depends in control file)
//$force_dolibarr_lib_TCPDF_PATH='';
diff --git a/build/debian/lighttpd/50-dolibarr.conf b/dev/build/debian/lighttpd/50-dolibarr.conf
similarity index 81%
rename from build/debian/lighttpd/50-dolibarr.conf
rename to dev/build/debian/lighttpd/50-dolibarr.conf
index e3d1bdfce7e..523bd0a62f8 100644
--- a/build/debian/lighttpd/50-dolibarr.conf
+++ b/dev/build/debian/lighttpd/50-dolibarr.conf
@@ -1,11 +1,11 @@
# Alias for dolibarr directory
-alias.url += (
+alias.url += (
"/dolibarr" => "/usr/share/dolibarr/htdocs",
)
# Disallow access to libraries
-#$HTTP["url"] =~ "^/dolibarr/libraries" {
-# url.access-deny = ( "" )
+#$HTTP["url"] =~ "^/dolibarr/libraries" {
+# url.access-deny = ( "" )
#}
# Limit access to setup script
diff --git a/build/debian/patches/series b/dev/build/debian/patches/series
similarity index 100%
rename from build/debian/patches/series
rename to dev/build/debian/patches/series
diff --git a/build/debian/patches/use-etc-dolibarr-conf.patch b/dev/build/debian/patches/use-etc-dolibarr-conf.patch
similarity index 99%
rename from build/debian/patches/use-etc-dolibarr-conf.patch
rename to dev/build/debian/patches/use-etc-dolibarr-conf.patch
index c5cede64470..8f14d52acb2 100644
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/dev/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -19,8 +19,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
-
-
+
+
// Include configuration
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -32,6 +32,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
-
+
$short_options = "c:h";
$long_options = array(
diff --git a/dev/build/debian/po/POTFILES.in b/dev/build/debian/po/POTFILES.in
new file mode 100644
index 00000000000..7075002fe62
--- /dev/null
+++ b/dev/build/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] dolibarr.templates
diff --git a/build/debian/po/fr.po b/dev/build/debian/po/fr.po
similarity index 100%
rename from build/debian/po/fr.po
rename to dev/build/debian/po/fr.po
diff --git a/build/debian/po/templates.pot b/dev/build/debian/po/templates.pot
similarity index 100%
rename from build/debian/po/templates.pot
rename to dev/build/debian/po/templates.pot
diff --git a/build/debian/rules b/dev/build/debian/rules
similarity index 93%
rename from build/debian/rules
rename to dev/build/debian/rules
index 5f8b14e49ea..f22c7f1d0a8 100755
--- a/build/debian/rules
+++ b/dev/build/debian/rules
@@ -66,7 +66,7 @@ override_dh_install:
rm -fr dev/xdebug
rm -f dev/dolibarr_changes.txt
rm -f dev/README
-
+
rm -f doc/images/dolibarr_screenshot2.png
rm -f doc/images/dolibarr_screenshot3.png
rm -f doc/images/dolibarr_screenshot4.png
@@ -81,17 +81,17 @@ override_dh_install:
rm -fr test
- rm -fr build/aps
- rm -fr build/dmg
- rm -fr build/doap
- rm -fr build/exe
- rm -fr build/launchpad
- rm -fr build/live
- rm -fr build/patch
- rm -fr build/perl
- rm -fr build/rpm
- rm -fr build/zip
-
+ rm -fr dev/build/aps
+ rm -fr dev/build/dmg
+ rm -fr dev/build/doap
+ rm -fr dev/build/exe
+ rm -fr dev/build/launchpad
+ rm -fr dev/build/live
+ rm -fr dev/build/patch
+ rm -fr dev/build/perl
+ rm -fr dev/build/rpm
+ rm -fr dev/build/zip
+
# clean from all PHP embedded libraries (we use package dependencies instead)
# rm -fr htdocs/includes/geoip
# rm -fr htdocs/includes/nusoap
@@ -128,4 +128,3 @@ override_dh_fixperms:
# Give rights to the webserver on the upload directory
chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
-
diff --git a/dev/build/debian/source/format b/dev/build/debian/source/format
new file mode 100644
index 00000000000..163aaf8d82b
--- /dev/null
+++ b/dev/build/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/build/debian/source/lintian-overrides b/dev/build/debian/source/lintian-overrides
similarity index 99%
rename from build/debian/source/lintian-overrides
rename to dev/build/debian/source/lintian-overrides
index e64eae84887..ed3a130fbc9 100644
--- a/build/debian/source/lintian-overrides
+++ b/dev/build/debian/source/lintian-overrides
@@ -14,4 +14,3 @@ source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/li
# Those are false positives, the files are their own sources since
# they are data files
source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
-
diff --git a/build/debian/source/options b/dev/build/debian/source/options
similarity index 100%
rename from build/debian/source/options
rename to dev/build/debian/source/options
diff --git a/build/debian/watch b/dev/build/debian/watch
similarity index 100%
rename from build/debian/watch
rename to dev/build/debian/watch
diff --git a/build/dmg/dolimamp/README b/dev/build/dmg/dolimamp/README
similarity index 85%
rename from build/dmg/dolimamp/README
rename to dev/build/dmg/dolimamp/README
index 56929860bde..0a57996fcef 100644
--- a/build/dmg/dolimamp/README
+++ b/dev/build/dmg/dolimamp/README
@@ -4,4 +4,4 @@ DOLIMAMP Package tools
##################################################
This directory contains files and docs used to build
-a DoliMamp package for Mac OS X.
\ No newline at end of file
+a DoliMamp package for Mac OS X.
diff --git a/build/dmg/dolimamp/install.forced.php b/dev/build/dmg/dolimamp/install.forced.php
similarity index 100%
rename from build/dmg/dolimamp/install.forced.php
rename to dev/build/dmg/dolimamp/install.forced.php
diff --git a/build/doap/README b/dev/build/doap/README
similarity index 100%
rename from build/doap/README
rename to dev/build/doap/README
diff --git a/build/docker-dev/.dockerignore b/dev/build/docker-dev/.dockerignore
similarity index 100%
rename from build/docker-dev/.dockerignore
rename to dev/build/docker-dev/.dockerignore
diff --git a/build/docker-dev/Dockerfile b/dev/build/docker-dev/Dockerfile
similarity index 100%
rename from build/docker-dev/Dockerfile
rename to dev/build/docker-dev/Dockerfile
diff --git a/build/docker-dev/README.md b/dev/build/docker-dev/README.md
similarity index 97%
rename from build/docker-dev/README.md
rename to dev/build/docker-dev/README.md
index 66358bf2bbe..bb5c82391f1 100644
--- a/build/docker-dev/README.md
+++ b/dev/build/docker-dev/README.md
@@ -10,7 +10,7 @@ Before build/run, define the variable HOST_USER_ID as following:
Go in repository build/docker :
- cd build/docker
+ cd dev/build/docker
And then, you can run :
diff --git a/build/docker-dev/docker-compose.yml b/dev/build/docker-dev/docker-compose.yml
similarity index 100%
rename from build/docker-dev/docker-compose.yml
rename to dev/build/docker-dev/docker-compose.yml
diff --git a/build/docker-dev/docker-run.sh b/dev/build/docker-dev/docker-run.sh
similarity index 100%
rename from build/docker-dev/docker-run.sh
rename to dev/build/docker-dev/docker-run.sh
diff --git a/build/docker-dev/mariadb/Dockerfile b/dev/build/docker-dev/mariadb/Dockerfile
similarity index 100%
rename from build/docker-dev/mariadb/Dockerfile
rename to dev/build/docker-dev/mariadb/Dockerfile
diff --git a/build/docker/.github/workflows/build.yml b/dev/build/docker/.github/workflows/build.yml
similarity index 100%
rename from build/docker/.github/workflows/build.yml
rename to dev/build/docker/.github/workflows/build.yml
diff --git a/build/docker/.github/workflows/test.yml b/dev/build/docker/.github/workflows/test.yml
similarity index 100%
rename from build/docker/.github/workflows/test.yml
rename to dev/build/docker/.github/workflows/test.yml
diff --git a/build/docker/.gitignore b/dev/build/docker/.gitignore
similarity index 100%
rename from build/docker/.gitignore
rename to dev/build/docker/.gitignore
diff --git a/build/docker/Dockerfile b/dev/build/docker/Dockerfile
similarity index 100%
rename from build/docker/Dockerfile
rename to dev/build/docker/Dockerfile
diff --git a/build/docker/README.md b/dev/build/docker/README.md
similarity index 100%
rename from build/docker/README.md
rename to dev/build/docker/README.md
diff --git a/build/docker/docker-compose.yml b/dev/build/docker/docker-compose.yml
similarity index 100%
rename from build/docker/docker-compose.yml
rename to dev/build/docker/docker-compose.yml
diff --git a/build/docker/docker-run.sh b/dev/build/docker/docker-run.sh
similarity index 100%
rename from build/docker/docker-run.sh
rename to dev/build/docker/docker-run.sh
diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/dev/build/doxygen/dolibarr-doxygen-build.pl
similarity index 85%
rename from build/doxygen/dolibarr-doxygen-build.pl
rename to dev/build/doxygen/dolibarr-doxygen-build.pl
index 32a852f22d8..08deb42d6cd 100755
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/dev/build/doxygen/dolibarr-doxygen-build.pl
@@ -19,7 +19,7 @@ my $dir = getcwd;
print "Current dir is: $dir\n";
#print "Running dir for doxygen must be: $DIR\n";
-if (! -s "build/doxygen/$CONFFILE")
+if (! -s "dev/build/doxygen/$CONFFILE")
{
print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
print "\n";
@@ -27,7 +27,7 @@ if (! -s "build/doxygen/$CONFFILE")
print '> perl .\dolibarr-doxygen-build.pl (on Windows)'."\n";
print '> perl ../dolibarr-doxygen-build.pl (on Linux or BSD)'."\n";
sleep 4;
- exit 1;
+ exit 1;
}
$SOURCE=".";
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;
print "Running doxygen for version ".$version.", please wait...\n";
-print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
print $result;
diff --git a/build/doxygen/dolibarr-doxygen-filter.pl b/dev/build/doxygen/dolibarr-doxygen-filter.pl
similarity index 100%
rename from build/doxygen/dolibarr-doxygen-filter.pl
rename to dev/build/doxygen/dolibarr-doxygen-filter.pl
diff --git a/build/doxygen/dolibarr-doxygen-getversion.pl b/dev/build/doxygen/dolibarr-doxygen-getversion.pl
similarity index 97%
rename from build/doxygen/dolibarr-doxygen-getversion.pl
rename to dev/build/doxygen/dolibarr-doxygen-getversion.pl
index 6d05037e7dd..31c52434d1f 100755
--- a/build/doxygen/dolibarr-doxygen-getversion.pl
+++ b/dev/build/doxygen/dolibarr-doxygen-getversion.pl
@@ -8,7 +8,7 @@
# Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot
$file=$ARGV[0];
-if (! $file)
+if (! $file)
{
print "Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot\n";
exit;
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/dev/build/doxygen/dolibarr-doxygen.doxyfile
similarity index 98%
rename from build/doxygen/dolibarr-doxygen.doxyfile
rename to dev/build/doxygen/dolibarr-doxygen.doxyfile
index d6fc7b1ef9e..fb9a116409c 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/dev/build/doxygen/dolibarr-doxygen.doxyfile
@@ -89,7 +89,7 @@ REPEAT_BRIEF = YES
# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
# Doxygen will generate a detailed section even if there is only a brief
@@ -126,7 +126,7 @@ STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/"
# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
# (but less readable) file names. This can be useful is your file systems
@@ -182,7 +182,7 @@ TAB_SIZE = 2
# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
@@ -469,7 +469,7 @@ GENERATE_DEPRECATEDLIST = YES
# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
# the initial value of a variable or define consists of for it to appear in
@@ -515,7 +515,7 @@ SHOW_NAMESPACES = NO
# is used as the file version. See the manual for examples.
#FILE_VERSION_FILTER = dolibarr-doxygen-getversion.pl
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
# by doxygen. The layout file controls the global structure of the generated
@@ -524,7 +524,7 @@ FILE_VERSION_FILTER =
# You can optionally specify a file name after the option, if omitted
# DoxygenLayout.xml will be used as the name of the layout file.
-LAYOUT_FILE =
+LAYOUT_FILE =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -575,7 +575,7 @@ WARN_FORMAT = "$file:$line: $text"
# and error messages should be written. If left blank the output is written
# to stderr.
-WARN_LOGFILE = build/html/doxygen_warnings.log
+WARN_LOGFILE = dev/build/html/doxygen_warnings.log
#---------------------------------------------------------------------------
# configuration options related to the input files
@@ -638,13 +638,13 @@ EXCLUDE_PATTERNS = */CVS/*
# wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test
-EXCLUDE_SYMBOLS =
+EXCLUDE_SYMBOLS =
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
# the \include command).
-#EXAMPLE_PATH = htdocs/modulebuilder/template
+#EXAMPLE_PATH = htdocs/modulebuilder/template
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -678,7 +678,7 @@ IMAGE_PATH = doc/images
# Works on Linux only
#INPUT_FILTER = ../dolibarr-doxygen-filter.pl
#INPUT_FILTER = "perl ../dolibarr-doxygen-filter.pl"
-INPUT_FILTER =
+INPUT_FILTER =
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
# basis.
@@ -689,7 +689,7 @@ INPUT_FILTER =
# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
# INPUT_FILTER) will be used to filter the input files when producing source
@@ -774,7 +774,7 @@ ALPHABETICAL_INDEX = YES
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
@@ -804,14 +804,14 @@ HTML_FILE_EXTENSION = .html
# standard header.
# Does not work with 1.7.3
-#HTML_HEADER = build/doxygen/doxygen_header.html
+#HTML_HEADER = dev/build/doxygen/doxygen_header.html
# The HTML_FOOTER tag can be used to specify a personal HTML footer for
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
# Does not work with 1.7.3
-HTML_FOOTER = build/doxygen/doxygen_footer.html
+HTML_FOOTER = dev/build/doxygen/doxygen_footer.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
@@ -820,7 +820,7 @@ HTML_FOOTER = build/doxygen/doxygen_footer.html
# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
+HTML_STYLESHEET =
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
# Doxygen will adjust the colors in the stylesheet and background images
@@ -927,14 +927,14 @@ GENERATE_HTMLHELP = NO
# can add a path in front of the file if the result should not be
# written to the html output directory.
-CHM_FILE =
+CHM_FILE =
# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
# be used to specify the location (absolute path including file name) of
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
-HHC_LOCATION =
+HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
@@ -946,7 +946,7 @@ GENERATE_CHI = NO
# is used to encode HtmlHelp index (hhk), content (hhc) and project file
# content.
-CHM_INDEX_ENCODING =
+CHM_INDEX_ENCODING =
# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
# controls whether a binary table of contents is generated (YES) or a
@@ -970,7 +970,7 @@ GENERATE_QHP = NO
# be used to specify the file name of the resulting .qch file.
# The path specified is relative to the HTML output folder.
-QCH_FILE =
+QCH_FILE =
# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
@@ -988,14 +988,14 @@ QHP_VIRTUAL_FOLDER = doc
# add. For more information please see
# http://doc.trolltech.com/qthelpproject.html#custom-filters
-QHP_CUST_FILTER_NAME =
+QHP_CUST_FILTER_NAME =
# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
# custom filter to add. For more information please see
#
# Qt Help Project / Custom Filters.
-QHP_CUST_FILTER_ATTRS =
+QHP_CUST_FILTER_ATTRS =
# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
# project's
@@ -1003,14 +1003,14 @@ QHP_CUST_FILTER_ATTRS =
#
# Qt Help Project / Filter Attributes.
-QHP_SECT_FILTER_ATTRS =
+QHP_SECT_FILTER_ATTRS =
# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
# be used to specify the location of Qt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
# .qhp file.
-QHG_LOCATION =
+QHG_LOCATION =
# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
# will be generated, which together with the HTML files, form an Eclipse help
@@ -1146,14 +1146,14 @@ PAPER_TYPE = a4
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-EXTRA_PACKAGES =
+EXTRA_PACKAGES =
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
# the generated latex document. The header should contain everything until
# the first chapter. If it is left blank doxygen will generate a
# standard header. Notice: only use this tag if you know what you are doing!
-LATEX_HEADER =
+LATEX_HEADER =
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
@@ -1223,12 +1223,12 @@ RTF_HYPERLINKS = NO
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
-RTF_STYLESHEET_FILE =
+RTF_STYLESHEET_FILE =
# Set optional variables used in the generation of an rtf document.
# Syntax is similar to doxygen's config file.
-RTF_EXTENSIONS_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
@@ -1278,13 +1278,13 @@ XML_OUTPUT = xml
# which can be used by a validating XML parser to check the
# syntax of the XML files.
-#XML_SCHEMA =
+#XML_SCHEMA =
# The XML_DTD tag can be used to specify an XML DTD,
# which can be used by a validating XML parser to check the
# syntax of the XML files.
-#XML_DTD =
+#XML_DTD =
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
# dump the program listings (including syntax highlighting
@@ -1338,7 +1338,7 @@ PERLMOD_PRETTY = YES
# This is useful so different doxyrules.make files included by the same
# Makefile don't overwrite each other's variables.
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
@@ -1372,14 +1372,14 @@ SEARCH_INCLUDES = YES
# contain include files that are not input files but should be processed by
# the preprocessor.
-INCLUDE_PATH =
+INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the
# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
-INCLUDE_FILE_PATTERNS =
+INCLUDE_FILE_PATTERNS =
# The PREDEFINED tag can be used to specify one or more macro names that
# are defined before the preprocessor is started (similar to the -D option of
@@ -1389,14 +1389,14 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED =
+PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
-EXPAND_AS_DEFINED =
+EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone
@@ -1427,12 +1427,12 @@ SKIP_FUNCTION_MACROS = YES
# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
-TAGFILES =
+TAGFILES =
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
+GENERATE_TAGFILE =
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
# in the class index. If set to NO only the inherited external classes
@@ -1471,7 +1471,7 @@ CLASS_DIAGRAMS = NO
# the mscgen tool resides. If left empty the tool is assumed to be found in the
# default search path.
-#MSCGEN_PATH =
+#MSCGEN_PATH =
# If set to YES, the inheritance and collaboration graphs will hide
# inheritance and usage relations if the target is undocumented
@@ -1515,7 +1515,7 @@ DOT_FONTSIZE = 10
# different font using DOT_FONTNAME you can set the path where dot
# can find it using this tag.
-DOT_FONTPATH =
+DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
@@ -1598,13 +1598,13 @@ DOT_IMAGE_FORMAT = png
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
+DOT_PATH =
# The DOTFILE_DIRS tag can be used to specify one or more directories that
# contain dot files that are included in the documentation (see the
# \dotfile command).
-DOTFILE_DIRS =
+DOTFILE_DIRS =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
@@ -1655,4 +1655,4 @@ DOT_CLEANUP = YES
FULL_SIDEBAR = NO
-HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
+HTML_EXTRA_STYLESHEET = dev/build/doxygen/doxygen-awesome.css
diff --git a/build/doxygen/doxygen-awesome.css b/dev/build/doxygen/doxygen-awesome.css
similarity index 99%
rename from build/doxygen/doxygen-awesome.css
rename to dev/build/doxygen/doxygen-awesome.css
index 21150c99adc..65fdbb400f2 100644
--- a/build/doxygen/doxygen-awesome.css
+++ b/dev/build/doxygen/doxygen-awesome.css
@@ -204,7 +204,7 @@ html {
--code-background: #2a2c2f;
--tablehead-background: #2a2c2f;
-
+
--blockquote-background: #222325;
--blockquote-foreground: #7e8c92;
@@ -884,7 +884,7 @@ div.header {
flex-wrap: nowrap;
align-items: flex-start;
}
-
+
div.contents .textblock {
min-width: 200px;
flex-grow: 1;
@@ -973,21 +973,21 @@ html.dark-mode div.contents table iframe {
h2.groupheader {
border-bottom: 0px;
color: var(--page-foreground-color);
- box-shadow:
- 100px 0 var(--page-background-color),
+ box-shadow:
+ 100px 0 var(--page-background-color),
-100px 0 var(--page-background-color),
100px 0.75px var(--separator-color),
-100px 0.75px var(--separator-color),
- 500px 0 var(--page-background-color),
+ 500px 0 var(--page-background-color),
-500px 0 var(--page-background-color),
500px 0.75px var(--separator-color),
-500px 0.75px var(--separator-color),
- 900px 0 var(--page-background-color),
+ 900px 0 var(--page-background-color),
-900px 0 var(--page-background-color),
900px 0.75px var(--separator-color),
-900px 0.75px var(--separator-color),
1400px 0 var(--page-background-color),
- -1400px 0 var(--page-background-color),
+ -1400px 0 var(--page-background-color),
1400px 0.75px var(--separator-color),
-1400px 0.75px var(--separator-color),
1900px 0 var(--page-background-color),
@@ -1143,8 +1143,8 @@ div.toc li a.aboveActive {
div.contents .toc.interactive > h3::before {
content: "";
- width: 0;
- height: 0;
+ width: 0;
+ height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 5px solid var(--primary-color);
@@ -1822,8 +1822,8 @@ table.memberdecls img[src="closed.png"],
table.memberdecls img[src="open.png"],
div.dynheader img[src="open.png"],
div.dynheader img[src="closed.png"] {
- width: 0;
- height: 0;
+ width: 0;
+ height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 5px solid var(--primary-color);
@@ -1841,7 +1841,7 @@ table.memberdecls img {
table.memberdecls img[src="closed.png"],
div.dynheader img[src="closed.png"] {
transform: rotate(-90deg);
-
+
}
.compoundTemplParams {
@@ -1884,7 +1884,7 @@ div.dynheader img[src="closed.png"] {
margin-bottom: calc(0px - var(--page-font-size));
}
- table.memberdecls .memItemRight,
+ table.memberdecls .memItemRight,
table.memberdecls .mdescRight,
table.memberdecls .memTemplItemRight {
border-top: 0;
@@ -2070,8 +2070,8 @@ html.dark-mode .iconfopen, html.dark-mode .iconfclosed {
background-color: transparent;
}
-/*
- Class Index Doxygen 1.8
+/*
+ Class Index Doxygen 1.8
*/
table.classindex {
@@ -2212,7 +2212,7 @@ div.contents .toc::-webkit-scrollbar-thumb {
background-color: transparent;
border: var(--webkit-scrollbar-padding) solid transparent;
border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
- background-clip: padding-box;
+ background-clip: padding-box;
}
#nav-tree:hover::-webkit-scrollbar-thumb,
@@ -2406,8 +2406,8 @@ h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a.
#MSearchBox .left {
- background: none !important;
+ background: none !important;
}
#MSearchBox .right {
- background: none !important;
+ background: none !important;
}
diff --git a/build/doxygen/doxygen_footer.html b/dev/build/doxygen/doxygen_footer.html
similarity index 97%
rename from build/doxygen/doxygen_footer.html
rename to dev/build/doxygen/doxygen_footer.html
index 2615af0b485..1a43e7e9dc0 100644
--- a/build/doxygen/doxygen_footer.html
+++ b/dev/build/doxygen/doxygen_footer.html
@@ -1,4 +1,4 @@
-
@@ -23,4 +23,4 @@ File added into doxygen generated documentation