From: Kilian Date: Mon, 2 Jan 2023 09:38:26 +0000 (+0100) Subject: v20230102 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=39b8f43decc8f42a182d1f96db30ba0b664e2709;p=dolibarr.git v20230102 --- diff --git a/.codeclimate.yml b/.codeclimate.yml deleted file mode 100644 index a84e6c1f..00000000 --- a/.codeclimate.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Save as .codeclimate.yml (note leading .) in project root directory -languages: - Ruby: false - JavaScript: true - PHP: true -engines: - phpcodesniffer: true -exclude_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' \ No newline at end of file diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 7df89a90..00000000 --- a/.editorconfig +++ /dev/null @@ -1,24 +0,0 @@ -# EditorConfig is awesome: https://editorconfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -end_of_line = lf -insert_final_newline = true - -[*.php] -indent_style = tab -indent_size = 4 -trim_trailing_whitespace = true -insert_final_newline = true -[*.js] -indent_style = tab -[*.css] -indent_style = tab -[*.xml] -indent_style = tab -[*.md] -trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index b023d9bf..7864a051 100644 --- a/.gitignore +++ b/.gitignore @@ -56,4 +56,4 @@ doc/install.lock htdocs/compta/facture/odf.log htdocs/compta/facture/odt.log htdocs/includes/odtphp/odf.new.php - +bin/pgsql/ diff --git a/.gitmessage b/.gitmessage deleted file mode 100644 index a5a71898..00000000 --- a/.gitmessage +++ /dev/null @@ -1,7 +0,0 @@ - -# ^=[ Subject: One line short summary ]=========^| -# ~ Subject template: [KEYWORD] [ISSUENUM] DESC ~| - -# ^=[ Blank: Follow the Subject with a blank line, do NOT remove ]====^| - -# ^=[ Details: Describe what changed and explain why it changed ]=====^| diff --git a/.mailmap b/.mailmap deleted file mode 100644 index ae4b0eb7..00000000 --- a/.mailmap +++ /dev/null @@ -1,91 +0,0 @@ -# This is mapping list between real user name/email and entry into sources files -# If you don't want to have your real email appears here, just send a Pull Request to -# replace the second field between <> with -Laurent Destailleur Laurent Destailleur -Laurent Destailleur eldy -Laurent Destailleur Laurent Destailleur -Laurent Destailleur eldy10 -Laurent Destailleur Laurent Destailleur -Regis Houssin Regis Houssin -Regis Houssin Régis Houssin -Juanjo Menent simnandez -Juanjo Menent Juanjo Menent -Juanjo Menent Simnandez -Juanjo Menent juanjo -Juanjo Menent juanjo -Marcos García de La Fuente Marcos García -Marcos García de La Fuente Marcos García -Florian Henry fhenry -Florian Henry Florian HENRY -Florian Henry FHenry -Florian Henry Florian HENRY -Florian Henry FHenry -Florian Henry HENRY Florian -Alexandre Spangaro aspangaro -Alexandre Spangaro Spangaro Alexandre -Alexandre Spangaro Alexandre SPANGARO -Raphaël Doursenaud Raphaël Doursenaud -Philippe Grand Grand Philippe -Philippe Grand Philippe GRAND -Philippe Grand philippe grand -Philippe Grand philippe -Philippe Grand unknown -Philippe Grand philippe -Philippe Grand Philippe Grand -Jean-François Ferry jfefe -Jean-François Ferry jfefe -Jean-François Ferry JF FERRY -Jean-François Ferry JF FERRY -Charles Benke BENKE Charles -Charles Benke BENKE Charlie -Charles Benke defrance69 -Maxime Kohlhaas MAxime Kohlhaas -Frédéric France Frédéric FRANCE -Frédéric France frederic34 -Frédéric France FRANCE Frédéric -Frédéric France frederic34 -Cyrille de Lambert cdelambert -Cédric Gross KreizIT -Cédric Gross Cedric -Cédric Gross Cedric GROSS -Jean Heimburger jean -Jean Heimburger tiaris -Benoit Mortier opensides -Eric Seigne erics -Jean-Louis Bergamo jlb -Remco Gerbrands r2gnl -Phf phf -Yannick Warnier ywarnier -Jerome Warnier jwarnier -Franky Van Liedekerke liedekef -Lalaina Rasamoelina lalaina rasamoelina -Marc Ocebo marc_ocebo -Unknown box7890 -Unknown beedauchon -Loic loic -Christophe Combelle -Unknown activdev -Unknown bouba -Unknown bcroq -Unknown dutoit -Unknown bureau2crea -Unknown unknown -Simon Tosser simontosser -Unknown tipaul -Raphaël Bertrand raphael_bertrand -Claudio Aschieri cla -Tommaso Basilici kaos -Tommaso Basilici Tommaso Basilici -Faust faust -Ferran Marcet fmarcet -Geoffrey Girard geoffrey.girard -Bernard Paquier BadPixxel -Patrick Delcroix delcroix Patrick -Damien Clochard damien clochard -Damien Clochard damien clochard -Grégory David Grégory DAVID -Grégory David Gregory DAVID -Baffir Abbes bafbes -Kevin Guerrier GUERRIER Kevin -Remy Younes remy -Estephe Loridan Estephe L. diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 67b4b346..00000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,222 +0,0 @@ -# .scrutinizer.yml -#build: -# - php-scrutinizer-run -build: - nodes: - analysis: - tests: - override: - - php-scrutinizer-run - -imports: - - javascript - - php - -filter: - excluded_paths: - - build/* - - dev/* - - doc/* - - documents/* - - node_modules/* - - test/* - dependency_paths: - - htdocs/includes/* - paths: - - htdocs/* - - scripts/* - -tools: - # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/ - php_analyzer: - enabled: true - extensions: - - php - dependency_paths: - - htdocs/includes/ - filter: - excluded_paths: - - build/* - - dev/* - - doc/* - - test/* - - htdocs/includes/* - - htdocs/core/class/lessc.class.php - paths: - - htdocs/ - - scripts/ - config: - parameter_reference_check: - enabled: true - checkstyle: - enabled: false - no_trailing_whitespace: true - naming: - enabled: true - local_variable: ^[a-z][a-zA-Z0-9]*$ - abstract_class_name: ^Abstract|Factory$ - utility_class_name: Utils?$ - constant_name: ^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$ - property_name: ^[a-z][a-zA-Z0-9]*$ - method_name: ^(?:[a-z]|__)[a-zA-Z0-9]*$ - parameter_name: ^[a-z][a-zA-Z0-9]*$ - interface_name: ^[A-Z][a-zA-Z0-9]*Interface$ - type_name: ^[A-Z][a-zA-Z0-9]*$ - exception_name: ^[A-Z][a-zA-Z0-9]*Exception$ - isser_method_name: ^(?:is|has|should|may|supports) - unreachable_code: - enabled: true - check_access_control: - enabled: true - typo_checks: - enabled: true - check_variables: - enabled: true - check_calls: - enabled: true - too_many_arguments: true - missing_argument: true - argument_type_checks: lenient # Allowed Values: "disabled", "lenient", "strict" - suspicious_code: - enabled: true - overriding_parameter: false - overriding_closure_use: true - parameter_closure_use_conflict: true - parameter_multiple_times: true - non_existent_class_in_instanceof_check: true - non_existent_class_in_catch_clause: true - assignment_of_null_return: true - non_commented_switch_fallthrough: true - non_commented_empty_catch_block: true - overriding_private_members: true - use_statement_alias_conflict: true - precedence_in_condition_assignment: true - dead_assignments: - enabled: true - verify_php_doc_comments: - enabled: false - parameters: true - return: true - suggest_more_specific_types: true - ask_for_return_if_not_inferrable: true - ask_for_param_type_annotation: true - loops_must_use_braces: - enabled: true - check_usage_context: - enabled: true - simplify_boolean_return: - enabled: false - phpunit_checks: - enabled: false - reflection_checks: - enabled: true - - # Checks Common Precedence Mistakes - precedence_checks: - enabled: true - assignment_in_condition: true - comparison_of_bit_result: true - basic_semantic_checks: - enabled: true - # Disabled unused code. In most cases, we want to keep it. - unused_code: - enabled: false - deprecation_checks: - enabled: true - useless_function_calls: - enabled: true - metrics_lack_of_cohesion_methods: - enabled: true - metrics_coupling: - enabled: true - stable_code: - namespace_prefixes: [] - classes: [] - doctrine_parameter_binding: - enabled: false - doctrine_entity_manager_injection: - enabled: false - symfony_request_injection: - enabled: false - doc_comment_fixes: - enabled: true - reflection_fixes: - enabled: false - use_statement_fixes: - enabled: true - remove_unused: true - # Whether you would like multiple imports in one USE statement to be preserved, e.g. ``use A, B;``. - preserve_multiple: false - # Whether you would like to preserve blank lines between use statements. - preserve_blanklines: false - order_alphabetically: false - # To use specific config for a specific path, use path_configs: (see example on page https://scrutinizer-ci.com/docs/configuration/tool_config_structure) - - # php_depend - php_pdepend: - enabled: false - configuration_file: null - suffixes: - - php - excluded_dirs: { } - filter: - excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } - - # change tracking - php_changetracking: - enabled: false - bug_patterns: - - '\bfix(?:es|ed)?\b' - feature_patterns: - - '\badd(?:s|ed)?\b' - - '\bimplement(?:s|ed)?\b' - filter: - excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } - - # Similar code detection - php_sim: - enabled: false - min_mass: 30 - filter: - excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } - - # Coding-Style / Bug Detection - js_hint: - enabled: false - use_native_config: true - extensions: - - js - filter: - excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } - config: { } - path_configs: { } - - -before_commands: { } -after_commands: { } -artifacts: { } -build_failure_conditions: { } diff --git a/.stickler.yml b/.stickler.yml deleted file mode 100644 index 642dec27..00000000 --- a/.stickler.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -linters: - phpcs: - standard: 'dev/setup/codesniffer/ruleset.xml' - extensions: 'php' - tab_width: 4 - fixer: true - -fixers: - enable: true - -files: - ignore: - - 'htdocs/includes/*' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a260c31e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,498 +0,0 @@ -# This script is used by Travis CI to run automatically Continuous test integration -# from Dolibarr GitHub repository. -# For syntax, see https://docs.travis-ci.com/user/languages/php/ - -# We use dist: xenial to have php 5.6+ available -os: linux -dist: xenial -#dist: bionic - -language: php - -git: - depth: 1 - -# Start on every boot -services: -- memcached -- mysql -- postgresql - -addons: - # Force postgresql to 9.4 (the oldest availablable on xenial) - postgresql: '9.4' - apt: - sources: - # To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/ - - pgdg-xenial - packages: - # We need a webserver to test the webservices - # Let's install Apache with. - - apache2 - # mod_php is not supported by Travis. Add fcgi. We install FPM later on. - - libapache2-mod-fastcgi - # We need pgloader for import mysql database into pgsql - - pgloader - -env: - global: - # Set to true for very verbose output - - DEBUG=false - -jobs: - fast_finish: true - #allow_failures: - #- php: nightly - include: - - stage: PHP 5.6-7.4 - if: type = push - php: '5.6' - env: DB=postgresql - - stage: PHP 5.6-7.4 - if: type = pull_request OR type = push - php: '7.4.22' - env: DB=mysql - - stage: PHP Dev - if: type = push AND branch = develop - php: nightly - env: DB=mysql - - stage: PHP Dev - if: type = push AND branch = 15.0 - php: nightly - env: DB=mysql - -notifications: - email: - on_success: never # [always|never|change] default: change - on_failure: never # [always|never|change] default: always - irc: - channels: - - "chat.freenode.net#dolibarr" - on_success: change - on_failure: always - use_notice: true - -before_install: -- | - echo "Disabling Xdebug for composer" - export PHP_VERSION_NAME=$(phpenv version-name) - cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini - phpenv config-rm xdebug.ini - echo - -install: -- | - echo "Updating Composer" - rm $TRAVIS_BUILD_DIR/composer.json - rm $TRAVIS_BUILD_DIR/composer.lock - composer -V - composer self-update - composer -n init - composer -n config vendor-dir htdocs/includes - composer -n config -g vendor-dir htdocs/includes - echo - -- | - echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION" - if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then - composer -n require phpunit/phpunit ^5 \ - php-parallel-lint/php-parallel-lint ^1 \ - php-parallel-lint/php-console-highlighter ^0 \ - php-parallel-lint/php-var-dump-check ~0.4 \ - squizlabs/php_codesniffer ^3 - fi - if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then - composer -n require phpunit/phpunit ^6 \ - php-parallel-lint/php-parallel-lint ^1 \ - php-parallel-lint/php-console-highlighter ^0 \ - php-parallel-lint/php-var-dump-check ~0.4 \ - squizlabs/php_codesniffer ^3 - fi - if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ]; then - composer -n require phpunit/phpunit ^7 \ - php-parallel-lint/php-parallel-lint ^1.2 \ - php-parallel-lint/php-console-highlighter ^0 \ - php-parallel-lint/php-var-dump-check ~0.4 \ - squizlabs/php_codesniffer ^3 - fi - # phpunit 9 is required for php 8 - if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then - composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \ - php-parallel-lint/php-parallel-lint ^1.2 \ - php-parallel-lint/php-console-highlighter ^0 \ - php-parallel-lint/php-var-dump-check ~0.4 \ - squizlabs/php_codesniffer ^3 - fi - echo - -- | - echo "Adding path of binaries tools installed by composer to the PATH" - export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH" - echo $PATH - ls $TRAVIS_BUILD_DIR/vendor - ls $TRAVIS_BUILD_DIR/htdocs/includes/bin - echo - - - -before_script: - - | - echo Start travis - echo Current dir is `pwd` - echo Home dir is `echo ~` - echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR - - - | - echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit" - phpenv config-add /tmp/xdebug.ini - echo - - - | - echo "Setting up PHP" - echo - echo "Set timezone" - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini - phpenv rehash - echo - - - | - echo "Versions information" - echo - # Check PHP - echo "PHP version" - php -i | head - - # Check Parallel-lint version - echo "Parallel-lint version" - which parallel-lint - parallel-lint -V - # Check PHP CodeSniffer version - echo "PHPCS version" - which phpcs - phpcs --version | head - - phpcs -i | head - - # Check PHP Vardump check version - echo "PHP Vardump check version" - which var_dump_check - var_dump_check --version - # Check PHPUnit version - echo "PHPUnit version" - which phpunit - phpunit --version | head - - # Check Apache version - echo "Apache version" - apache2 -v | head - - # Check Database - echo "Database version" - mysql --version | head - - mysql -e "SELECT VERSION();" | head - - psql --version - if [ "$DB" = 'postgresql' ]; then - echo "Check pgloader version" - pgloader --version - fi - echo - - - | - echo "Setting up database" - if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then - echo "MySQL" - mysql -u root -e 'DROP DATABASE IF EXISTS travis;' - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS travis;' - mysql -u root -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' - mysql -u root -e 'FLUSH PRIVILEGES;' - mysql -u root -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - fi - if [ "$DB" = 'postgresql' ]; then - #psql -c 'create database travis;' -U postgres - #psql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - #pgloader mysql://root:pass@127.0.0.1/dolibarr_src postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dest - echo pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis - pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis - echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql -U postgres travis - echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql -U postgres travis - fi - echo - - - | - export CONF_FILE=htdocs/conf/conf.php - echo "Setting up Dolibarr $CONF_FILE" - echo ' $CONF_FILE - echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE - echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE - echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE - echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE - if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then - echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE - fi - if [ "$DB" = 'postgresql' ]; then - echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE - fi - echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE - cat $CONF_FILE - echo - - - | - echo "Create documents directory and set permissions" - # and admin/temp subdirectory needed for unit tests - mkdir -p $TRAVIS_BUILD_DIR/documents/admin/temp - sudo chmod -R a+rwx $TRAVIS_BUILD_DIR/documents - echo "***** First line of dolibarr.log" > $TRAVIS_BUILD_DIR/documents/dolibarr.log - echo - - - - echo "Setting up Apache + FPM" - # enable php-fpm - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - - | - if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then - # Copy the included pool - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf - fi - - sudo a2enmod rewrite actions fastcgi alias - - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars - - sudo chown -R travis:travis /var/lib/apache2/fastcgi - - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm - # configure apache virtual hosts - - sudo cp -f 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 - - - -script: -- | - echo "Checking webserver availability by a wget -O - http://127.0.0.1" - # Ensure we stop on error with set -e - set +e - # The wget should return a page with line ' - wget -O - http://127.0.0.1 > test.html - head test.html - sudo cat /var/log/apache2/travis_error_log - set +e - echo - -- | - echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)" - # Ensure we catch errors - set -e - #parallel-lint --exclude htdocs/includes --blame . - # Exclusions are defined in the ruleset.xml file - if [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then - parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \ - --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \ - --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \ - --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \ - --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame . - fi - set +e - echo - -- | - echo "Checking coding style (only for Pull Requests builds and 1 version to not overload travis and avoid duplicate tests)" - # Ensure we catch errors - set -e - # Exclusions are defined in the ruleset.xml file - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then - 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 .; - fi - set +e - echo - -- | - echo "Checking missing debug" - # Ensure we catch errors - set -e - # Exclusions are defined in the ruleset.xml file - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then - var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php . - fi - set +e - echo - -- | - export INSTALL_FORCED_FILE=htdocs/install/install.forced.php - echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation" - # Ensure we catch errors - set +e - echo ' $INSTALL_FORCED_FILE - echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE - if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then - echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE - fi - if [ "$DB" = 'postgresql' ]; then - echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE - fi - echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE - echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE - echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE - echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE - echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE - #cat $INSTALL_FORCED_FILE - -#- | -# echo "Installing Dolibarr" -# cd htdocs/install -# php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log -# php step2.php set >> $TRAVIS_BUILD_DIR/install.log -# if [ "$?" -ne "0" ]; then -# echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS" -# cat $TRAVIS_BUILD_DIR/install.log -# exit 1 -# fi -# cd ../.. -# rm $INSTALL_FORCED_FILE -# #cat $TRAVIS_BUILD_DIR/install.log -# set +e -# echo - -- | - echo "Setting up database to test migrations" - if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then - echo "MySQL" - mysql -e 'DROP DATABASE IF EXISTS travis;' - mysql -e 'CREATE DATABASE IF NOT EXISTS travis;' - mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' - mysql -e 'FLUSH PRIVILEGES;' - mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - fi - if [ "$DB" = 'postgresql' ]; then - #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr - echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis - pgloader mysql://root@127.0.0.1/travis postgresql:///travis - echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis - echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis - #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis - #echo 'select * from information_schema.table_constraints;' | psql travis - #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis - fi - echo - -- | - echo "Upgrading Dolibarr" - # Ensure we catch errors. Set this to +e if you want to go to the end to see log files. - set +e - cd htdocs/install - php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log - php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log - php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log - php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log - php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log - php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log - php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log - php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log - php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log - php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log - php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log - php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log - php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log - php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log - php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log - php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log - php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log - php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log - php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log - php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log - php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log - php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log - php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log - php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log - php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log - php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log - php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log - php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log - php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log - php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log - php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log - php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log - php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log - php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log - php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log - php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log - php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log - php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log - php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log - php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log - php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log - php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log - php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log - php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log - php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log - php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log - php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log - php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log - php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log - php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log - php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log - ls -alrt $TRAVIS_BUILD_DIR/ - -- | - echo "Enabling new modules" - # Enable modules not enabled into original dump - set -e - php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE,MAIN_MODULE_EXPENSEREPORT > $TRAVIS_BUILD_DIR/enablemodule.log - php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log - php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log - php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KNOWLEDGEMANAGEMENT,MAIN_MODULE_EVENTORGANIZATION,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log - echo $? - cd - - set +e - echo - #cat /tmp/dolibarr_install.log - cat $TRAVIS_BUILD_DIR/enablemodule.log - -- | - echo "Unit testing" - # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file. - set -e - phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php - phpunitresult=$? - echo "Phpunit return code = $phpunitresult" - set +e - -after_script: -- | - echo "After script - Output last lines of dolibarr.log" - ls $TRAVIS_BUILD_DIR/documents - #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log - sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log - -after_success: -- | - echo Success - -after_failure: -- | - echo Failure detected, so we show samples of log to help diagnose - # This part of code is executed only if previous command that fails are enclosed with set +e - # Upgrade log files - for ficlog in `ls $TRAVIS_BUILD_DIR/*.log` - do - echo "Debugging informations for file $ficlog" - #cat $ficlog - done - # Apache log file - echo "Debugging informations for file apache error.log" - sudo cat /var/log/apache2/travis_error_log - if [ "$DEBUG" = true ]; then - # Dolibarr log file - echo "Debugging informations for file dolibarr.log (latest 50 lines)" - tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log - # Database log file - echo "Debugging informations for file mysql error.log" - sudo tail -n 50 /var/log/mysql/error.log - # TODO: PostgreSQL log file - echo - fi diff --git a/doctemplates/contracts/template_contract.odt b/doctemplates/contracts/template_contract.odt new file mode 100644 index 00000000..8ece83c9 Binary files /dev/null and b/doctemplates/contracts/template_contract.odt differ diff --git a/doctemplates/invoices/PointCOMM.odt b/doctemplates/invoices/PointCOMM.odt new file mode 100644 index 00000000..89bbe51d Binary files /dev/null and b/doctemplates/invoices/PointCOMM.odt differ diff --git a/doctemplates/invoices/Rechnung_DKS.odt b/doctemplates/invoices/Rechnung_DKS.odt new file mode 100644 index 00000000..d05c0f59 Binary files /dev/null and b/doctemplates/invoices/Rechnung_DKS.odt differ diff --git a/doctemplates/invoices/facture_DKS.odt b/doctemplates/invoices/facture_DKS.odt new file mode 100644 index 00000000..a0d37db3 Binary files /dev/null and b/doctemplates/invoices/facture_DKS.odt differ diff --git a/doctemplates/invoices/template_invoice.odt b/doctemplates/invoices/template_invoice.odt new file mode 100644 index 00000000..925d9f08 Binary files /dev/null and b/doctemplates/invoices/template_invoice.odt differ diff --git a/doctemplates/orders/template_order.odt b/doctemplates/orders/template_order.odt new file mode 100644 index 00000000..b9f51623 Binary files /dev/null and b/doctemplates/orders/template_order.odt differ diff --git a/doctemplates/products/template_product.odt b/doctemplates/products/template_product.odt new file mode 100644 index 00000000..c73fa69d Binary files /dev/null and b/doctemplates/products/template_product.odt differ diff --git a/doctemplates/projects/template_project.odt b/doctemplates/projects/template_project.odt new file mode 100644 index 00000000..b6fd0349 Binary files /dev/null and b/doctemplates/projects/template_project.odt differ diff --git a/doctemplates/proposals/devis_DKS.odt b/doctemplates/proposals/devis_DKS.odt new file mode 100644 index 00000000..63edb4ff Binary files /dev/null and b/doctemplates/proposals/devis_DKS.odt differ diff --git a/doctemplates/shipments/template_shipment.odt b/doctemplates/shipments/template_shipment.odt new file mode 100644 index 00000000..100afe5d Binary files /dev/null and b/doctemplates/shipments/template_shipment.odt differ diff --git a/doctemplates/supplier_orders/template_supplier_order.odt b/doctemplates/supplier_orders/template_supplier_order.odt new file mode 100644 index 00000000..b9f51623 Binary files /dev/null and b/doctemplates/supplier_orders/template_supplier_order.odt differ diff --git a/doctemplates/supplier_proposals/template_supplier_proposal.odt b/doctemplates/supplier_proposals/template_supplier_proposal.odt new file mode 100644 index 00000000..8ece83c9 Binary files /dev/null and b/doctemplates/supplier_proposals/template_supplier_proposal.odt differ diff --git a/doctemplates/tasks/template_task_summary.odt b/doctemplates/tasks/template_task_summary.odt new file mode 100644 index 00000000..76984ebc Binary files /dev/null and b/doctemplates/tasks/template_task_summary.odt differ diff --git a/doctemplates/thirdparties/template_thirdparty.odt b/doctemplates/thirdparties/template_thirdparty.odt new file mode 100644 index 00000000..bfc4fa82 Binary files /dev/null and b/doctemplates/thirdparties/template_thirdparty.odt differ diff --git a/doctemplates/usergroups/template_usergroups.odt b/doctemplates/usergroups/template_usergroups.odt new file mode 100644 index 00000000..7a02ea05 Binary files /dev/null and b/doctemplates/usergroups/template_usergroups.odt differ diff --git a/doctemplates/users/template_user.odt b/doctemplates/users/template_user.odt new file mode 100644 index 00000000..f1f1fcc2 Binary files /dev/null and b/doctemplates/users/template_user.odt differ diff --git a/doli_patch.zip b/doli_patch.zip deleted file mode 100644 index 59833818..00000000 Binary files a/doli_patch.zip and /dev/null differ diff --git a/htdocs/conf/cond.dksserver.php b/htdocs/conf/cond.dksserver.php new file mode 100644 index 00000000..3196632c --- /dev/null +++ b/htdocs/conf/cond.dksserver.php @@ -0,0 +1,51 @@ + \ No newline at end of file diff --git a/readme b/readme deleted file mode 100644 index e69de29b..00000000