Fix curly braces

.dockerignore

@@ -0,0 +1,16 @@
+build
+build.xml
+ChangeLog
+composer.json
+CONTRIBUTING.md
+COPYING
+COPYRIGHT
+dev
+doc
+Dockerfile
+INSTALL
+README-FR.md
+README.md
+robots.txt
+scripts
+test

.gitignore

@@ -25,4 +25,3 @@ Thumbs.db
 htdocs/includes/autoload.php
 htdocs/includes/bin/
 htdocs/includes/composer/
-/.pydevproject

.mailmap

@@ -6,8 +6,8 @@ Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
 Laurent Destailleur <eldy@destailleur.fr> eldy10 <eldy10@master8.(none)>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ephpcsdy@destailleur.fr>
-Regis Houssin <regis.houssin@inodbox.com> Regis Houssin <regis@dolibarr.fr>
-Regis Houssin <regis.houssin@inodbox.com> Régis Houssin <regishoussin@device5.home>
+Regis Houssin <regis.houssin@capnetworks.com> Regis Houssin <regis@dolibarr.fr>
+Regis Houssin <regis.houssin@capnetworks.com> Régis Houssin <regishoussin@device5.home>
 Juanjo Menent <jmenent@2byte.es> simnandez <jmenent@2byte.es>
 Juanjo Menent <jmenent@2byte.es> Juanjo Menent <simnandez@gmail.com>
 Juanjo Menent <jmenent@2byte.es> Simnandez <jmenent@2byte.es>

.stickler.yml

@@ -1,10 +0,0 @@
----
-linters:
-  phpcs:
-      standard: 'dev/setup/codesniffer/ruleset.xml'
-      extensions: 'php'
-      tab_width: 4
-      fixer: true
-
-fixers:
-    enable: true

.travis.yml

@@ -2,9 +2,8 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: trusty to have php 5.4+ available
-os: linux
-dist: trusty
+# We use dist: precise to have php 5.3 available 
+dist: precise
 sudo: required
 
 language: php
@@ -21,7 +20,7 @@ addons:
     # To use the last version of pgloader, we add repo of postgresql
     - postgresql
     - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main'
-    - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
+    - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'  
     packages:
     # We need a webserver to test the webservices
     # Let's install Apache with.
@@ -32,13 +31,13 @@ addons:
     - pgloader
 
 php:
+- '5.3'
 - '5.4'
 - '5.5'
 - '5.6'
 - '7.0'
 - '7.1'
-- '7.2'
-- '7.3'
+#- hhvm		only with dist: trusty
 - nightly
 
 env:
@@ -60,28 +59,27 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+  - php: hhvm
   - php: nightly
   # We exclude some combinations not usefull to save Travis CPU
   exclude:
+  - php: '5.4'
+    env: DB=mariadb
   - php: '5.5'
     env: DB=mariadb
   - php: '5.6'
     env: DB=mariadb
   - php: '7.0'
     env: DB=mariadb
-  - php: '7.1'
-    env: DB=mariadb
-  - php: '7.2'
-    env: DB=mariadb
+  - php: '5.4'
+    env: DB=postgresql
   - php: '5.5'
     env: DB=postgresql
   - php: '5.6'
     env: DB=postgresql
   - php: '7.0'
     env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
-  - php: '7.2'
+  - php: hhvm
     env: DB=postgresql
   - php: nightly
     env: DB=postgresql
@@ -89,7 +87,7 @@ matrix:
 notifications:
   email:
     on_success: never # [always|never|change] default: change
-    on_failure: never # [always|never|change] default: always
+    on_failure: change # [always|never|change] default: always
   irc:
     channels:
     - "chat.freenode.net#dolibarr"
@@ -111,7 +109,7 @@ before_install:
     pgloader --version
     echo
   fi
-
+ 
 install:
 - |
   echo "Updating Composer"
@@ -120,7 +118,6 @@ install:
   composer self-update
   composer -n init
   composer -n config vendor-dir htdocs/includes
-  composer -n config -g vendor-dir htdocs/includes
   echo
 
 - |
@@ -131,168 +128,154 @@ install:
 
 - |
   echo "Installing PHP Unit"
-  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
     composer -n require phpunit/phpunit ^4
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
-    composer -n require phpunit/phpunit ^5
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
     composer -n require phpunit/phpunit ^5
   fi
   echo
 
 - |
   echo "Installing PHP CodeSniffer"
-  composer -n require squizlabs/php_codesniffer ^3
+  composer -n require squizlabs/php_codesniffer ^2
   echo
 
 - |
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   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 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 "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
-    if [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-      # Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
-      echo
-      echo "Enabling Memcached for PHP <= 5.4"
-      echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    fi
-    phpenv rehash
+- |
+  echo "Setting up PHP"
+  echo
+  echo "Set timezone"
+  echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
+    #echo
+    #echo "Enabling APC for PHP <= 5.4"
+    #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
+    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
     echo
+    echo "Enabling Memcached for PHP <= 5.4"
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
+    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  phpenv rehash
+  echo
 
-  - |
-    echo "Versions information"
+- |
+  if [ "$DEBUG" = true ]; then
+    echo "Debugging informations"
     # Check PHP
-    echo "PHP version"
-    php -i | head -
+    php -i
     # Check PHP CodeSniffer installation
-    echo "PHPCS version"
     which phpcs
-    phpcs --version | head -
-    phpcs -i | head -
+    phpcs --version
+    phpcs -i
     # Check PHPUnit installation
-    echo "PHPUnit version"
     which phpunit
-    phpunit --version | head -
-    # Check Apache version
-    echo "Apache version"
-    apache2 -v | head -
-    # Check MariaDb
-    echo "MariaDb version"
-    mysql --version | head -
-    mysql -e "SELECT VERSION();"  | head -
+    phpunit --version
+    # Check MySQL
+    mysql --version
+    mysql -e "SELECT VERSION();"
     echo
+  fi
+  
+- |
+  echo "Setting up database"
+  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
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+  fi
+  # TODO: SQLite
+  echo
 
-  - |
-    echo "Setting up database"
-    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
-      #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
-      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
-    # TODO: SQLite
-    echo
+- |
+  export CONF_FILE=htdocs/conf/conf.php
+  echo "Setting up Dolibarr $CONF_FILE"
+  echo '<?php ' > $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
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
+  fi
+  # TODO: SQLite
+  echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
+  cat $CONF_FILE
+  echo
 
-  - |
-    export CONF_FILE=htdocs/conf/conf.php
-    echo "Setting up Dolibarr $CONF_FILE"
-    echo '<?php' > $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
-    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
-    # TODO: SQLite
-    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 documents/admin/temp
+  echo "first line" > documents/dolibarr.log
+  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"
-  - sudo apt-get update
-  - sudo apt-get install apache2 libapache2-mod-fastcgi
+- |
+  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" = '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 for precise
-  #- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-  #- sudo cat /etc/apache2/sites-available/default
-  # configure apache virtual hosts for trusty
-  - 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
-
-
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    # Copy the included pool
+    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
+  fi
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  fi
+  sudo a2enmod rewrite actions fastcgi alias
+  echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  ~/.phpenv/versions/$PHP_VERSION_NAME/sbin/php-fpm
+  # configure apache virtual hosts
+  sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/default
+  sudo sed -e "s?%TRAVIS_BUILD_DIR%?$TRAVIS_BUILD_DIR?g" --in-place /etc/apache2/sites-available/default
+  if [ "$DEBUG" = true ]; then
+    sudo cat /etc/apache2/sites-available/default
+  fi
+  sudo service apache2 restart
+  echo
 
 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 '<meta name="generator" content="Dolibarr installer">
-  wget -O - http://127.0.0.1 > test.html
-  head test.html
-  sudo cat /var/log/apache2/travis_error_log
+  echo "Checking webserver availability"
+  # Ensure we catch errors
+  set -e
+  wget http://127.0.0.1
+  if [ "$DEBUG" = true ]; then
+    cat index.html
+  fi
   set +e
   echo
 
@@ -300,8 +283,7 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude htdocs/includes --blame .
   set +e
   echo
 
@@ -310,8 +292,7 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  phpcs -s -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 
@@ -321,7 +302,7 @@ script:
 
 - |
   echo "Upgrading Dolibarr"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
+  # Ensure we catch errors
   set +e
   cd htdocs/install
   php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
@@ -337,47 +318,40 @@ script:
   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 upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $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 upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $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 upgrade2.php 5.0.0 6.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $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 upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $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
-  # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
-  echo $?
   cd -
   set +e
   echo
+  #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
   #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.
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see 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
 
+- |
+  #echo "Output dolibarr.log"
+  #echo cat documents/dolibarr.log
+
 after_script:
 - |
-  echo "After script - Output 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
+  # Dolibarr log file
+  #echo "After script"
+  #cat documents/dolibarr.log
+
 
 after_success:
 - |
@@ -385,24 +359,20 @@ after_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
+  echo Failure
+  # This part of code seems to be never executed, error or not ???
+  echo "Debugging informations"
   # Upgrade log files
-  for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
-  do
-    echo "Debugging informations for file $ficlog"
-    #cat $ficlog
-  done
+  cat *.log
+  echo "Debugging informations"
   # Apache log file
-  echo "Debugging informations for file apache error.log"
-  sudo cat /var/log/apache2/travis_error_log
+  sudo cat /var/log/apache2/error.log
+  # Dolibarr log file
+  cat documents/dolibarr.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
     # MariaDB log file
-    echo "Debugging informations for file mysql error.log"
-    sudo tail -n 50 /var/log/mysql/error.log
+    sudo cat /var/log/mysql/error.log
     # TODO: PostgreSQL log file
     echo
   fi
+

.tx/config

@@ -20,12 +20,6 @@ source_file = htdocs/langs/en_US/agenda.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.assets]
-file_filter = htdocs/langs/<lang>/assets.lang
-source_file = htdocs/langs/en_US/assets.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.banks]
 file_filter = htdocs/langs/<lang>/banks.lang
 source_file = htdocs/langs/en_US/banks.lang
@@ -38,12 +32,6 @@ source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.blockedlog]
-file_filter = htdocs/langs/<lang>/blockedlog.lang
-source_file = htdocs/langs/en_US/blockedlog.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
@@ -164,6 +152,12 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.incoterm]
+file_filter = htdocs/langs/<lang>/incoterm.lang
+source_file = htdocs/langs/en_US/incoterm.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
@@ -362,12 +356,6 @@ source_file = htdocs/langs/en_US/supplier_proposal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.ticket]
-file_filter = htdocs/langs/<lang>/ticket.lang
-source_file = htdocs/langs/en_US/ticket.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang

CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Code of Conduct
-
-## 1. Purpose
-
-A primary goal of Dolibarr is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
-
-This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
-
-We invite all those who participate in Dolibarr to help us create safe and positive experiences for everyone.
-
-## 2. Open Source Citizenship
-
-A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
-
-Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
-
-If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-## 3. Expected Behavior
-
-The following behaviors are expected and requested of all community members:
-
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-
-## 4. Unacceptable Behavior
-
-The following behaviors are considered harassment and are unacceptable within our community:
-
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
-
-## 5. Consequences of Unacceptable Behavior
-
-Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately.
-
-If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
-
-## 6. Reporting Guidelines
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. contact@dolibarr.org.
-
-
-
-Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
-
-## 7. Addressing Grievances
-
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Dolibarr with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
-
-
-
-## 8. Scope
-
-We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
-
-This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
-
-## 9. Contact info
-
-contact@dolibarr.org
-
-## 10. License and attribution
-
-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

COPYRIGHT

@@ -34,11 +34,12 @@ Swift Mailer           5.4.2-DEV     MIT license                 Yes
 Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
 
 JS libraries:
-jQuery                 3.1.1         MIT License                 Yes             JS library
-jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
+jQuery                 1.11.3        MIT License                 Yes             JS library
+jQuery UI              1.11.4        GPL and MIT License         Yes             JS library plugin UI
+jQuery select2         3.5.2         GPL and Apache License      Yes             JS library plugin for sexier multiselect
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
+jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
 jQuery Flot            0.8.3         MIT License                 Yes             JS library to build graph
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
@@ -48,14 +49,10 @@ jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
+jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
-Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
-
-Image libraries
-Octicons               8.1           MIT                         Yes
-
 
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html

Dockerfile

@@ -0,0 +1,19 @@
+FROM php:5.6-apache
+
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd \
+	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+        && docker-php-ext-install ldap \
+        && docker-php-ext-install mysqli \
+        && apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev
+
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+VOLUME /var/www/html/conf
+VOLUME /var/www/html/documents
+
+EXPOSE 80

README-FR.md

@@ -15,55 +15,49 @@ Dolibarr est distribué sous les termes de la licence GNU General Public License
 
 ## INSTALLER DOLIBARR
 
-### Configuration simple
+Si vous n'avez pas de connaissances techniques, et que vous recherchez
+un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
+vous devez vous réorienter vers DoliWamp (la version tout-en-un
+de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
+Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
+OpenSuse, Mandriva ou Mageia).
 
-Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
+Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
+https://www.dolibarr.org/
 
-- DoliWamp pour Windows
-- DoliDeb pour Debian ou Ubuntu
-- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
+Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (MariaDb/MySql/PostgreSql),
+vous pouvez installer Dolibarr avec cette version de la manière suivante:
 
-Les packages peuvent être téléchargés à partir de [site web officiel] (https://www.dolibarr.org/).
+- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
+  web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
+  utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second 
+  choix requiert des compétences et habilitations en administration du serveur
+  web).
+  
+- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
+  en lecture et écriture pour le user du serveur web (les permissions en 
+  écriture seront supprimées une fois l'installation terminée).
 
-### Configuration avancée
+- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend 
+  du choix fait à la première etape:
+   http://localhost/dolibarr/htdocs/install/
+  ou
+   http://yourdolibarrvirtualhost/install/
+   
+- Suivez les instructions fournies par l'installeur...
 
-Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
-
-- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
-
-  git clone https://github.com/dolibarr/dolibarr -b x.y   (où x.y est la version principale comme 3.6, 9.0, ...)
-
-- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
- 
-- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
-
-- Depuis votre navigateur, allez à la page "install/" de dolibarr
-
-    L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
-
-        http://localhost/dolibarr/htdocs/install/
-        
-    ou
-    
-        http://localhost/dolibarr/install/
-        
-    ou
-    
-    http://yourdolibarrvirtualhost/install/
-   
-- Suivez les instructions de l'installateur
 
 
 ## METTRE A JOUR DOLIBARR
 
-Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
-- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
+Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
+- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
   fournis dans ce nouveau package.
   
-- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
-  Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") 
-  
-*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+- Au prochain accès, Dolibarr proposera la page de "mise a jour" des données (si necessaire).
+  Si un fichier install.lock existe pour vérouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transféré sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") 
+
+*Note: Le processus de migration peut etre lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
   
 
 ## CE QUI EST NOUVEAU
@@ -100,15 +94,14 @@ Voir fichier ChangeLog.
 
 - Gestion de marque-pages
 - Gestion des promesses de dons
+- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
 - Rapports
 - Imports/Exports des données
-- Support des codes barres
-- Calcul des marges
 - Connectivité LDAP
 - Intégratn de ClickToDial
 - Intégration RSS
 - Intégation Skype
-- Intégration de système de paiements (Paypal, Stripe, Paybox...)
+- Intégration de système de paiements (Paypal, Strip, Paybox...)
 - …
 
 ### Divers:
@@ -121,18 +114,9 @@ Voir fichier ChangeLog.
 - Application simple à utiliser.
 - Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
+- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
-- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
-- Support natif de nombreuses fonctions spécifiques aux pays comme:
-	- La tax espagnole TE et ISPF
-	- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
-	- La loi française Finance 2016 et logiciels de caisse
-	- La double taxe canadienne
-	- Le timbre fiscal tunisien
-	- Numérotation de facture de l'argentines (avec type A,B,C...) 
-	- Compatible avec vos processus RGPD 
-	- ...
 - …
 
 ### Extension
@@ -142,7 +126,7 @@ Dolibarr peut aussi être étendu à volonté avec l'ajout de module/application
 
 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
-Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
+Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr n'embarque pas de Webmail intégré nativement.
@@ -151,13 +135,12 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
 
 ## DOCUMENTATION
 
-La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
+Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la site [Wiki](https://wiki.dolibarr.org).
 
 
-## CONTRIBUER
+## CONTRIBUTING
 
-Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+Voir le fichier [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
 
 
 ## CREDITS

README.md

@@ -1,15 +1,10 @@
 # DOLIBARR ERP & CRM
 
-![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
-[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/6.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
 
-|6|7|8|9|develop|
-|----------|----------|----------|----------|----------|
-|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/6.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/7.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/8.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/9.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)|
+Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 
-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
-
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source software (wrote in PHP language) designed for small, medium or large companies, foundations and freelances.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
@@ -29,31 +24,38 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 ## INSTALLING
 
+### Download
+
+Releases can be downloaded from [official website](https://www.dolibarr.org/).
+
+### Install from composer
+If you do not already have Composer installed, you may do so by following the instructions at getcomposer.org. On Linux and Mac OS X, you'll run the following commands:
+
+curl -sS https://getcomposer.org/installer | php
+mv composer.phar /usr/local/bin/composer
+
+On Windows, you'll download and run https://getcomposer.org/Composer-Setup.exe
+
+composer create-project dolibarr/dolibarr erp
+
 ### Simple setup
 
-If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM in few clicks, you can use one of the packaged versions:
 
 - DoliWamp for Windows
 - DoliDeb for Debian or Ubuntu
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
-Releases can be downloaded from [official website](https://www.dolibarr.org/).
-
 ### Advanced setup
 
-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
-
-- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git): 
-
-  git clone https://github.com/dolibarr/dolibarr -b x.y     (where x.y is main version like 3.6, 9.0, ...)
-
-- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to. 
- 
-- Create an empty `htdocs/conf/conf.php` file and set *write* permissions for your web server user (*write* permission will be removed once install is finished)
+You can use a Web server and a supported database (MariaDb, MySql or Postgresql) to install the standard version.
 
+- Uncompress the downloaded archive
+- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
+- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished)
 - From your browser, go to the dolibarr "install/" page
 
-    The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
+    The URL will depends on choices made in the first step:
 
         http://localhost/dolibarr/htdocs/install/
         
@@ -71,10 +73,10 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 ## UPGRADING
 
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
-- At first next access, Dolibarr will redirect your to the "install/" page to follow the upgrade process.
-  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
+- At first next access, Dolibarr will redirect your to the "install/" page to make the upgrade process.
+  If a file install.lock exists to lock any run of upgrade process, the application will ask you to remove the file manually (you should find the install.lock file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "documents").
 
-*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
+*Note: migration process can safely be done multiple times by calling the page /install/index.php*
 
 
 ## WHAT'S NEW
@@ -116,6 +118,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Donations management
 - Reporting
 - Data export/import
+- Thirdparties and/or products categories
 - Barcodes support
 - Margin calculations
 - LDAP connectivity
@@ -137,15 +140,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
 - APIs.
 - An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
-- Support a lot of country specific features:
+- Support for country specific features:
     - Spanish Tax RE and ISPF
     - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
     - Canadian double taxes (federal/province) and other countries using cumulative VAT
     - Tunisian tax stamp
     - Argentina invoice numbering using A,B,C... 
     - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-    - Compatible with European GDPR rules
-    - ...
 - PDF or ODT generation for invoice, proposals, orders...
 - …
 
@@ -154,7 +155,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
 
-## WHAT DOLIBARR CAN'T DO YET
+## FUTURE
 
 These are features that Dolibarr does **not** yet fully support:
 
@@ -171,8 +172,7 @@ Administrator, user, developer and translator's documentations are available alo
 
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
 
 
 ## CREDITS
@@ -192,8 +192,3 @@ Follow Dolibarr project on:
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
-
-
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]

build/README

@@ -16,20 +16,18 @@ Note: Prerequisites to build tgz, debian, rpm package
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
 Note: Prerequisites to build autoexe DoliWamp package:
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
    For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
 > Install WampServer into "C:\Program Files\Wamp"
-   For example by running wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe (http://www.wampserver.com)
-> Install WampServer addon to have versions: Mysql5.0.45
+   For example by running wampserver2.2e-php5.4.3-httpd-2.4.2-mysql5.5.24-x64.exe (http://www.wampserver.com)
+> Install WampServer addon to have versions: Apache2.2.11, Mysql5.0.45, Php5.3.0
+   For example by running WampServer2-APACHE2211.exe (http://www.wampserver.com)
    For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
+   For example by running WampServer2-PHP530.exe (http://www.wampserver.com)
 > To build from Windows (running from makepack-dolibarr.pl script is however
   recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-  
+
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
@@ -48,6 +46,9 @@ generated packages will not contains this "build" directory.
 
 We can find in "build", following sub-directories:
 
+* aps:
+To build APS package.
+
 * debian:
 To build Debian package.
 

build/aps/APP-META-1.1.xml

@@ -0,0 +1,123 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.1">
+	<!-- Application common properties (step 9) -->
+	<name>Dolibarr ERP-CRM</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+		<name>Laurent Destailleur</name>
+		<homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP-CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+        </description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text>
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+            <summary>Dolibarr services</summary>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+		      <!-- 
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a	letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+			-->
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+            <configuration-script name="configure.php">
+                <configuration-script-language>php</configuration-script-language>
+                <status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/APP-META-1.2.xml

@@ -0,0 +1,121 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.2">
+	<!-- Application common properties (step 9) -->
+	<id>dolibarr</id>
+	<name>Dolibarr</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+        <name>Laurent Destailleur</name>
+        <homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+</description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text xml:lang="">
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+			<configuration-script name="configure.php">
+				<script-language>php</script-language>
+				<status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/Limitations of APS Support in the Panel.html

@@ -0,0 +1,89 @@
+<html><head>
+<title> Limitations of APS Support in the Panel </title>
+<meta name="Keywords" content="">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/stylesheet.css">
+<link href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.js"></script>
+<script src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/highlight.js"></script></head>
+
+<body onload="prettyPrint()" link="#0000A0" text="#000000" vlink="#FF0000" alink="#008000" bgcolor="#FFFFFF">
+<h1 class="heading1">Limitations of APS Support in the Panel</h1>
+<h2 class="heading2">About This Document</h2>
+<p class="bodytext">This document is addressed to independent software 
+vendors who plan to distribute web applications among the Panel users. 
+The aim of the document is to help vendors find out whether they can 
+package their applications to APS to make them available through the 
+Panel.</p>
+<p class="bodytext">The document does not contain information about 
+Application Packaging Standard itself or give application packaging 
+instructions. It focuses on how the Panel implements APS and what APS 
+packages are not supported by this implementation.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">APS Support in the Panel</h2>
+<p class="bodytext"><em class="emphasis"><em class="emphasis">Application Packaging Standard</em></em> (<em class="emphasis">APS</em>)
+ is a set of rules that defines a web application packaging format. This
+ standard is designed to ease the integration of applications in a 
+service provider's infrastructure. It covers provisioning, management, 
+and integration of cloud-based services and applications.</p>
+<p class="bodytext">The Panel uses APS to offer third-party applications to hosting customers. These applications are presented in <em class="emphasis">APS catalog</em>, where the customers can buy or download them.</p>
+<p class="bodytext">Currently, the Panel does not support all aspects of
+ APS. Therefore, customers may have problems trying to install certain 
+applications. To find out whether your application is compatible with 
+the Panel, see section <strong class="specialbold"><strong class="specialbold">Plesk Panel Restrictions.</strong></strong></p>
+<p class="bodytext">You can find more information about APS at http://www.apsstandard.org/.</p>
+<p class="bodytext">APS specification and supporting documents are available at http://www.apsstandard.org/isv/documentation/.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">Restrictions on Packages Processing</h2>
+<p class="bodytext">The current Panel version has restrictions on APS 
+applications processing. If an application requires performing 
+restricted actions, the Panel will not install it. Particularly, these 
+actions are the following:</p>
+<ul class="listbullet"><li class="listbullet">Sending e-mails or processing incoming mail.<p class="listcontinue">See <strong class="specialbold">Mail aspect</strong> of APS in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.8. Mail </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.mail</p>
+</li><li class="listbullet">Changing the DNS resource records of an environment where the application works.<p class="listcontinue">See <strong class="specialbold">DNS aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.10. DNS Zone </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dns</p>
+</li><li class="listbullet">Installing third-party dynamic libraries (*.dll, *.so).<p class="listcontinue">See<strong class="specialbold"> DLL aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.11. DLL Content Processing Method </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dll</p>
+</li><li class="listbullet">Updating older version of application with 
+complex changes in application settings or deployment logic. According 
+to APS, such updates are called <em class="emphasis">upgrades. </em>For more information on the application updates, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.1.15 Updates </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.common.update</li></ul><p class="bodytext">If
+ you need you application to perform these actions, consider other ways 
+of integration with the Panel: API RPC, modules or Panel Notifications.</p>
+<p class="bodytext">Also, the Panel does not support the following actions defined in the application package: </p>
+<ul class="listbullet"><li class="listbullet">Checking application settings for consistency via <strong class="specialbold">verification script. </strong>For more information on verification scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.3.3 Verification Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.verification-script</li><li class="listbullet">Processing application resource usage reports defined by <strong class="specialbold">resource counters</strong> and passed by <strong class="specialbold">resource script</strong> . For more information on resource counters and resource scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.2.6. Resources</strong> at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.service.resources and <strong class="specialbold">5.3.3 Resources Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.resource-script</li>
+
+<h1 class="heading1">Copyright Notice</h1>
+<p class="copyright">Parallels Holdings, Ltd.</p>
+<p class="copyright">c/o Parallels International GmbH</p>
+<p class="copyright">Vordergasse 59</p>
+<p class="copyright">CH-Schaffhausen</p>
+<p class="copyright">Switzerland</p>
+<p class="copyright">Phone:&nbsp;+41-526320-411</p>
+<p class="copyright">Fax: +41-52672-2010</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Copyright © 1999-2011 Parallels Holdings, Ltd. and its affiliates.&nbsp;All rights reserved.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">This product is protected by United States and 
+international copyright laws. The product's underlying technology, 
+patents, and trademarks are listed at 
+http://www.parallels.com/trademarks.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Microsoft, Windows, Windows Server, Windows NT, Windows Vista, and MS-DOS are registered trademarks of Microsoft Corporation.</p>
+<p class="copyright">Linux is a registered trademark of Linus Torvalds.</p>
+<p class="copyright">Mac is a registered trademark of Apple, Inc.</p>
+<p class="copyright">All other marks and names mentioned herein may be trademarks of their respective owners.</p>
+
+
+
+<p class="bodytext">
+<a target="_blank" title="Send feedback through a web form" href="http://www.parallels.com/en/support/usersdoc/?problemSubject=Feedback+on+Help+Page+" onclick="var u = parent.BODY.location.href;
+u = u.replace(/.+\/([^/]+).htm$/,'$1');
+u+= '+of+the+'+parent.document.title.replace(/ /g,'+');
+
+this.href+=u;
+
+window.location.reload(false);">Please send us your feedback on this help page.</a></p>
+
+
+
+
+</ul></body></html>
+<!-- Edited by post-publisher -->

build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js

@@ -0,0 +1,64 @@
+function last(href)
+{
+  var ret = href.split("/");
+  return ret[ret.length-1];
+}
+
+function StopProcess()
+{
+LeftFrame = parent.TOC.document.location.href;
+LeftFrame = last(LeftFrame);
+if (LeftFrame == "dhtml_search.htm") return 1
+else return 0;
+}
+
+
+
+function highlightTOC(str) {
+    
+	
+		
+		 
+	
+    if (StopProcess()) return;
+    try {
+		
+    str = str || parent.BODY.document.location.href;
+    uri = last(str);
+    list = parent.TOC.document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (last(list[i].href) == uri)
+	{
+        list[i].style.backgroundColor = "#6697cc";
+        list[i].style.padding = "2px";
+        list[i].style.color = "#ffffff";
+		
+	} else {
+		list[i].style.backgroundColor = "#ffffff";
+        list[i].style.color = "#003380";
+	  }
+    }
+    } catch (e) {}
+}
+
+function FindCorrectTOCPage()
+{
+if (StopProcess()) return;
+//Updated on 30.04.2008
+list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (list[i].target == "TOC")
+	{
+
+		if (last(list[i].href) != last(parent.TOC.document.location.href))
+			{
+				parent.TOC.document.location.href = list[i].href;
+				return;
+			}
+	}
+    }
+
+
+}

build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css

@@ -0,0 +1,60 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+.str { color: #FF0000; }
+.vr { color: #0000FF; }
+.kwd { color: #000080; font-weight: bold}
+.com { color: #EA8110; }
+.typ { color: #606; }
+.lit { color: #066; }
+.pun { color: #660; }
+.pln { color: #000; }
+.tag { color: #008; }
+.atn { color: #606; }
+.atv { color: #080; }
+.dec { color: #606; }
+pre.preformatted { 
+
+	    display: block;
+        font-family: "Courier New", verdana, arial, helvetica, sans-serif;
+        font-style: normal;
+        font-variant: normal;
+        font-weight: normal;
+        font-size: 10pt;
+        color: #000000;
+        background-color: #f4f4f4;
+        word-spacing: normal;
+        letter-spacing: normal;
+        vertical-align: baseline;
+        text-decoration: none;
+        text-transform: none;
+        line-height: normal;
+        margin-top: 0pt;
+        margin-bottom: 0pt;
+        margin-left: 0pt;
+        margin-right: 6pt;
+        padding-top: 1pt;
+        padding-bottom: 1pt;
+        padding-left: 5pt;
+        padding-right: 5pt;
+        float: none;
+        clear: none;
+        text-align: left;
+        text-indent: 0cm;
+        width: auto;
+        height: auto;
+
+}
+
+@media print {
+  .vr { color: #f0f; }
+  .str { color: #060; }
+  .kwd { color: #006; font-weight: bold; }
+  .com { color: #600; font-style: italic; }
+  .typ { color: #404; font-weight: bold; }
+  .lit { color: #044; }
+  .pun { color: #440; }
+  .pln { color: #000; }
+  .tag { color: #006; font-weight: bold; }
+  .atn { color: #404; }
+  .atv { color: #060; }
+}

build/aps/README

@@ -0,0 +1,20 @@
+README (English)
+##################################################
+This directory is dedicated to APS package building
+##################################################
+
+Docs for APS format 1.1:
+http://www.apsstandard.org/r/doc/aps-format-1.1-packaging-guide/index.htm
+
+Docs for APS format 1.2 (need APP-LIST.xml):
+http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/index.htm
+
+
+To check an APS package on Debian:
+* Install libgdiplus with 
+apt-get install libgdiplus
+* Install apslint.exe (http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/57414.htm)
+tar -xvf xxxx.tgz 
+* Go into directory of apslint and run command
+mono ./apslint.exe '/media/DATA/Mes Developpements/dolibarr/build/dolibarr-3.1.0-dev.app.zip' 
+

build/aps/configure.php

@@ -0,0 +1,151 @@
+#!/usr/bin/env php
+<?php
+/*-----------------------------------------------------
+ *
+ *----------------------------------------------------- */
+
+// This is list of predefined variables when script is ran
+// We have to set them manually to run script outside context.
+/*putenv('SETTINGS_admin_name=admin');
+putenv('SETTINGS_admin_password=admin-ad');
+putenv('BASE_URL_SCHEME=http');
+putenv('BASE_URL_HOST=localhost');
+putenv('BASE_URL_PORT=0');
+putenv('BASE_URL_PATH=/');
+//putenv('WEB___DIR=/var/wwww/dolibarr/htdocs');      // WEB___DIR is dir to htdocs
+putenv('WEB___DIR=../htdocs');      // WEB___DIR is dir to htdocs
+putenv('DB_main_NAME=dolibarr');
+putenv('DB_main_HOST=localhost');
+putenv('DB_main_PORT=3306');
+putenv('DB_main_LOGIN=root');
+putenv('DB_main_PASSWORD=root');
+*/
+
+// Check parameters
+if(count($_SERVER['argv']) < 2)
+{
+    print "Usage: configure.php (install | upgrade <version> | configure | remove)\n";
+    exit(1);
+}
+$command = $_SERVER['argv'][1]; //$command stores the argument with which the script was invoked.
+
+
+if($command == "install")
+{
+    $db_id = 'main';
+
+    $rootdir = getenv("WEB___DIR");
+    if ($rootdir != '/') $rootdir = preg_replace('/\/$/','',$rootdir);  // Remove last /
+    $datadir = $rootdir.'/dolibarr_documents';
+
+    //List of database-related variables that are passed to the configuration
+    //script. See the 6.3.1.1.1. Environment variables section of the
+    //Specification for details.
+    $db_address = getenv("DB_${db_id}_HOST");
+    $db_port = getenv("DB_${db_id}_PORT");
+    $dblogin = getenv("DB_${db_id}_LOGIN");
+    $dbpassword = getenv("DB_${db_id}_PASSWORD");
+    $dbname = getenv("DB_${db_id}_NAME");
+
+
+    //PHP functions for connecting to the mysql server and
+    //executing SQL queries.
+    //mysql_connect($dbaddress, $dblogin, $dbpassword);
+    //mysql_select_db($dbname);
+    /*
+     $sql_queries = file($query_file);
+     foreach ($sql_queries as $query) mysql_query($query);
+     */
+
+
+    //Other code to be executed on invoking configure with
+    //the install argument.
+
+    // Create empty config file
+    $file=$rootdir.'/conf/conf.php';
+    print "Create conf file ".$file."\n";
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(1);
+    }
+
+    // Create empty directory that will be used by software to store uploaded documents
+    print "Create directory ".$datadir."\n";
+    @mkdir($datadir);
+    chmod($datadir,0775);
+
+    // Create install.forced.php into htdocs/install directory with value.
+    // This will set parameters of install for web installer wizard.
+    $file_source=$rootdir.'/../build/aps/install.forced.php.install';
+    $file=$rootdir.'/install/install.forced.php';
+    print "Create file ".$file.' from '.$file_source."\n";
+
+    $modify_hash=array(
+    'WEB___DIR'=>$rootdir,
+    'DB_'.$db_id.'_HOST'=>$db_address,
+    'DB_'.$db_id.'_PORT'=>$db_port,
+    'DB_'.$db_id.'_LOGIN'=>$dblogin,
+    'DB_'.$db_id.'_PASSWORD'=>$dbpassword,
+    'DB_'.$db_id.'_NAME'=>$dbname
+    );
+
+    $file_content = fread(fopen($file_source, 'r'), filesize($file_source));
+    foreach($modify_hash as $param => $val){
+        $file_content = str_replace($param, php_quote($val), $file_content);
+    }
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fputs($fp, $file_content);
+        fputs($fp, "\n");
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(2);
+    }
+
+    exit(0);
+}
+
+if($command == "remove")
+{
+    //Code to be executed on invoking configure with the remove argument
+    exit(0);
+}
+
+if($command == "upgrade")
+{
+    //Code to be executed on invoking configure with the upgrade argument
+    exit(0);
+}
+
+if($command == "configure")
+{
+    //Code to be executed on invoking configure with the configure argument
+    exit(0);
+}
+
+print "configure.php: Error: unknown command $command.\n";
+exit(1);
+
+
+
+// Content of file-util.php we need
+
+function php_quote($val)
+{
+    $res_val = str_replace("\\", "\\\\", $val);
+    $res_val = str_replace("'", "\\'", $res_val);
+    return $res_val;
+}
+

build/aps/install.forced.php.install

@@ -0,0 +1,23 @@
+<?php
+// File to force Dolibarr wizard installer choices.
+//
+// This file must be present into htdocs/install directory
+// during install process to be used.
+//
+//
+$force_install_noedit=1;
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='WEB___DIR/dolibarr_documents';
+$force_install_type='mysqli';
+$force_install_dbserver='DB_main_HOST';
+$force_install_port='DB_main_PORT';
+$force_install_database='DB_main_NAME';
+$force_install_createdatabase='0';
+$force_install_databaselogin='DB_main_LOGIN';
+$force_install_databasepass='DB_main_PASSWORD';
+$force_install_createuser='0';
+$force_install_databaserootlogin='';
+$force_install_databaserootpass='';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';

build/debian/copyright

@@ -8,7 +8,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
            2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
            2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2013, Regis Houssin          <regis.houssin@inodbox.com>
+           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>

build/debian/patches/use-etc-dolibarr-conf.patch

@@ -34,4 +34,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
+ // Load conf file if it is already defined
+--- a/htdocs/support/inc.php
++++ b/htdocs/support/inc.php
+@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
  // Load conf file if it is already defined

build/debian/rules

@@ -10,23 +10,12 @@ export DH_OPTIONS=-v
 %:
 	dh $@
 
-# Replace standard debian package actions with a new one
-########################################################
-
 override_dh_auto_clean:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
 
 override_dh_auto_build:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
-
-#override_dh_compress:
-#	dh_compress --no-act -X.png
-
-# We disable this for png file because it modify content of original file so make
-# the dolibarr signature not valid.
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -X.png
-
+	
 override_dh_install:
 	dh_install
 	# Delete files

build/debian/source/include-binaries

@@ -1 +0,0 @@
-htdocs/install/doctemplates/websites/website_template-corporate.zip

build/docker/.dockerignore

@@ -1,3 +0,0 @@
-Dockerfile
-README.md
-docker-compose.yml

build/docker/Dockerfile

@@ -1,32 +0,0 @@
-FROM php:7.0-apache
-
-ENV HOST_USER_ID 33
-ENV PHP_INI_DATE_TIMEZONE 'UTC'
-
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-	&& docker-php-ext-install gd \
-	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
-        && docker-php-ext-install mysqli \
-        && apt-get purge -y libjpeg-dev libldap2-dev
-
-COPY docker-run.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-run.sh
-
-RUN pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug
-RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_host=docker.for.mac.host.internal' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
-
-
-EXPOSE 80
-
-ENTRYPOINT ["docker-run.sh"]

build/docker/README.md

@@ -1,25 +0,0 @@
-# How to use it ?
-
-The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
-
-Before build/run, define the variable HOST_USER_ID as following:
-
-        export HOST_USER_ID=$(id -u)
-
-Go in repository build/docker :
-
-        cd build/docker
-
-And then, you can run :
-
-        docker-compose up
-
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
-
-The URL to go to the Dolibarr is :
-
-        http://0.0.0.0
-
-The URL to go to PhpMyAdmin is (login/password is root/root) :
-
-        http://0.0.0.0:8080

build/docker/docker-compose.yml

@@ -1,25 +0,0 @@
-mariadb:
-    image: mariadb:latest
-    environment:
-        MYSQL_ROOT_PASSWORD: root
-        MYSQL_DATABASE: dolibarr
-
-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-        PMA_HOST: mariadb
-    links:
-        - mariadb
-    ports:
-        - "8080:80"
-
-web:
-    build: .
-    environment:
-        HOST_USER_ID: $HOST_USER_ID
-    volumes:
-        - ../../htdocs:/var/www/html
-    links:
-        - mariadb
-    ports:
-        - "80:80"

build/docker/docker-run.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
-
-chown -hR www-data:www-data /var/www
-
-if [ ! -f /usr/local/etc/php/php.ini ]; then
-  cat <<EOF > /usr/local/etc/php/php.ini
-date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
-EOF
-fi
-
-exec apache2-foreground

build/doxygen/dolibarr-doxygen.doxyfile

@@ -442,7 +442,7 @@ SORT_BY_SCOPE_NAME = NO
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
-GENERATE_TODOLIST = NO
+GENERATE_TODOLIST = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
@@ -639,7 +639,7 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+EXAMPLE_PATH = ../../dev/skeletons
 
 # 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

build/doxygen/doxygen_footer.html

@@ -3,27 +3,42 @@ File added into doxygen generated documentation
 -->
 
 
+<!-- Google analytics -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-9049390-16', 'auto');
+  ga('send', 'pageview');
+
+</script>
+<!-- End google analytics -->
+
 
 <hr class="footer" />
-<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+<address class="footer"><small>Generated on $datetime
+for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
+<!--  Google AdSense -->
+<div class="center">
+<script type="text/javascript"><!--
+google_ad_client = "pub-1071905880519467";
+/* PUBBANDEAUDOLIBARR */
+google_ad_slot = "1421205532";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
+</script>
+<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+</div>
+<!-- End google adsense -->
 <br>
 
 </div>
 
-
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-9049390-16"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-9049390-16');
-</script>
-
-
 <!-- Twitter ad collector -->
 <script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
 <script type="text/javascript">twttr.conversion.trackPid('ntm4n', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -11,10 +11,10 @@ LaunchProgram=Launch %1
 AssocFileExtension=&Associate %1 with the %2 file extension
 AssocingFileExtension=Associating %1 with the %2 file extension...
 
-YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party softwares like Apache, Mysql and PHP) on your computer.
-ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP.
-ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way...
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.
+ThisAssistantInstallOrUpgrade=This assistant installs or upgrades Dolibarr ERP-CRM and all required third party softwares (Apache, Mysql and PHP) optimized for a Dolibarr usage.
+IfYouHaveTechnicalKnowledge=If you have technical knowledge and plan to share your Apache, Mysql and PHP with other projects than Dolibarr, you should not use this assistant and make a manual installation of Dolibarr on your existing Apache, Mysql and PHP installation.
+ButIfYouLook=But if you look for an automatic setup, you''re on the good way...
 DoYouWantToStart=Do you want to start installation/upgrade process ?
 
 TechnicalParameters=Technical parameters
@@ -32,7 +32,7 @@ PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go bac
 
 FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
 ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-ChooseDefaultBrowser=Please choose your default browser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). If you are not sure, just click Open :
+ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
 
 LaunchNow=Launch Dolibarr now
 
@@ -43,5 +43,3 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version
 
-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
-ContinueAnyway=Continue anyway (install process may fails without this prerequisite)

build/exe/doliwamp/Languages/MyFrench.isl

@@ -11,10 +11,10 @@ LaunchProgram=Ex
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
-ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install<6C> sur un ordinateur local peut <20>tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn<6E>es. Faites-le si vous <20>tes pr<70>t <20> g<>rer les sauvegardes vous-m<>me s<>rieusement. Sinon, utilisez plut<75>t une installation en Saas (voir https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un serveur existant <20>quip<69> de Apache, Mysql et PHP.
-ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e sur une poste local, vous <20>tes sur la bonne voie...
+YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp (Apache+Mysql+PHP+Dolibarr) sur votre ordinateur.
+ThisAssistantInstallOrUpgrade=Cet assistant installe ou met <20> jour Dolibarr ERP-CRM et tous ses composants pr<70>requis (Apache, Mysql et PHP) optimis<EFBFBD>s pour une utilisation de Dolibarr.
+IfYouHaveTechnicalKnowledge=Si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d'autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un socle Apache, Mysql et PHP existant.
+ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e, vous <20>tes sur la bonne voie...
 DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
 
 TechnicalParameters=Param<61>tres techniques
@@ -33,7 +33,7 @@ PortAlreadyInUse=Le port %1 semble d
 
 FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
 ChromeDetected=Chrome a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
-ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
+ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant
 
@@ -44,5 +44,3 @@ DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d
 OldVersionFoundAndMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e et d<>plac<61>e pour fonctionner avec la nouvelle version de Dolibarr.
 OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e mais ne peut <20>tre d<>plac<61>e pour <20>tre utilis<69>e avec la nouvelle version de Dolibarr.
 
-DLLMissing=L'installation de votre Windows est incompl<70>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2012". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <20> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<70>s.
-ContinueAnyway=Continuer malgr<67> tout (le process d'installaton <20>chouera)

build/exe/doliwamp/README

@@ -5,4 +5,4 @@ DOLIWAMP Package tools
 
 This directory contains files used by makepack-dolibarr.pl
 script to build the all-in-on .EXE package DoliWamp, ready
-to be distributed (for Windows).
+to be distributedt (for Windows).

build/exe/doliwamp/doliwamp.iss

@@ -28,11 +28,11 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 SourceDir=..\..\..
 AppId=doliwamp
 AppPublisher=NLTechno
-AppPublisherURL=https://www.nltechno.com
-AppSupportURL=https://www.dolibarr.org
-AppUpdatesURL=https://www.dolibarr.org
+AppPublisherURL=http://www.nltechno.com
+AppSupportURL=http://www.dolibarr.org
+AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2019 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2016 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -100,9 +100,9 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
 ; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value OK: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value ???: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
 Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
 Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
@@ -202,30 +202,10 @@ var value: String;
 function InitializeSetup(): Boolean;
 begin
   Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
-
-  if Result then
-  begin
-  
-	//----------------------------------------------
-	// Test if msvcr110 DLL has been installed
-	//----------------------------------------------
-	
-	if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-	begin
-	    // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
-	    Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES;
-	    
-	end;
-	// Pb seems similar with msvcp110.dll
-	//vcredist_x64.exe
-	  
-  end;
-
 end;
 
 procedure InitializeWizard();
 begin
-
   //version des applis, a modifier pour chaque version de WampServer 2
   apacheVersion := '2.4.9';
   phpVersion := '5.5.12' ;
@@ -237,7 +217,6 @@ begin
   mysqlPort := '3306';
   newPassword := 'changeme';
 
-
   firstinstall := true;
 
 
@@ -365,6 +344,19 @@ begin
     exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
     exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
+
+    //----------------------------------------------
+    // Test if msvcr110 DLL has been installed
+    //----------------------------------------------
+	
+    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
+    begin
+      // TODO Copy file or ask to install package ?
+      //CustomMessage('YouWillInstallDoliWamp')+#13#13
+      MsgBox('The Visual C++ Redistributable package should be installed, it seems it is not. Please install the 32-bit version from http://www.microsoft.com/en-us/download/details.aspx?id=30679, then restart the DoliWAMP installation/upgrade.',mbInformation,MB_OK);
+    end;
+	// Pb seems similar with msvcp110.dll
+	//vcredist_x64.exe
 	
 	
     // If we have a new database version, we should only copy old my.ini file into new directory

build/exe/doliwamp/index.php.install

@@ -535,7 +535,7 @@ a:hover {
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
-		<li>Provided by <a href="https://www.nltechno.com" targer="_blank">NLTechno</a></li>
+		<li>Provided by <a href="http://www.nltechno.com" targer="_blank">NLTechno</a></li>
 	</ul>
 </td></tr></table>
 <hr>
@@ -580,7 +580,7 @@ a:hover {
 
 
 	<ul id="foot">
-		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li><a href="http://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>

build/exe/doliwamp/rundoliadmin.bat.install

@@ -3,4 +3,4 @@ REM Launch Dolibarr Admin center
 REM ----------------------------
 
 REM Go to admin center page
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/
+start "DoliWamp admin" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/

build/exe/doliwamp/rundolihelp.bat.install

@@ -4,4 +4,4 @@ REM ---------------------------
 
 REM Go to help center page
 echo Please wait...
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
+start "Dolibarr Help center" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/

build/exe/doliwamp/rundoliwamp.bat.install

@@ -3,7 +3,7 @@ REM Launch Dolibarr
 REM ---------------
 
 REM If no lock file, we call install process
-IF NOT EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
+IF NOT EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
 
 REM If lock file exists, we call home page
-IF EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
+IF EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/

build/flatpack/org.flatpak.Dolibarr.json

@@ -1 +0,0 @@
-Help wanted...

build/generate_filelist_xml.php

@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
     exit;
 }
 
-require_once $path."../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+require_once($path."../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 
 /*
@@ -47,7 +47,7 @@ $includeconstants=array();
 
 if (empty($argv[1]))
 {
-    print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    print "Usage:   ".$script_file." release=auto|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
@@ -70,52 +70,30 @@ while ($i < $argc)
     $i++;
 }
 
-if (empty($release))
-{
-	print "Error: Missing release parameter\n";
-	print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	exit -1;
-}
-
-$savrelease = $release;
-
 // If release is auto, we take current version
 $tmpver=explode('-', $release, 2);
-if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
+if ($tmpver[0] == 'auto')
 {
 	$release=DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
+	if ($tmpver[1]) $release.='-'.$tmpver[1];
 }
 
 if (empty($includecustom))
 {
-	$tmpverbis=explode('-', $release, 2);
-	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
-	{
-		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
-	    {
-	    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-	    	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	        exit -1;
-	    }
-	}
-	else
-	{
-		$tmpverter=explode('-', DOL_VERSION, 2);
-		if ($tmpverter[0] != $tmpverbis[0])
-		{
-			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-			exit -1;
-		}
-	}
+	$tmpver=explode('-', $release, 2);
+	if (DOL_VERSION != $tmpver[0])
+    {
+    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpver[0].')'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+        exit -1;
+    }
 }
 else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
-        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
-        print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
         exit -1;
     }
 }
@@ -164,7 +142,7 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
 $regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir='';

build/makepack-dolibarr.pl

@@ -22,7 +22,7 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
-#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
+#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 %REQUIREMENTPUBLISH=(
 "SF"=>"git ssh rsync",
@@ -36,8 +36,8 @@ $PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpd
 "RPM_FEDORA"=>"rpmbuild",
 "RPM_MANDRIVA"=>"rpmbuild",
 "RPM_OPENSUSE"=>"rpmbuild",
-"DEB"=>"dpkg dpatch",
-"FLATPACK"=>"flatpack",
+"DEB"=>"dpkg",
+"APS"=>"zip",
 "EXEDOLIWAMP"=>"ISCC.exe",
 "SNAPSHOT"=>"tar"
 );
@@ -142,6 +142,7 @@ $FILENAMETGZ         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEXZ          = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEDEB         = "see later";
+$FILENAMEAPS         = "$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 # For RPM
 $ARCH='noarch';
@@ -357,16 +358,16 @@ if ($nboftargetok) {
 		}
 		else
 		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'. But you can regenerate it with command:\n";
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with command:'\n";
 		}
 		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 		{
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		else			# For a maintenance release
 		{
 			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 			
 		}
 		print "\n";
@@ -387,18 +388,7 @@ if ($nboftargetok) {
 	#-----------------------
 	if ($CHOOSEDTARGET{'-CHKSUM'})
 	{
-		chdir("$SOURCE");
-
-		$ret=`git ls-files . --exclude-standard --others`;
-		if ($ret)
-		{
-				print "Some files exists in source directory and are not indexed neither excluded in .gitignore.\n";
-				print $ret;
-				print "Canceled.\n";
-				exit;
-		}
-		
-	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
 	  	print $ret."\n";
 	  	# Copy to final dir
@@ -533,21 +523,12 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 
 		# Security to avoid to package data files 
-        print "Remove documents dir\n";
 		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-        
-        print "Remove subdir of custom dir\n";
-   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
-   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs, even symbolic links, but not files
 
 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/abricot*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
@@ -562,14 +543,12 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nomenclature*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/of/`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/oscim*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
@@ -581,7 +560,7 @@ if ($nboftargetok) {
    	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
+        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
@@ -600,8 +579,6 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
@@ -615,6 +592,13 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+        
+        
+        print "Remove subdir of custom dir\n";
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs, even symbolic links, but not files
 	}
 
 	# Build package for each target
@@ -708,7 +692,7 @@ if ($nboftargetok) {
 			print "Go to directory $BUILDROOT\n";
 			$olddir=getcwd();
 			chdir("$BUILDROOT");
-			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEXZ.xz \*";
+			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
 			print $cmd."\n";
 			$ret= `$cmd`;
 			chdir("$olddir");
@@ -785,8 +769,8 @@ if ($nboftargetok) {
 			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
 			$ret=`$cmd`;
 
-			# Removed files we don't need (already removed before)
-			#$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
 
 			print "Set permissions on files/dir\n";
 			$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@@ -935,8 +919,8 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
 			
-			# Removed files we don't need (already removed)
-			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
 			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
@@ -998,7 +982,7 @@ if ($nboftargetok) {
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/actions_mymodule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_mymodule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/mymoduleindex.php`;
@@ -1049,6 +1033,92 @@ if ($nboftargetok) {
 			next;
 		}
 		
+		if ($target eq 'APS') 
+		{
+			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
+				mkdir($DESTI.'/package_aps');
+				if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
+			} 
+			
+			$newbuild = $BUILD;
+			$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+			$newbuild =~ s/beta/1/gi;                       # beta
+			$newbuild =~ s/rc./2/gi;                        # rc
+			if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+			# now newbuild is 0-0 or 0-3 for example
+			$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+			if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			
+			print "Remove target $FILENAMEAPS.zip...\n";
+			unlink "$NEWDESTI/$FILENAMEAPS.zip";
+
+			#rmdir "$BUILDROOT/$PROJECT.tmp";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+			$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
+
+            $APSVERSION="1.2";
+            print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
+            open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
+            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
+            while (<SPECFROM>) {
+                $newbuild = $BUILD;
+                $newbuild =~ s/(dev|alpha)/0/gi;                # dev
+                $newbuild =~ s/beta/1/gi;                       # beta
+                $newbuild =~ s/rc./2/gi;                        # rc
+                if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+                # now newbuild is 0-0 or 0-3 for example
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+            print "Version set to $MAJOR.$MINOR.$newbuild\n";
+            $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
+            $ret=`$cmd`;
+            $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
+            $ret=`$cmd`;
+ 
+            print "Remove other files\n";
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
+            
+            print "Build APP-LIST.xml files\n";
+            
+            print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
+ 
+            print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
+            $olddir=getcwd();
+            chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
+            $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
+            print $cmd."\n";
+            $ret= `$cmd`;
+            chdir("$olddir");
+                        
+    		# Move to final dir
+            print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
+            $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
+            next;
+    	}
+
 		if ($target eq 'EXEDOLIWAMP')
 		{
 			$NEWDESTI=$DESTI;
@@ -1070,7 +1140,7 @@ if ($nboftargetok) {
     		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
 
     		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
-    		$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+    		$cmd= "ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";

build/makepack-howto.txt

@@ -43,9 +43,9 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
 - Run makepack-dolibarr.pl to generate all packages.
 
 - Check content of built packages.
+- Move build files into www.dolibarr.org web site
+  (/home/dolibarr/wwwroot/files/stable).
 
-- Run makepack-dolibarr.pl again with option to publish files on 
-  dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
 - Run makepack-dolibarr.pl again with option to publish files on 
   sourceforge. This will also add official tag.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2018 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2017 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
+return ( "5.0.4", "4.0.6", "3.9.4" );
 }
 
 sub script_dolibarr_release
@@ -263,16 +263,15 @@ if ($upgrade) {
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
-			  [ "installlock", "444" ],
 			 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory. (deprecated)
-	# local $dinstall = "$opts->{'dir'}/install";
-	# $dinstall  =~ s/\/$//;
-	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# Remove the installation directory.
+	local $dinstall = "$opts->{'dir'}/install";
+	$dinstall  =~ s/\/$//;
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	
 	}
 else {
@@ -307,18 +306,15 @@ else {
 			  [ "login", "admin" ],
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
-			  [ "installlock", "444" ],
 	 		 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory (deprecated)
-	# local $dinstall = "$opts->{'dir'}/install";
-	# $dinstall  =~ s/\/$//;
-	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
-	
-	# Protect config file
+	# Remove the installation directory and protect config file.
+	local $dinstall = "$opts->{'dir'}/install";
+	$dinstall  =~ s/\/$//;
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	&set_permissions_as_domain_user($d, 0644, $cfile);
 	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
@@ -390,18 +386,14 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 6.0 ? "dolibarr\\-(6\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 4.0 ? "dolibarr\\-(4\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.9 ? "dolibarr\\-(3\\.9\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.8 ? "dolibarr\\-(3\\.8\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.7 ? "dolibarr\\-(3\\.7\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.6 ? "dolibarr\\-(3\\.6\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.5 ? "dolibarr\\-(3\\.5\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 4.0 ? "dolibarr\\-(4\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.9 ? "dolibarr\\-(3\\.9\\.[0-9\\.]+)\\.tgz" :
+		$ver >= 3.8 ? "dolibarr\\-(3\\.8\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.7 ? "dolibarr\\-(3\\.7\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.6 ? "dolibarr\\-(3\\.6\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.5 ? "dolibarr\\-(3\\.5\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
                               "dolibarr\\-(2\\.8\\.[0-9\\.]+)\\.tgz");
 return "Failed to find versions" if (!@vers);
 return $ver eq $vers[0] ? undef : $vers[0];

build/rpm/dolibarr-forrpm.patch

@@ -15,7 +15,21 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -74,8 +74,8 @@
+@@ -71,8 +71,8 @@
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Load conf file if it is already defined
+diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
+--- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
++++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems

build/rpm/dolibarr_fedora.spec

@@ -25,7 +25,7 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 #BuildRequires: desktop-file-utils
 
@@ -160,7 +160,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
@@ -177,11 +176,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -214,12 +210,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_generic.spec

@@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 BuildRequires: desktop-file-utils
 %else
@@ -54,7 +54,7 @@ BuildRequires: desktop-file-utils
 Group: Applications/Productivity
 Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
 Requires: mysql, mysql-client 
-%else%_datadir/dolibarr/htdocs/datapolicy
+%else
 %if 0%{?suse_version}
 # Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
 Group: Productivity/Office/Management
@@ -63,9 +63,9 @@ Requires: mysql-community-server, mysql-community-server-client
 BuildRequires: update-desktop-files fdupes
 %else
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap 
 Requires: mysql-server, mysql 
-Requires: php-mysqli >= 4.1.0 
+Requires: php-mysql >= 4.1.0 
 %endif
 %endif
 %endif
@@ -124,7 +124,7 @@ cui hai bisogno ed essere facile da usare.
 
 %if 0%{?sles_version}
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%_datadir/dolibarr/htdocs/datapolicy
+%{__mkdir} $RPM_BUILD_ROOT
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %else
@@ -240,7 +240,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
@@ -257,11 +256,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -294,12 +290,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
@@ -447,8 +441,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
 %else
   echo Add SE Linux permissions for dolibarr
   # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-  semanage fcontext -a -t httpd_sys_rw_content_t "/etc/dolibarr(/.*)?"
-  semanage fcontext -a -t httpd_sys_rw_content_t "/var/lib/dolibarr(/.*)?"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
   restorecon -R -v /etc/dolibarr
   restorecon -R -v /var/lib/dolibarr
 %endif

build/rpm/dolibarr_mandriva.spec

@@ -157,7 +157,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
@@ -174,11 +173,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -211,12 +207,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_opensuse.spec

@@ -168,7 +168,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
@@ -185,11 +184,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -222,12 +218,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/httpd-dolibarr.conf

@@ -15,14 +15,8 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 
 # Directory for web pages
 <DirectoryMatch /usr/share/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order deny,allow
-    Allow from all
-  </IfVersion>
-
+  Order deny,allow
+  Allow from all
   DirectoryIndex index.php
   Options +FollowSymLinks +Indexes
 
@@ -66,51 +60,27 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 
 # Directory for public pages
 <DirectoryMatch /usr/share/dolibarr/public>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>
 
 # Config files
 <DirectoryMatch /etc/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+	AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-	AllowOverride All
 </DirectoryMatch>
 
 # Directory for data files
 <DirectoryMatch /usr/share/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>
 <DirectoryMatch /var/lib/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order allow,deny
-    Allow from all
-  </IfVersion>
-
     AllowOverride All
+    Order deny,allow
+    Allow from all
 </DirectoryMatch>
 

build/travis-ci/apache.conf

@@ -1,11 +1,11 @@
 <VirtualHost *:80>
   DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
-  ErrorLog /var/log/apache2/travis_error_log
 
-  <Directory "%TRAVIS_BUILD_DIR%/htdocs/">
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Require all granted
+    Order deny,allow
+    Allow from all
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
@@ -14,9 +14,5 @@
     Action php5-fcgi /php5-fcgi
     Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
     FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-    
-    <Directory /usr/lib/cgi-bin>
-        Require all granted
-    </Directory>
   </IfModule>
 </VirtualHost>

composer.json

@@ -13,7 +13,7 @@
     	"agenda"
     ],
     "homepage": "https://www.dolibarr.org",
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0+",
     "support": {
         "issues": "https://github.com/Dolibarr/dolibarr/issues",
         "forum": "https://www.dolibarr.org/forum",

dev/dolibarr_changes.txt

@@ -1,5 +1,5 @@
 
-This file describes changes made on external libraries after being included
+This file describe changes made on external library after beeing included
 in Dolibarr root.
 
 
@@ -48,23 +48,6 @@ into
 	// initialize subsetchars
 	$subsetchars = array_fill(0, 256, true);
 
-* Replace the continue into switch with a break:
-
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		continue;
-	}
-
-into 
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		break;
-	}
-
 * Optionnaly, removed all fonts except 
     dejavusans* (used by greek, arab, persan, romanian, turkish), 
     freemono* (russian), 
@@ -78,24 +61,17 @@ In htdocs/includes/tcpdf/tcpdf.php
 +       protected $default_monospaced_font = 'freemono';
 
 
-		
 
 TCPDI:
 ------
 Add fpdf_tpl.php 1.2
 Add tcpdi.php
-
 Add tcpdi_parser.php and replace:
 require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
 with:
 require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
 
-* Fix by replacing
-	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
-with
-	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
-
 
 
 JSGANTT:
@@ -106,21 +82,7 @@ with
 // LDR To open in same window
 //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 window.location.href=pRef
-
-* Replace
-vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());
-with                       
-var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
-vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
-vTmpNode.setAttribute('href',vTaskList[i].getLink());
-                        
-* Replace '% Comp.' to have a smaller text column header
-'comp':'% Comp.'
-with
-'comp':'%'
-
-
-
+* Replace hard coded string with i18n["String"];
 
 
 JCROP:
@@ -148,45 +110,11 @@ to get
         if ($className == 'Luracast\Restler\string') return;
         if ($className == 'Luracast\Restler\mixed') return;
 		...
-
-Change also file Luracast/Restler/explorer/index.html
-
-+With swagger 2:
-
-* Add line into Util.php to complete function
-
-    public static function getShortName($className)
-    {
-    	// @CHANGE LDR
-    	if (! is_string($className)) return;
-    	//var_dump($className);
-
     	
     	
 PARSEDOWN
 ---------
 
-* Add support of css by adding in Parsedown.php:
-
-	// @CHANGE LDR
-	'class' => $Link['element']['attributes']['class'] 
-
-	...
-	
-	// @CHANGE LDR
-    if (preg_match('/{([^}]+)}/', $remainder, $matches2))
-    {
-        $Element['attributes']['class'] = $matches2[1];
-       	$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
-    }
-
-
-	// @CHANGE LDR
-	//$markup .= $this->{$Element['handler']}($Element['text']);
-	$markup .= preg_replace('/>{[^}]+}/', '>', $this->{$Element['handler']}($Element['text']));
-
-
-
 * Fix to avoid fatal error when mb_strlen not available:
 
 	// @CHANGE LDR Fix when mb_strlen is not available
@@ -194,6 +122,7 @@ PARSEDOWN
 	if (function_exists('mb_strlen')) $len = mb_strlen($line, 'utf-8');
 	else $len = strlen($line);
 	$shortage = 4 - $len % 4;
+                	
 
 
 JEDITABLE.JS
@@ -202,3 +131,4 @@ JEDITABLE.JS
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />
 
+

dev/examples/code/create_invoice.php

@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 // Create invoice object
 $obj = new Facture($db);

dev/examples/code/create_order.php

@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 // Create order object
 $com = new Commande($db);

dev/examples/code/create_product.php

@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 // Create instance of object
 $myproduct=new Product($db);

dev/examples/code/create_user.php

@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -58,16 +58,16 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php";
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
-// Create user object
+// Create invoice object
 $obj = new User($db);
 //$obj->initAsSpecimen();
 
 $obj->login = 'ABCDEF';
 $obj->nom   = 'ABCDEF';
 
-// Create user
+// Create invoice
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {

dev/examples/code/get_contracts.php

@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -65,9 +65,9 @@ print 'Argument id_thirdparty='.$argv[1]."\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
+require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
-// Create contract object
+// Create invoice object
 $obj = new Contrat($db);
 $obj->socid=$argv[1];
 

dev/examples/ldap/ldapsearch_sample1.txt

@@ -7,7 +7,3 @@
 # ldapsearch -h hostname -x -b "ou=people,dc=teclib,dc=infra"
 # ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
 # ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
-#
-# Example to test a ldap search: 
-# ldapsearch -h hostname -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
-

dev/examples/mail/dolibarr_mail_simpleHTML.txt

@@ -4,4 +4,4 @@ X-Mailer: Dolibarr version 2.7.0-beta (using php mail)
 MIME-Version: 1.0
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-<html><head><title></title></head><body>Test&eacute;<br>fdsfsdf<br>fsdf<strong>sfd</strong>s<br>fssdfsd<br></body></html>
+<html><head><title></title></head><body>Test&eacute;<br />fdsfsdf<br />fsdf<strong>sfd</strong>s<br />fssdfsd<br /></body></html>

dev/initdata/generate-invoice.php

@@ -32,9 +32,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
-require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
-require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require (__DIR__. '/../../htdocs/master.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 
 /*
@@ -185,4 +185,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 	{
 		dol_print_error($db,$object->error);
 	}
+
 }
+
+

dev/initdata/generate-order.php

@@ -33,14 +33,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 
 /*

dev/initdata/generate-product.php

@@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/generate-proposal.php

@@ -33,11 +33,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
-require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
-require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
-require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
-require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require (__DIR__. '/../../htdocs/master.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 /*
  * Parameters
@@ -157,7 +157,7 @@ $user->rights->propal->propal_advance->validate=1;
 
 if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
+	require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php");
 }
 
 $i=0;
@@ -218,4 +218,6 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	{
 		dol_print_error($db,$object->error);
 	}
+
 }
+

dev/initdata/generate-thirdparty.php

@@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require (__DIR__. '/../../htdocs/master.inc.php');
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

dev/initdata/import-products.php

@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-product.php
- *		\brief      Script example to insert products from a csv file.
+ *		\brief      Script example to insert products from a csv file. 
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 $path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
-require $path."../../htdocs/master.inc.php";
+require ($path."../../htdocs/master.inc.php");
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -118,22 +118,22 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
     $errorrecord=0;
-
+    
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
-
+    
     $nboflines++;
-
+    
     $produit = new Product($db);
     $produit->type = 0;
     $produit->status = 1;
     $produit->ref = trim($fields[0]);
-
+    
     print "Process line nb ".$i.", ref ".$produit->ref;
     $produit->label = trim($fields[2]);
     $produit->description = trim($fields[4]."\n".($fields[5] ? $fields[5].' x '.$fields[6].' x '.$fields[7] : ''));
     $produit->volume = price2num($fields[8]);
-    $produit->volume_unit = 0;
+    $produit->volume_unit = 0;     
     $produit->weight = price2num($fields[9]);
     $produit->weight_units = 0;          // -3 = g
 
@@ -142,9 +142,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 
     $produit->status = 1;
     $produit->status_buy = 1;
-
+    
     $produit->finished = 1;
-
+    
     $produit->price_min = null;
     $produit->price_min_ttc = null;
     $produit->price = price2num($fields[11]);
@@ -152,25 +152,25 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $produit->price_base_type = 'TTC';
     $produit->tva_tx = price2num($fields[13]);
     $produit->tva_npr = 0;
-
+    
     $produit->cost_price = price2num($fields[16]);
-
+    
     // Extrafields
     $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
-
+    
     $ret=$produit->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else
+	else 
 	{
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
 	dol_syslog("Add prices");
-
+	
     // If we use price level, insert price for each level
 	if (! $errorrecord && 1)
 	{
@@ -181,14 +181,14 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
+    	else 
     	{
     	    print " - updatePrice OK";
     	}
 	}
-
+	
 	dol_syslog("Add multilangs");
-
+	
 	// Add alternative languages
 	if (! $errorrecord && 1)
 	{
@@ -201,15 +201,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
+    	else 
     	{
     	    print " - setMultiLangs OK";
     	}
 	}
-
+	
 	print "\n";
-
-	if ($errorrecord)
+	
+	if ($errorrecord) 
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset

dev/initdata/import-thirdparties.php

@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-thirdparties.php
- *		\brief      Script example to insert thirdparties from a csv file.
+ *		\brief      Script example to insert thirdparties from a csv file. 
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 $path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]);
-require $path."../../htdocs/master.inc.php";
+require ($path."../../htdocs/master.inc.php");
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -123,15 +123,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     if ($endlinenb && $i > $endlinenb) continue;
 
     $nboflines++;
-
+    
     $object = new Societe($db);
     $object->state = $fields[6];
     $object->client = $fields[7];
     $object->fournisseur = $fields[8];
-
+    
     $object->name = $fields[13]?trim($fields[13]):$fields[0];
     $object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
-
+    
     $object->address = trim($fields[14]);
     $object->zip = trim($fields[15]);
     $object->town = trim($fields[16]);
@@ -149,7 +149,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         $condpayment = trim($fields[36]);
         if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
         if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
-        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
+        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
         if (empty($object->cond_reglement_id))
         {
             print " - Error cant find payment mode for ".$condpayment."\n";
@@ -166,7 +166,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     // Set price level
     $object->price_level = 1;
     if ($labeltype == 'Revendeur') $object->price_level = 2;
-
+    
     print "Process line nb ".$i.", name ".$object->name;
 
 
@@ -182,7 +182,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
+    	else 
     	{
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
@@ -198,7 +198,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	if (! $errorrecord && $fields[3])
 	{
     	$salesrep=new User($db);
-
+    	
     	$tmp=explode(' ',$fields[3],2);
     	$salesrep->firstname = trim($tmp[0]);
     	$salesrep->lastname = trim($tmp[1]);
@@ -206,7 +206,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	else $salesrep->login=strtolower($salesrep->firstname);
     	$salesrep->login=preg_replace('/ /','',$salesrep->login);
     	$salesrep->fetch(0,$salesrep->login);
-
+    
     	$result = $object->add_commercial($user, $salesrep->id);
     	if ($result < 0)
     	{
@@ -217,14 +217,14 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - create link sale representative OK";
     	}
-	}
-
+	}	
+	
 	dol_syslog("Add invoice contacts");
 	// Insert an invoice contact if there is an invoice email != standard email
 	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
 	{
 	    $ret1=$ret2=0;
-
+	    
 	    $contact = new Contact($db);
 	    $contact->lastname = $object->name;
 	    $contact->address=$object->address;
@@ -233,7 +233,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact->country_id=$object->country_id;
 	    $contact->email=$fields[27];
 	    $contact->socid=$object->id;
-
+	    
 	    $ret1=$contact->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -244,18 +244,18 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
+    	else 
     	{
     	    print " - create contact OK";
     	}
 	}
-
+	
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
 	if (! $errorrecord && $fields[47])
 	{
 	    $ret1=$ret2=0;
-
+	    
 	    $contact2 = new Contact($db);
 	    $contact2->lastname = 'Service livraison - '.$fields[47];
 	    $contact2->address = $fields[48];
@@ -264,10 +264,10 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
 	    $contact2->note_public=$fields[54];
 	    $contact2->socid=$object->id;
-
+	    
 	    // Extrafields
 	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
-
+	    
 	    $ret1=$contact2->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -278,16 +278,16 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
+    	else 
     	{
     	    print " - create contact OK";
     	}
 	}
-
+	
 
 	print "\n";
-
-	if ($errorrecord)
+	
+	if ($errorrecord) 
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset

dev/initdata/import-users.php

@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-thirdparties.php
- *		\brief      Script example to insert thirdparties from a csv file.
+ *		\brief      Script example to insert thirdparties from a csv file. 
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 $path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
-require $path."../../htdocs/master.inc.php";
+require ($path."../../htdocs/master.inc.php");
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -118,15 +118,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
     $errorrecord=0;
-
+    
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
-
+    
     $nboflines++;
-
+    
     $object = new User($db);
     $object->statut = 1;
-
+    
     $tmp=explode(' ',$fields[3],2);
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
@@ -134,23 +134,23 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     else $object->login=strtolower($object->firstname);
     $object->login=preg_replace('/ /','',$object->login);
     $object->password = 'init';
-
+    
     print "Process line nb ".$i.", login ".$object->login;
-
+    
     $ret=$object->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
     }
-	else
+	else 
 	{
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
 	print "\n";
-
-	if ($errorrecord)
+	
+	if ($errorrecord) 
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset

dev/initdata/purge-data.php

@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Recupere root dolibarr
 $path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
-require $path."../../htdocs/master.inc.php";
+require ($path."../../htdocs/master.inc.php");
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -44,7 +44,8 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-$langs->loadLangs(array("main", "errors"));
+$langs->load("main");
+$langs->load("errors");
 
 // Global variables
 $version=DOL_VERSION;
@@ -77,17 +78,15 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'propal',
     ),
-    'supplier_proposal'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
-    ),
-	'supplier_order'=>array(
+    'supplier_order'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
     ),
-	'supplier_invoice'=>array(
+    'supplier_invoice'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
     ),
     'delivery'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
@@ -115,10 +114,8 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
     ),
     'project'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
@@ -131,13 +128,12 @@ $sqls=array(
     ),
     'thirdparty'=>array(
         '@contact',
-        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons',
+        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
         'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
-        'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
     )
 );
 
@@ -156,37 +152,27 @@ $mode = $argv[1];
 $option = $argv[2];
 
 if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
     print "\n";
     print "option can be ".implode(',',array_keys($sqls))."\n";
     exit(-1);
 }
 
 if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
     print "\n";
     print "option can be ".implode(',',array_keys($sqls))."\n";
     exit(-1);
 }
 
-// Replace database handler
-if (! empty($argv[3]))
-{
-	$db->close();
-	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
-}
 
-//var_dump($user->db->database_name);
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'An admin user with login "admin" must exists to use this script.'."\n";
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
 }
-//$user->getrights();
-
+$user->getrights();
 
 print "Purge all data for this database:\n";
 print "Server = ".$db->database_host."\n";
@@ -204,14 +190,14 @@ if (! $confirmed)
 
 /**
  * Process sql requests of a family
- *
+ * 
  * @param   string  $family     Name of family key of array $sqls
  * @return  int                 -1 if KO, 1 if OK
  */
 function processfamily($family)
 {
     global $db, $sqls;
-
+    
     $error=0;
     foreach($sqls[$family] as $sql)
     {
@@ -221,7 +207,7 @@ function processfamily($family)
             processfamily($newfamily);
             continue;
         }
-
+        
         print "Run sql: ".$sql."\n";
         $resql=$db->query($sql);
         if (! $resql)
@@ -231,7 +217,7 @@ function processfamily($family)
                 $error++;
             }
         }
-
+    
         if ($error)
         {
             print $db->lasterror();
@@ -239,7 +225,7 @@ function processfamily($family)
             break;
         }
     }
-
+    
     if ($error) return -1;
     else return 1;
 }
@@ -256,7 +242,7 @@ foreach($sqls as $family => $familysql)
     $oldfamily = $family;
 
     $result=processfamily($family);
-    if ($result < 0)
+    if ($result < 0) 
     {
         $error++;
         break;

dev/initdemo/documents_demo/custom/main.inc.php

@@ -0,0 +1,3 @@
+<?php
+// Wrapper to include main into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/main.inc.php';

dev/initdemo/documents_demo/custom/master.inc.php

@@ -0,0 +1,3 @@
+<?php
+// Wrapper to include master into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/master.inc.php';

dev/initdemo/documents_demo/medias/README.txt

@@ -1,2 +0,0 @@
-# File(s) into root medias directory are provide by Pixabay with Licence "CC0 Creative Commons"
-# https://creativecommons.org/publicdomain/zero/1.0/

dev/initdemo/initdemo.sh

@@ -6,11 +6,11 @@
 # WARNING: This script erase all data of database
 # with data into dump file
 #
-# Regis Houssin       - regis.houssin@inodbox.com
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
-# Usage: initdemo.sh confirm 
-# usage: initdemo.sh confirm mysqldump_dolibarr_x.x.x.sql database port login pass
+# Usage: initdemo.sh
+# usage: initdemo.sh mysqldump_dolibarr_x.x.x.sql database port login pass
 #------------------------------------------------------
 
 
@@ -31,20 +31,11 @@ fi
 
 
 # ----------------------------- command line params
-confirm=$1;
-dumpfile=$2;
-base=$3;
-port=$4;
-admin=$5;
-passwd=$6;
-
-# ----------------------------- check params
-if [ "x$confirm" != "xconfirm" ]
-then
-	echo "----- $0 -----"
-	echo "Usage: initdemo.sh confirm [mysqldump_dolibarr_x.x.x.sql database port login pass]"
-	exit
-fi
+dumpfile=$1;
+base=$2;
+port=$3;
+admin=$4;
+passwd=$5;
 
 
 # ----------------------------- if no params on command line
@@ -141,14 +132,11 @@ then
 	exit;;
 	esac
 	
-	
-	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
-
 
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Init Dolibarr with demo values" --clear \
-	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
 	
 	case $? in
 	        0)      echo "Ok, start process...";;
@@ -177,44 +165,14 @@ export res=$?
 export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
 if [ "x$documentdir" != "x" ]
 then
-	$DIALOG --title "Reset document directory tpp" --clear \
-	        --inputbox "Delete and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
-	
-	valret=$?
-	
-	case $valret in
-	  0)
-	rep=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
-	esac
-	
-	echo "rep=$rep"
-	if [ "x$rep" = "xy" ]; then
-		echo rm -fr "$documentdir/*"
-		rm -fr $documentdir/*
-	fi
-		
 	echo cp -pr $mydir/documents_demo/* "$documentdir/"
 	cp -pr $mydir/documents_demo/* "$documentdir/"
-	
-	mkdir "$documentdir/doctemplates/" 2>/dev/null
 	echo cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
 	cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
-	
-	echo cp -pr $mydir/../../htdocs/install/medias/* "$documentdir/medias/image/"
-	cp -pr $mydir/../../htdocs/install/medias/* "$documentdir/medias/image/"
-
-	mkdir -p "$documentdir/ecm/Administrative documents" 2>/dev/null
-	mkdir -p "$documentdir/ecm/Images" 2>/dev/null
-	rm -f "$documentdir/doctemplates/"*/index.html
+	mkdir -p "$documentdir/ecm/Administrative documents"
+	mkdir -p "$documentdir/ecm/Images"
 	echo cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
 	cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
-	
-	chmod -R u+w "$documentdir/"
-	chown -R www-data "$documentdir/"
 else
 	echo Detection of documents directory from $mydir failed so demo files were not copied. 
 fi

dev/initdemo/removeconfdemo.sh

@@ -3,7 +3,7 @@
 # Script to remove setup of a Dolibarr installation.
 # Note: "dialog" tool need to be available.
 #
-# Regis Houssin       - regis.houssin@inodbox.com
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # WARNING: This script erase setup of instance, 

dev/initdemo/savedemo.sh

@@ -3,7 +3,7 @@
 # Script to extrac a database with demo values.
 # Note: "dialog" tool need to be available if no parameter provided.
 #
-# Regis Houssin       - regis.houssin@inodbox.com
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # Usage: savedemo.sh
@@ -171,8 +171,6 @@ export list="
     --ignore-table=$base.llx_abonne_extrafields 
     --ignore-table=$base.llx_abonne_type
     --ignore-table=$base.llx_abonnement 
-    --ignore-table=$base.llx_accountingaccount 
-    --ignore-table=$base.llx_accountingsystem 
     --ignore-table=$base.llx_advanced_extrafields 
     --ignore-table=$base.llx_advanced_extrafields_options 
     --ignore-table=$base.llx_advanced_extrafields_values
@@ -191,9 +189,6 @@ export list="
 	--ignore-table=$base.llx_c_dolicloud_plans
 	--ignore-table=$base.llx_c_pays
 	--ignore-table=$base.llx_c_source
-	--ignore-table=$base.llx_c_ticketsup_category
-	--ignore-table=$base.llx_c_ticketsup_severity
-	--ignore-table=$base.llx_c_ticketsup_type
 	--ignore-table=$base.llx_cabinetmed_c_banques
 	--ignore-table=$base.llx_cabinetmed_c_ccam
 	--ignore-table=$base.llx_cabinetmed_c_examconclusion
@@ -251,8 +246,6 @@ export list="
 	--ignore-table=$base.llx_residence
 	--ignore-table=$base.llx_residence_building
 	--ignore-table=$base.llx_residence_building_links
-	--ignore-table=$base.llx_societe_rib2
-	--ignore-table=$base.llx_ticketsup
 	--ignore-table=$base.llx_ultimatepdf
 	--ignore-table=$base.llx_update_modules
 	--ignore-table=$base.llx_ventilation_achat

dev/initdemo/sftpget_and_loaddump.php

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
- *
+ * 
  * Get a distant dump file and load it into a mysql database
  */
 
@@ -41,15 +41,15 @@ $passwordbase=isset($argv[6])?$argv[6]:'';
 
 // Include Dolibarr environment
 $res=0;
-if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php";
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php";
-if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php";
-if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php";
-if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php";
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
+if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
+if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
+if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
+if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
 if (! $res) die ("Failed to include master.inc.php file\n");
-include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 
 /*
@@ -92,7 +92,7 @@ if ($connection)
 {
 	if (! @ssh2_auth_password($connection, $login, $password))
 	{
-		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
+		dol_syslog("Could not authenticate with username ".$login." . and password ".$password,LOG_ERR);
 		exit(-5);
 	}
 	else

dev/initdemo/updatedemo.php

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
- *
+ * 
  * Get a distant dump file and load it into a mysql database
  */
 
@@ -36,15 +36,15 @@ $confirm=isset($argv[1])?$argv[1]:'';
 
 // Include Dolibarr environment
 $res=0;
-if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php";
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php";
-if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php";
-if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php";
-if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php";
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
+if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
+if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
+if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
+if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
 if (! $res) die ("Failed to include master.inc.php file\n");
-include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 
 /*
@@ -74,7 +74,7 @@ $tables=array(
 
 $year=2010;
 $currentyear=$tmp['year'];
-while ($year <= $currentyear)
+while ($year <= $currentyear) 
 {
     //$year=2021;
     $delta=($currentyear - $year);
@@ -84,7 +84,7 @@ while ($year <= $currentyear)
     {
         foreach($tables as $tablekey => $tableval)
         {
-            print "\nCorrect ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
+            print "\nCorrect ".$tablekey." for year ".$year." and move them to current year ".$currentyear." "; 
             $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
             //$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()";
             $resql = $db->query($sql);
@@ -110,14 +110,14 @@ while ($year <= $currentyear)
                         //print $sql2."\n";
                         $resql2 = $db->query($sql2);
                         if (! $resql2) dol_print_error($db);
-                    }
+                    }            
                     $i++;
                 }
             }
             else dol_print_error($db);
         }
     }
-
+    
     $year++;
 }
 

dev/resources/dbmodel/dolibarr.uml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_qb8akM37EdqwVrslYOdUDA">
+  <packagedElement xmi:type="uml:Package" xmi:id="_w8IxIM37EdqwVrslYOdUDA" name="dolibarr">
+    <packagedElement xmi:type="uml:Package" xmi:id="_T5aZ4FK9Ed60vaZbVikprw" name="OrdersModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_ZhuGMlK9Ed60vaZbVikprw" name="InvoiceModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_cf3SUlK9Ed60vaZbVikprw" name="UserModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_maM0glK9Ed60vaZbVikprw" name="FoundationModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_oqTO4lK9Ed60vaZbVikprw" name="ContractsModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_rEq_klK9Ed60vaZbVikprw" name="ProposalsModule"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_vxYmUlK9Ed60vaZbVikprw" name="EMailingManagement"/>
+  </packagedElement>
+</uml:Model>

dev/resources/dbmodel/dolibarr.umldi

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<diagrams:Diagrams xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.topcased.org/DI/1.0" xmlns:diagrams="http://www.topcased.org/Diagrams/1.0" xmi:id="_SI6FkFK9Ed60vaZbVikprw" activeDiagram="_SI6FkVK9Ed60vaZbVikprw">
+  <model href="dolibarr.uml#_w8IxIM37EdqwVrslYOdUDA"/>
+  <diagrams xmi:id="_SI6FkVK9Ed60vaZbVikprw" position="0,0" size="100,100" name="dolibarr" viewport="0,0">
+    <property xmi:id="_SJ9OcFK9Ed60vaZbVikprw" key="pageFormatName" value="A4"/>
+    <property xmi:id="_SJ9OcVK9Ed60vaZbVikprw" key="diagramWidth" value="840"/>
+    <property xmi:id="_SJ9OclK9Ed60vaZbVikprw" key="diagramHeight" value="1188"/>
+    <property xmi:id="_SJ9Oc1K9Ed60vaZbVikprw" key="pageMarginName" value="Small Margin"/>
+    <property xmi:id="_SJ9OdFK9Ed60vaZbVikprw" key="diagramTopMargin" value="20"/>
+    <property xmi:id="_SJ9OdVK9Ed60vaZbVikprw" key="diagramBottomMargin" value="20"/>
+    <property xmi:id="_SJ9OdlK9Ed60vaZbVikprw" key="diagramLeftMargin" value="20"/>
+    <property xmi:id="_SJ9Od1K9Ed60vaZbVikprw" key="diagramRightMargin" value="20"/>
+    <property xmi:id="_SJ9OeFK9Ed60vaZbVikprw" key="orientation" value="portrait"/>
+    <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_SI6FklK9Ed60vaZbVikprw" presentation="org.topcased.modeler.uml.classdiagram">
+      <element href="dolibarr.uml#_w8IxIM37EdqwVrslYOdUDA"/>
+    </semanticModel>
+    <contained xsi:type="di:GraphNode" xmi:id="_T2b-YFK9Ed60vaZbVikprw" position="15,190" size="176,81">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_T2b-YVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_T5aZ4FK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_ZhuGMFK9Ed60vaZbVikprw" position="15,118" size="177,68">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_ZhuGMVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_ZhuGMlK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_cf3SUFK9Ed60vaZbVikprw" position="15,10" size="174,81">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_cf3SUVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_cf3SUlK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_maM0gFK9Ed60vaZbVikprw" position="291,118" size="145,73">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_maM0gVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_maM0glK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_oqTO4FK9Ed60vaZbVikprw" position="15,274" size="179,80">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_oqTO4VK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_oqTO4lK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_rEq_kFK9Ed60vaZbVikprw" position="15,358" size="181,73">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_rEq_kVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_rEq_klK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di:GraphNode" xmi:id="_vxYmUFK9Ed60vaZbVikprw" position="15,490" size="181,80">
+      <semanticModel xsi:type="di:EMFSemanticModelBridge" xmi:id="_vxYmUVK9Ed60vaZbVikprw" presentation="default">
+        <element href="dolibarr.uml#_vxYmUlK9Ed60vaZbVikprw"/>
+      </semanticModel>
+    </contained>
+  </diagrams>
+</diagrams:Diagrams>

dev/resources/iso-normes/accountancy_rules.txt

@@ -1,14 +0,0 @@
-
-Gestion escompte:
-
-Sur une facture de 120 € TTC :
-707xxx                 100 € HT
-44571x                 20 € TVA
-411xxx    120 € TTC
- 
-Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
-665000     3,00 € HT
-44571x     0,60 € TVA
-411xxx                 3.60 € TVA
- 
-Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.

dev/resources/iso-normes/code_nace.txt

@@ -1 +0,0 @@
-http://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=FR&StrLayoutCode=#

dev/resources/iso-normes/sample_FEC_file.txt

@@ -11,25 +11,3 @@ Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/
 Banque	Banque	17306	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
 Banque	Banque	17307	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170131		
 Banque	Banque	17307	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170131		
-
-
-
-
-
-
-Other example
-JournalCode	JournalLib	EcritureNum	EcritureDate	CompteNum	CompteLib	CompAuxNum	CompAuxLib	PieceRef	PieceDate	EcritureLib	Debit	Credit	EcritureLet	DateLet	ValidDate	Montantdevise	Idevise
-FAC	Factures clients	AB6/FAC/2017/0045	20171120	41110000	Clients - Ventes de biens ou de prestations de services	ID 2892	2 Et 3 Dimensions	-	20171120	/	1	0	0	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	70710000	Marchandises (ou groupe) A	ID 2892	2 Et 3 Dimensions	-	20171120	[AX] Activités Annexes	0	0	1	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	70710000	Marchandises (ou groupe) A	ID 2892	2 Et 3 Dimensions	-	20171120	[AX] Activités Annexes	0	0	1	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	41110000	Clients - Ventes de biens ou de prestations de services	ID 2892	2 Et 3 Dimensions	-	20171120	/	2	0	0	0			20171120
-OUV	Balance initiale	Balance initiale BRED	20171101	51215000	BRED			-	20171101	/	6201	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Crédit Coopératif Nation	20171101	51211000	Crédit Coopératif Nation			-	20171101	/	1364	20	0	0			20171101
-OUV	Balance initiale	Balance initiale TVA collectée (Taux Intermédiaire)	20171101	44571200	TVA collectée (Taux Intermédiaire)			-	20171101	/	0	0	147	4			20171101
-OUV	Balance initiale	Balance initiale TVA déductible intracommunautaire	20171101	44566200	TVA déductible intracommunautaire			-	20171101	/	18	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Capital souscrit - non appelé	20171101	10110000	Capital souscrit - non appelé			-	20171101	/	10	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Réserves statutaires ou contractuelles	20171101	10630000	Réserves statutaires ou contractuelles			-	20171101	/	0	0	10	0			20171101
-OUV	Balance initiale	Balance initiale Frais entrepreneurs	20171101	46750000	Frais entrepreneurs			-	20171101	/	0	0	100	0			20171101
-OUV	Balance initiale	Balance initiale Fournissseurs réglés par Coopaname	20171101	40100000	Fournissseurs réglés par Coopaname			-	20171101	/	0	0	4123	20			20171101
-OUV	Balance initiale	Balance initiale TVA sur autres biens et services	20171101	44566000	TVA sur autres biens et services			-	20171101	/	507	70	0	0			20171101
-OUV	Balance initiale	Balance initiale TVA en attente à 20%	20171101	44572200	TVA en attente à 20%			-	20171101	/	200	0	0	0			20171101

dev/resources/sepa/pain.001.001.03.xsd

@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--Generated by SWIFTStandards Workstation (build:R6.1.0.2) on 2009 Jan 08 17:30:53-->
-<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03">
-    <xs:element name="Document" type="Document"/>
-    <xs:complexType name="AccountIdentification4Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="IBAN" type="IBAN2007Identifier"/>
-                <xs:element name="Othr" type="GenericAccountIdentification1"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="AccountSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-        <xs:restriction base="xs:decimal">
-            <xs:minInclusive value="0"/>
-            <xs:fractionDigits value="5"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
-        <xs:simpleContent>
-            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{3,3}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="AddressType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="ADDR"/>
-            <xs:enumeration value="PBOX"/>
-            <xs:enumeration value="HOME"/>
-            <xs:enumeration value="BIZZ"/>
-            <xs:enumeration value="MLTO"/>
-            <xs:enumeration value="DLVY"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="AmountType3Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="InstdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-                <xs:element name="EqvtAmt" type="EquivalentAmount2"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="AnyBICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Authorisation1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="Authorisation1Code"/>
-                <xs:element name="Prtry" type="Max128Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Authorisation1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="AUTH"/>
-            <xs:enumeration value="FDET"/>
-            <xs:enumeration value="FSUM"/>
-            <xs:enumeration value="ILEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BaseOneRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BatchBookingIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-    <xs:complexType name="BranchAndFinancialInstitutionIdentification4">
-        <xs:sequence>
-            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification7"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="BranchData2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccount16">
-        <xs:sequence>
-            <xs:element name="Id" type="AccountIdentification4Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccountType2">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="CashAccountType4Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CashAccountType4Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CASH"/>
-            <xs:enumeration value="CHAR"/>
-            <xs:enumeration value="COMM"/>
-            <xs:enumeration value="TAXE"/>
-            <xs:enumeration value="CISH"/>
-            <xs:enumeration value="TRAS"/>
-            <xs:enumeration value="SACC"/>
-            <xs:enumeration value="CACC"/>
-            <xs:enumeration value="SVGS"/>
-            <xs:enumeration value="ONDP"/>
-            <xs:enumeration value="MGLD"/>
-            <xs:enumeration value="NREX"/>
-            <xs:enumeration value="MOMA"/>
-            <xs:enumeration value="LOAN"/>
-            <xs:enumeration value="SLRY"/>
-            <xs:enumeration value="ODFT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CategoryPurpose1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChargeBearerType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="SHAR"/>
-            <xs:enumeration value="SLEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Cheque6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqTp" type="ChequeType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqNb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqFr" type="NameAndAddress10"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DlvryMtd" type="ChequeDeliveryMethod1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DlvrTo" type="NameAndAddress10"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqMtrtyDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="MemoFld" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RgnlClrZone" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrtLctn" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChequeDelivery1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MLDB"/>
-            <xs:enumeration value="MLCD"/>
-            <xs:enumeration value="MLFA"/>
-            <xs:enumeration value="CRDB"/>
-            <xs:enumeration value="CRCD"/>
-            <xs:enumeration value="CRFA"/>
-            <xs:enumeration value="PUDB"/>
-            <xs:enumeration value="PUCD"/>
-            <xs:enumeration value="PUFA"/>
-            <xs:enumeration value="RGDB"/>
-            <xs:enumeration value="RGCD"/>
-            <xs:enumeration value="RGFA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ChequeDeliveryMethod1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ChequeDelivery1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChequeType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CCHQ"/>
-            <xs:enumeration value="CCCH"/>
-            <xs:enumeration value="BCHQ"/>
-            <xs:enumeration value="DRFT"/>
-            <xs:enumeration value="ELDR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ClearingSystemIdentification2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ClearingSystemMemberIdentification2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
-            <xs:element name="MmbId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ContactDetails2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CountryCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="CreditDebitCode">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRDT"/>
-            <xs:enumeration value="DBIT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CreditTransferTransactionInformation10">
-        <xs:sequence>
-            <xs:element name="PmtId" type="PaymentIdentification1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
-            <xs:element name="Amt" type="AmountType3Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="XchgRateInf" type="ExchangeRateInformation1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqInstr" type="Cheque6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="InstrForCdtrAgt" type="InstructionForCreditorAgent1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrForDbtrAgt" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RgltryRptg" type="RegulatoryReporting3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tax" type="TaxInformation3"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RltdRmtInf" type="RemittanceLocation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtInf" type="RemittanceInformation5"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceInformation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType3Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="CreditorReferenceType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CustomerCreditTransferInitiationV03">
-        <xs:sequence>
-            <xs:element name="GrpHdr" type="GroupHeader32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="PmtInf" type="PaymentInstructionInformation3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DateAndPlaceOfBirth">
-        <xs:sequence>
-            <xs:element name="BirthDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrvcOfBirth" type="Max35Text"/>
-            <xs:element name="CityOfBirth" type="Max35Text"/>
-            <xs:element name="CtryOfBirth" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DatePeriodDetails">
-        <xs:sequence>
-            <xs:element name="FrDt" type="ISODate"/>
-            <xs:element name="ToDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DecimalNumber">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="17"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Document">
-        <xs:sequence>
-            <xs:element name="CstmrCdtTrfInitn" type="CustomerCreditTransferInitiationV03"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DocumentAdjustment1">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rsn" type="Max4Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DocumentType3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="RADM"/>
-            <xs:enumeration value="RPIN"/>
-            <xs:enumeration value="FXDR"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="PUOR"/>
-            <xs:enumeration value="SCOR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="DocumentType5Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MSIN"/>
-            <xs:enumeration value="CNFA"/>
-            <xs:enumeration value="DNFA"/>
-            <xs:enumeration value="CINV"/>
-            <xs:enumeration value="CREN"/>
-            <xs:enumeration value="DEBN"/>
-            <xs:enumeration value="HIRI"/>
-            <xs:enumeration value="SBIN"/>
-            <xs:enumeration value="CMCN"/>
-            <xs:enumeration value="SOAC"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="BOLD"/>
-            <xs:enumeration value="VCHR"/>
-            <xs:enumeration value="AROI"/>
-            <xs:enumeration value="TSUT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="EquivalentAmount2">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element name="CcyOfTrf" type="ActiveOrHistoricCurrencyCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ExchangeRateInformation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="XchgRate" type="BaseOneRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RateTp" type="ExchangeRateType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrctId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ExchangeRateType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="SPOT"/>
-            <xs:enumeration value="SALE"/>
-            <xs:enumeration value="AGRD"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalAccountIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalCategoryPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalClearingSystemIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="5"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalFinancialInstitutionIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalLocalInstrument1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalOrganisationIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPersonIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalServiceLevel1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="FinancialIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalFinancialInstitutionIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="FinancialInstitutionIdentification7">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BIC" type="BICIdentifier"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysMmbId" type="ClearingSystemMemberIdentification2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="GenericFinancialIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericAccountIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max34Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="AccountSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericFinancialIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="FinancialIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericOrganisationIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="OrganisationIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericPersonIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="PersonIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GroupHeader32">
-        <xs:sequence>
-            <xs:element name="MsgId" type="Max35Text"/>
-            <xs:element name="CreDtTm" type="ISODateTime"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="Authstn" type="Authorisation1Choice"/>
-            <xs:element name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element name="InitgPty" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FwdgAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="IBAN2007Identifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ISODate">
-        <xs:restriction base="xs:date"/>
-    </xs:simpleType>
-    <xs:simpleType name="ISODateTime">
-        <xs:restriction base="xs:dateTime"/>
-    </xs:simpleType>
-    <xs:simpleType name="Instruction3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CHQB"/>
-            <xs:enumeration value="HOLD"/>
-            <xs:enumeration value="PHOB"/>
-            <xs:enumeration value="TELB"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="InstructionForCreditorAgent1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Instruction3Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="LocalInstrument2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Max10Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="10"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max128Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="128"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max140Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="140"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max15NumericText">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max16Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="16"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max2048Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="2048"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max34Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="34"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max35Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max4Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max70Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="70"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="NameAndAddress10">
-        <xs:sequence>
-            <xs:element name="Nm" type="Max140Text"/>
-            <xs:element name="Adr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="NamePrefix1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DOCT"/>
-            <xs:enumeration value="MIST"/>
-            <xs:enumeration value="MISS"/>
-            <xs:enumeration value="MADM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Number">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="0"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="OrganisationIdentification4">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BICOrBEI" type="AnyBICIdentifier"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericOrganisationIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="OrganisationIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalOrganisationIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Party6Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="OrgId" type="OrganisationIdentification4"/>
-                <xs:element name="PrvtId" type="PersonIdentification5"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PartyIdentification32">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Party6Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtryOfRes" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtctDtls" type="ContactDetails2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentIdentification1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrId" type="Max35Text"/>
-            <xs:element name="EndToEndId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentInstructionInformation3">
-        <xs:sequence>
-            <xs:element name="PmtInfId" type="Max35Text"/>
-            <xs:element name="PmtMtd" type="PaymentMethod3Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BtchBookg" type="BatchBookingIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
-            <xs:element name="ReqdExctnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PoolgAdjstmntDt" type="ISODate"/>
-            <xs:element name="Dbtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAcct" type="CashAccount16"/>
-            <xs:element name="DbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcctAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="CdtTrfTxInf" type="CreditTransferTransactionInformation10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PaymentMethod3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CHK"/>
-            <xs:enumeration value="TRF"/>
-            <xs:enumeration value="TRA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PaymentTypeInformation19">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SvcLvl" type="ServiceLevel8Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyPurp" type="CategoryPurpose1Choice"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PercentageRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PersonIdentification5">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericPersonIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PersonIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPersonIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PhoneNumber">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="\+[0-9]{1,3}-[0-9()+\-]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PostalAddress6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdrTp" type="AddressType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SubDept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="StrtNm" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BldgNb" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstCd" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TwnNm" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrySubDvsn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="7" minOccurs="0" name="AdrLine" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Priority2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="NORM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Purpose2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="ReferredDocumentType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RltdDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType5Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="ReferredDocumentType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryAuthority2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtCdtRptgInd" type="RegulatoryReportingType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authrty" type="RegulatoryAuthority2"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="StructuredRegulatoryReporting3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RegulatoryReportingType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="BOTH"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="RemittanceAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DuePyblAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DscntApldAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtNoteAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="AdjstmntAmtAndRsn" type="DocumentAdjustment1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceInformation5">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Ustrd" type="Max140Text"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Strd" type="StructuredRemittanceInformation7"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceLocation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnMtd" type="RemittanceLocationMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnElctrncAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnPstlAdr" type="NameAndAddress10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RemittanceLocationMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FAXI"/>
-            <xs:enumeration value="EDIC"/>
-            <xs:enumeration value="URID"/>
-            <xs:enumeration value="EMAL"/>
-            <xs:enumeration value="POST"/>
-            <xs:enumeration value="SMSM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ServiceLevel8Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalServiceLevel1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Max10Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Inf" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRemittanceInformation7">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="RfrdDocInf" type="ReferredDocumentInformation3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RfrdDocAmt" type="RemittanceAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrRefInf" type="CreditorReferenceInformation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcee" type="PartyIdentification32"/>
-            <xs:element maxOccurs="3" minOccurs="0" name="AddtlRmtInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rate" type="PercentageRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="TaxRecordDetails1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAuthorisation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Titl" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="TaxParty1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dbtr" type="TaxParty2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdmstnZn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RefNb" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Mtd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqNb" type="Number"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Rcrd" type="TaxRecord1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authstn" type="TaxAuthorisation1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxPeriod1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Yr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxRecordPeriod1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrToDt" type="DatePeriodDetails"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecord1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctgy" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyDtls" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrSts" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CertId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="TaxAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecordDetails1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="TaxRecordPeriod1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MM01"/>
-            <xs:enumeration value="MM02"/>
-            <xs:enumeration value="MM03"/>
-            <xs:enumeration value="MM04"/>
-            <xs:enumeration value="MM05"/>
-            <xs:enumeration value="MM06"/>
-            <xs:enumeration value="MM07"/>
-            <xs:enumeration value="MM08"/>
-            <xs:enumeration value="MM09"/>
-            <xs:enumeration value="MM10"/>
-            <xs:enumeration value="MM11"/>
-            <xs:enumeration value="MM12"/>
-            <xs:enumeration value="QTR1"/>
-            <xs:enumeration value="QTR2"/>
-            <xs:enumeration value="QTR3"/>
-            <xs:enumeration value="QTR4"/>
-            <xs:enumeration value="HLF1"/>
-            <xs:enumeration value="HLF2"/>
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>

dev/resources/sepa/pain.008.001.02.xsd

@@ -1,879 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--Generated by SWIFTStandards Workstation (build:R6.1.0.2) on 2009 Jan 08 17:30:53-->
-<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02">
-    <xs:element name="Document" type="Document"/>
-    <xs:complexType name="AccountIdentification4Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="IBAN" type="IBAN2007Identifier"/>
-                <xs:element name="Othr" type="GenericAccountIdentification1"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="AccountSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-        <xs:restriction base="xs:decimal">
-            <xs:minInclusive value="0"/>
-            <xs:fractionDigits value="5"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
-        <xs:simpleContent>
-            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{3,3}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="AddressType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="ADDR"/>
-            <xs:enumeration value="PBOX"/>
-            <xs:enumeration value="HOME"/>
-            <xs:enumeration value="BIZZ"/>
-            <xs:enumeration value="MLTO"/>
-            <xs:enumeration value="DLVY"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="AmendmentInformationDetails6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlMndtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFnlColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFrqcy" type="Frequency1Code"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="AnyBICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Authorisation1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="Authorisation1Code"/>
-                <xs:element name="Prtry" type="Max128Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Authorisation1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="AUTH"/>
-            <xs:enumeration value="FDET"/>
-            <xs:enumeration value="FSUM"/>
-            <xs:enumeration value="ILEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BatchBookingIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-    <xs:complexType name="BranchAndFinancialInstitutionIdentification4">
-        <xs:sequence>
-            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification7"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="BranchData2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccount16">
-        <xs:sequence>
-            <xs:element name="Id" type="AccountIdentification4Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccountType2">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="CashAccountType4Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CashAccountType4Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CASH"/>
-            <xs:enumeration value="CHAR"/>
-            <xs:enumeration value="COMM"/>
-            <xs:enumeration value="TAXE"/>
-            <xs:enumeration value="CISH"/>
-            <xs:enumeration value="TRAS"/>
-            <xs:enumeration value="SACC"/>
-            <xs:enumeration value="CACC"/>
-            <xs:enumeration value="SVGS"/>
-            <xs:enumeration value="ONDP"/>
-            <xs:enumeration value="MGLD"/>
-            <xs:enumeration value="NREX"/>
-            <xs:enumeration value="MOMA"/>
-            <xs:enumeration value="LOAN"/>
-            <xs:enumeration value="SLRY"/>
-            <xs:enumeration value="ODFT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CategoryPurpose1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChargeBearerType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="SHAR"/>
-            <xs:enumeration value="SLEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ClearingSystemIdentification2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ClearingSystemMemberIdentification2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
-            <xs:element name="MmbId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ContactDetails2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CountryCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="CreditDebitCode">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRDT"/>
-            <xs:enumeration value="DBIT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CreditorReferenceInformation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType3Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="CreditorReferenceType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CustomerDirectDebitInitiationV02">
-        <xs:sequence>
-            <xs:element name="GrpHdr" type="GroupHeader39"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="PmtInf" type="PaymentInstructionInformation4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DateAndPlaceOfBirth">
-        <xs:sequence>
-            <xs:element name="BirthDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrvcOfBirth" type="Max35Text"/>
-            <xs:element name="CityOfBirth" type="Max35Text"/>
-            <xs:element name="CtryOfBirth" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DatePeriodDetails">
-        <xs:sequence>
-            <xs:element name="FrDt" type="ISODate"/>
-            <xs:element name="ToDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DecimalNumber">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="17"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="DirectDebitTransaction6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="MndtRltdInf" type="MandateRelatedInformation6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PreNtfctnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PreNtfctnDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DirectDebitTransactionInformation9">
-        <xs:sequence>
-            <xs:element name="PmtId" type="PaymentIdentification1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation20"/>
-            <xs:element name="InstdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DrctDbtTx" type="DirectDebitTransaction6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrAgtAcct" type="CashAccount16"/>
-            <xs:element name="Dbtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrForCdtrAgt" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RgltryRptg" type="RegulatoryReporting3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tax" type="TaxInformation3"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RltdRmtInf" type="RemittanceLocation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtInf" type="RemittanceInformation5"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Document">
-        <xs:sequence>
-            <xs:element name="CstmrDrctDbtInitn" type="CustomerDirectDebitInitiationV02"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DocumentAdjustment1">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rsn" type="Max4Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DocumentType3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="RADM"/>
-            <xs:enumeration value="RPIN"/>
-            <xs:enumeration value="FXDR"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="PUOR"/>
-            <xs:enumeration value="SCOR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="DocumentType5Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MSIN"/>
-            <xs:enumeration value="CNFA"/>
-            <xs:enumeration value="DNFA"/>
-            <xs:enumeration value="CINV"/>
-            <xs:enumeration value="CREN"/>
-            <xs:enumeration value="DEBN"/>
-            <xs:enumeration value="HIRI"/>
-            <xs:enumeration value="SBIN"/>
-            <xs:enumeration value="CMCN"/>
-            <xs:enumeration value="SOAC"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="BOLD"/>
-            <xs:enumeration value="VCHR"/>
-            <xs:enumeration value="AROI"/>
-            <xs:enumeration value="TSUT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalAccountIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalCategoryPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalClearingSystemIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="5"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalFinancialInstitutionIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalLocalInstrument1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalOrganisationIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPersonIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalServiceLevel1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="FinancialIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalFinancialInstitutionIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="FinancialInstitutionIdentification7">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BIC" type="BICIdentifier"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysMmbId" type="ClearingSystemMemberIdentification2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="GenericFinancialIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Frequency1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="YEAR"/>
-            <xs:enumeration value="MNTH"/>
-            <xs:enumeration value="QURT"/>
-            <xs:enumeration value="MIAN"/>
-            <xs:enumeration value="WEEK"/>
-            <xs:enumeration value="DAIL"/>
-            <xs:enumeration value="ADHO"/>
-            <xs:enumeration value="INDA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="GenericAccountIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max34Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="AccountSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericFinancialIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="FinancialIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericOrganisationIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="OrganisationIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericPersonIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="PersonIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GroupHeader39">
-        <xs:sequence>
-            <xs:element name="MsgId" type="Max35Text"/>
-            <xs:element name="CreDtTm" type="ISODateTime"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="Authstn" type="Authorisation1Choice"/>
-            <xs:element name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element name="InitgPty" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FwdgAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="IBAN2007Identifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ISODate">
-        <xs:restriction base="xs:date"/>
-    </xs:simpleType>
-    <xs:simpleType name="ISODateTime">
-        <xs:restriction base="xs:dateTime"/>
-    </xs:simpleType>
-    <xs:complexType name="LocalInstrument2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="MandateRelatedInformation6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="MndtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtOfSgntr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AmdmntInd" type="TrueFalseIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AmdmntInfDtls" type="AmendmentInformationDetails6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ElctrncSgntr" type="Max1025Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrstColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FnlColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Frqcy" type="Frequency1Code"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Max1025Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="1025"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max10Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="10"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max128Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="128"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max140Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="140"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max15NumericText">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max16Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="16"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max2048Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="2048"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max34Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="34"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max35Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max4Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max70Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="70"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="NameAndAddress10">
-        <xs:sequence>
-            <xs:element name="Nm" type="Max140Text"/>
-            <xs:element name="Adr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="NamePrefix1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DOCT"/>
-            <xs:enumeration value="MIST"/>
-            <xs:enumeration value="MISS"/>
-            <xs:enumeration value="MADM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Number">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="0"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="OrganisationIdentification4">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BICOrBEI" type="AnyBICIdentifier"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericOrganisationIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="OrganisationIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalOrganisationIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Party6Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="OrgId" type="OrganisationIdentification4"/>
-                <xs:element name="PrvtId" type="PersonIdentification5"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PartyIdentification32">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Party6Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtryOfRes" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtctDtls" type="ContactDetails2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentIdentification1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrId" type="Max35Text"/>
-            <xs:element name="EndToEndId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentInstructionInformation4">
-        <xs:sequence>
-            <xs:element name="PmtInfId" type="Max35Text"/>
-            <xs:element name="PmtMtd" type="PaymentMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BtchBookg" type="BatchBookingIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation20"/>
-            <xs:element name="ReqdColltnDt" type="ISODate"/>
-            <xs:element name="Cdtr" type="PartyIdentification32"/>
-            <xs:element name="CdtrAcct" type="CashAccount16"/>
-            <xs:element name="CdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcctAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="DrctDbtTxInf" type="DirectDebitTransactionInformation9"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PaymentMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DD"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PaymentTypeInformation20">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SvcLvl" type="ServiceLevel8Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqTp" type="SequenceType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyPurp" type="CategoryPurpose1Choice"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PercentageRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PersonIdentification5">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericPersonIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PersonIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPersonIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PhoneNumber">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="\+[0-9]{1,3}-[0-9()+\-]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PostalAddress6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdrTp" type="AddressType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SubDept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="StrtNm" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BldgNb" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstCd" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TwnNm" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrySubDvsn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="7" minOccurs="0" name="AdrLine" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Priority2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="NORM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Purpose2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="ReferredDocumentType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RltdDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType5Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="ReferredDocumentType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryAuthority2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtCdtRptgInd" type="RegulatoryReportingType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authrty" type="RegulatoryAuthority2"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="StructuredRegulatoryReporting3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RegulatoryReportingType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="BOTH"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="RemittanceAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DuePyblAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DscntApldAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtNoteAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="AdjstmntAmtAndRsn" type="DocumentAdjustment1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceInformation5">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Ustrd" type="Max140Text"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Strd" type="StructuredRemittanceInformation7"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceLocation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnMtd" type="RemittanceLocationMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnElctrncAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnPstlAdr" type="NameAndAddress10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RemittanceLocationMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FAXI"/>
-            <xs:enumeration value="EDIC"/>
-            <xs:enumeration value="URID"/>
-            <xs:enumeration value="EMAL"/>
-            <xs:enumeration value="POST"/>
-            <xs:enumeration value="SMSM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="SequenceType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FRST"/>
-            <xs:enumeration value="RCUR"/>
-            <xs:enumeration value="FNAL"/>
-            <xs:enumeration value="OOFF"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ServiceLevel8Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalServiceLevel1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Max10Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Inf" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRemittanceInformation7">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="RfrdDocInf" type="ReferredDocumentInformation3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RfrdDocAmt" type="RemittanceAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrRefInf" type="CreditorReferenceInformation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcee" type="PartyIdentification32"/>
-            <xs:element maxOccurs="3" minOccurs="0" name="AddtlRmtInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rate" type="PercentageRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="TaxRecordDetails1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAuthorisation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Titl" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="TaxParty1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dbtr" type="TaxParty2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdmstnZn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RefNb" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Mtd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqNb" type="Number"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Rcrd" type="TaxRecord1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authstn" type="TaxAuthorisation1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxPeriod1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Yr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxRecordPeriod1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrToDt" type="DatePeriodDetails"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecord1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctgy" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyDtls" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrSts" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CertId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="TaxAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecordDetails1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="TaxRecordPeriod1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MM01"/>
-            <xs:enumeration value="MM02"/>
-            <xs:enumeration value="MM03"/>
-            <xs:enumeration value="MM04"/>
-            <xs:enumeration value="MM05"/>
-            <xs:enumeration value="MM06"/>
-            <xs:enumeration value="MM07"/>
-            <xs:enumeration value="MM08"/>
-            <xs:enumeration value="MM09"/>
-            <xs:enumeration value="MM10"/>
-            <xs:enumeration value="MM11"/>
-            <xs:enumeration value="MM12"/>
-            <xs:enumeration value="QTR1"/>
-            <xs:enumeration value="QTR2"/>
-            <xs:enumeration value="QTR3"/>
-            <xs:enumeration value="QTR4"/>
-            <xs:enumeration value="HLF1"/>
-            <xs:enumeration value="HLF2"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="TrueFalseIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-</xs:schema>

dev/resources/sepa/test.xml

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<CstmrDrctDbtInitn>
-		<GrpHdr>
-			<MsgId>PREL20171012/REF10</MsgId>
-			<CreDtTm>2017-10-12T00:08:30</CreDtTm>
-			<NbOfTxs>2</NbOfTxs>
-			<CtrlSum>734.4</CtrlSum>
-			<InitgPty>
-				<Nm>MyBigCompany</Nm>
-				<Id>
-				    <PrvtId>
-					<Othr>
-						<Id>FR76AAAAA</Id>
-					</Othr>
-				    </PrvtId>
-				</Id>
-			</InitgPty>
-		</GrpHdr>
-		<PmtInf>
-			<PmtInfId>PREL20171012/ID00010-T171001</PmtInfId>
-			<PmtMtd>DD</PmtMtd>
-			<NbOfTxs>2</NbOfTxs>
-			<CtrlSum>734.4</CtrlSum>
-			<PmtTpInf>
-				<SvcLvl>
-					<Cd>SEPA</Cd>
-				</SvcLvl>
-				<LclInstrm>
-					<Cd>CORE</Cd>
-				</LclInstrm>
-				<SeqTp>RCUR</SeqTp>
-			</PmtTpInf>
-			<ReqdColltnDt>2017-10-12</ReqdColltnDt>
-			<Cdtr>
-				<Nm>MyBigCompany</Nm>
-				<PstlAdr>
-					<Ctry>FR</Ctry>
-					<AdrLine>Address1</AdrLine>
-					<AdrLine>Address2</AdrLine>
-				</PstlAdr>
-			</Cdtr>
-			<CdtrAcct>
-				<Id>
-					<IBAN>FR76123456</IBAN>
-				</Id>
-			</CdtrAcct>
-			<CdtrAgt>
-				<FinInstnId>
-					<BIC>BICABCDEF</BIC>
-				</FinInstnId>
-			</CdtrAgt>
-			<ChrgBr>SLEV</ChrgBr>
-			<CdtrSchmeId>
-				<Id>
-					<PrvtId>
-						<Othr>
-							<Id>FR76AAAAA</Id>
-							<SchmeNm>
-								<Prtry>SEPA</Prtry>
-							</SchmeNm>
-						</Othr>
-					</PrvtId>
-				</Id>
-			</CdtrSchmeId>
-			<DrctDbtTxInf>
-				<PmtId>
-					<EndToEndId>AS-FA1710-0416-000679</EndToEndId>
-				</PmtId>
-				<InstdAmt Ccy="EUR">540</InstdAmt>
-				<DrctDbtTx>
-					<MndtRltdInf>
-						<MndtId>RUM-CU1610-0001-3-1476058417</MndtId>
-						<DtOfSgntr>2016-10-10</DtOfSgntr>
-						<AmdmntInd>false</AmdmntInd>
-					</MndtRltdInf>
-				</DrctDbtTx>
-				<DbtrAgt>
-					<FinInstnId>
-						<BIC>BICXYZ</BIC>
-					</FinInstnId>
-				</DbtrAgt>
-				<Dbtr>
-					<Nm>CUSTOMER A</Nm>
-					<PstlAdr>
-						<Ctry>FR</Ctry>
-						<AdrLine>Mr abc</AdrLine>
-					</PstlAdr>
-				</Dbtr>
-				<DbtrAcct>
-					<Id>
-						<IBAN>FR123456</IBAN>
-					</Id>
-				</DbtrAcct>
-				<RmtInf>
-					<Ustrd>FA1710-0416</Ustrd>
-				</RmtInf>
-			</DrctDbtTxInf>
-			<DrctDbtTxInf>
-				<PmtId>
-					<EndToEndId>AS-FA1710-0415-000683</EndToEndId>
-				</PmtId>
-				<InstdAmt Ccy="EUR">194.4</InstdAmt>
-				<DrctDbtTx>
-					<MndtRltdInf>
-						<MndtId>RUM-CU1709-0011-4-1506525346</MndtId>
-						<DtOfSgntr>2017-09-27</DtOfSgntr>
-						<AmdmntInd>false</AmdmntInd>
-					</MndtRltdInf>
-				</DrctDbtTx>
-				<DbtrAgt>
-					<FinInstnId>
-						<BIC>BICJKL</BIC>
-					</FinInstnId>
-				</DbtrAgt>
-				<Dbtr>
-					<Nm>CUSTOMER2</Nm>
-					<PstlAdr>
-						<Ctry>FR</Ctry>
-					</PstlAdr>
-				</Dbtr>
-				<DbtrAcct>
-					<Id>
-						<IBAN>FR76123456</IBAN>
-					</Id>
-				</DbtrAcct>
-				<RmtInf>
-					<Ustrd>FA1710-0415</Ustrd>
-				</RmtInf>
-			</DrctDbtTxInf>
-		</PmtInf>
-	</CstmrDrctDbtInitn>
-</Document>

dev/resources/sepa/text.txt

@@ -1,2 +0,0 @@
-To test a SEPA file:
-http://www.mesfluxdepaiement.fr/testez-vos-fichiers-sepa

dev/setup/apache/virtualhost

@@ -1,62 +0,0 @@
-<VirtualHost *:80>
-#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
-#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
-php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
-php_admin_value open_basedir /tmp/:/home/../htdocs
-
-ServerName myvirtualalias
-ServerAlias myvirtualalias
-
-UseCanonicalName On
-
-AddDefaultCharset UTF-8
-
-DocumentRoot "/home/.../htdocs"
-
-<Directory /home/.../htdocs/>
-   AllowOverride None
-   Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
-   Require all granted
-</Directory>
-
-<Directory "/home/../htdocs/cache">
-   Deny from all
-   RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-   AddType application/x-httpd-php-source .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-</Directory>
-
-
-ErrorLog /var/log/apache2/myvirtualalias_error_log
-TransferLog /var/log/apache2/myvirtualalias_access_log
-
-# Compress returned resources of type php pages, text file export, css and javascript
-AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
-
-AddType text/javascript .jgz
-AddEncoding gzip .jgz
-ExpiresActive On
-ExpiresByType image/x-icon A2592000
-ExpiresByType image/gif A2592000
-ExpiresByType image/png A2592000
-ExpiresByType image/jpeg A2592000
-ExpiresByType text/css A2592000
-ExpiresByType text/javascript A2592000
-ExpiresByType application/x-javascript A2592000
-ExpiresByType application/javascript A2592000
-
-SSLEngine On
-
-#   A self-signed (snakeoil) certificate can be created by installing
-#   the ssl-cert package. See
-#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
-#   If both key and certificate are stored in the same file, only the
-#   SSLCertificateFile directive is needed.
-SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
-
-#RewriteEngine   on
-#RewriteCond     %{SERVER_PORT} ^80$
-#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
-
-</VirtualHost>

dev/setup/codesniffer/ruleset.xml

@@ -4,37 +4,49 @@
 	<description>Dolibarr coding standard.</description>
 
 	<exclude-pattern type="relative">build/html</exclude-pattern>
-	<exclude-pattern type="relative">build/aps</exclude-pattern>
 	<exclude-pattern type="relative">documents</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/custom</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
-	<exclude-pattern type="relative">*.min.css</exclude-pattern>
-	<exclude-pattern type="relative">*.js</exclude-pattern>
 
 		<!-- List of all tests -->
 
-
+	
 	<!-- Rules from Internal Standard -->
-
+	
 	<rule ref="Internal.NoCodeFound">
 		<severity>0</severity>
 	</rule>
 
-
+	
 	<!-- Rules from Generic Standard -->
+		
+	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
 
-	<rule ref="Generic.CodeAnalysis.EmptyStatement">
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIf"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedElse"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedElseif"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCatch"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedForeach"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.NotAllowed"/>
-        <exclude name="Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning"/>
-    </rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCatch">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedForeach">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIf">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedElse">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedElseif">
+		<severity>0</severity>
+	</rule>
+	
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning">
+		<severity>0</severity>
+	</rule>
 
     <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
 
@@ -50,22 +62,7 @@
     <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.Found">
 		<severity>0</severity>
     </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed">
-		<severity>0</severity>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed">
-		<severity>0</severity>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass">
-		<severity>0</severity>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed">
-		<severity>0</severity>
-    </rule>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed">
-		<severity>0</severity>
-    </rule>
-    
+
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
 
     <!--
@@ -85,7 +82,7 @@
 	<!-- Lines can be 85 chars long, but never show errors -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property name="lineLimit" value="500" />
+			<property name="lineLimit" value="1000" />
 			<property name="absoluteLineLimit" value="0" />
 		</properties>
 	</rule>
@@ -129,19 +126,21 @@
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="complexity" value="120" />
-            <property name="absoluteComplexity" value="300" />
+            <property name="absoluteComplexity" value="250" />
         </properties>
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
         <properties>
-            <property name="nestingLevel" value="12" />
+            <property name="nestingLevel" value="10" />
             <property name="absoluteNestingLevel" value="50" />
         </properties>
     </rule>
 
 	<rule ref="Generic.NamingConventions.ConstructorName" />
 	<!-- Check if we use PHP4 constructor instead of __construct() -->
-	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle" />
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle">
+        <severity>0</severity>
+	</rule>
 
 	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
 
@@ -149,7 +148,7 @@
     <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
         <severity>0</severity>
     </rule>
-
+	
 	<rule ref="Generic.PHP.DisallowShortOpenTag" />
 
     <rule ref="Generic.PHP.ForbiddenFunctions" />
@@ -157,15 +156,15 @@
     <!-- Warning when using @ before functions -->
     <!-- <rule ref="Generic.PHP.NoSilencedErrors" /> -->
 
-	<!-- Say if null, true, false must be uppercase (Rule 2.5 of PSR2 https://www.php-fig.org/psr/psr-2/) -->
-	<rule ref="Generic.PHP.LowerCaseConstant" />
+	<!-- Say if null, true, false must be uppercase -->
+	<!-- <rule ref="Generic.PHP.UpperCaseConstant" /> -->
 
 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
 
 	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
         <severity>0</severity>
 	</rule>
-
+    
 	<!-- Disallow usage of tab -->
 	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
 
@@ -173,24 +172,7 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
-    <!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="true"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
-        <severity>0</severity>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile">
-        <severity>0</severity>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
-        <severity>0</severity>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
-    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration" />
 
     <!-- Rules from PEAR Standard -->
 
@@ -205,7 +187,7 @@
     <rule ref="PEAR.Commenting.ClassComment.Missing">
         <severity>0</severity>
     </rule>
-
+    
     <rule ref="PEAR.Commenting.ClassComment.MissingTag">
 		<severity>0</severity>
     </rule>
@@ -225,14 +207,14 @@
     <rule ref="PEAR.Commenting.ClassComment.MissingLinkTag">
         <severity>0</severity>
     </rule>
-
+        
     <rule ref="PEAR.Commenting.ClassComment.MissingPackageTag">
         <severity>0</severity>
     </rule>
+        
 
-
-
-    <!--
+   
+    <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
         <severity>0</severity>
@@ -244,20 +226,20 @@
         <severity>0</severity>
     </rule>
     -->
-
+    
     <rule ref="PEAR.Commenting.FunctionComment" />
 
     <rule ref="PEAR.Commenting.FunctionComment.Empty">
         <severity>5</severity>
     </rule>
-
-	<!--<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+    
+	<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
         <severity>0</severity>
-    </rule>-->
-    <!--<rule ref="PEAR.Commenting.FunctionComment.Missing">
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
         <severity>0</severity>
-    </rule>-->
-
+    </rule>
+    
     <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
 
     <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
@@ -273,11 +255,11 @@
     <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
         <severity>0</severity>
     </rule>
-
+    
     <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
         <severity>0</severity>
     </rule>
-
+    
     <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
         <severity>0</severity>
     </rule>
@@ -304,20 +286,7 @@
 	<!-- <rule ref="PEAR.ControlStructures.MultiLineCondition" /> -->
 
 	<!-- Test if () are removed for includes -->
-	<rule ref="PEAR.Files.IncludingFile" />
-    <!-- Disable some error messages that we do not want. -->
-    <rule ref="PEAR.Files.IncludingFile.UseInclude">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Files.IncludingFile.UseRequire">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
-        <severity>0</severity>
-    </rule>
+	<!-- <rule ref="PEAR.Files.IncludingFile"/> -->
 
 	<rule ref="PEAR.Formatting.MultiLineAssignment" />
 
@@ -347,14 +316,14 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
         <severity>0</severity>
     </rule>
-
+	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
 	<rule ref="PEAR.NamingConventions.ValidClassName" />
 	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
         <severity>0</severity>
 	</rule>
-
+	
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
         <severity>0</severity>
 	</rule>
@@ -362,7 +331,7 @@
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
         <severity>0</severity>
 	</rule>
-
+	
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
 
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
@@ -379,37 +348,31 @@
         <severity>0</severity>
 	</rule>
 
-    <!--<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
         <severity>0</severity>
-    </rule>-->
-	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
-        <severity>0</severity>
-	</rule>-->
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
-    <rule ref="PSR2.Classes.ClassDeclaration" />
-    <rule ref="PSR2.Methods.FunctionClosingBrace" />
-
 	<!-- This is not in PSR2 -->
 	<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
         <severity>0</severity>
     </rule>
-
+	
 	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
 
 	<!-- Need to be commented to be disabled
 	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
         <severity>0</severity>
     </rule>
-
+	
     <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
         <severity>0</severity>
     </rule>
 	-->
-
+    
     <!-- Already found as a Generic rule -->
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
 

dev/tools/fixaltlanguages.sh

@@ -46,20 +46,13 @@ then
         then
         	aaupper="GR"
         fi        
-        if [ $bb = "EG" ]
-        then
-        	aaupper="SA"
-        fi        
-
     	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
-
-		echo "***** Process language "$aa"_"$bb
     	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
     	then
     	    reflang="htdocs/langs/"$aa"_"$aaupper
     	    if [ -d $reflang -a $aa"_"$bb != $aa"_"$aaupper ]
     	    then
-		    	echo "***** Search original into "$reflang
+		    	echo "***** Process language "$aa"_"$bb" - Search original into "$reflang
     			echo $dirshort is an alternative language of $reflang
     			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
     			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2

dev/tools/fixdosfiles.sh

@@ -17,14 +17,14 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'documents\/website' | grep CRLF
-#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'documents\/website' | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep CRLF
+#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
 fi
 
 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'documents\/website' | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix "$fic"

dev/tools/github_authors_peryear.sh

@@ -1,13 +1,7 @@
 #!/bin/sh
 
-if [ "x$1" = "x" ]; then
-	echo "Usage: $0 YEAR"
-	exit
-fi
-
-
-FROM=$1-01-01
-TO=$1-12-31
+FROM=2016-01-01
+TO=2016-12-31
 
 echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
 git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l

dev/tools/github_commits_perversion.sh

@@ -1,11 +1,10 @@
 #/bin/bash
-Releases=("3.8" "3.9" "4.0" "5.0" "6.0" " 7.0" "develop")
-Dates=("2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01", "2017-02-01", "2017-07-01", "2018-02-01", "2050-01-01")
+Releases=("3.8" "3.9" "4.0" "5.0", "develop")
+Dates=("2010-01-01", "2011-01-01", "2012-01-01", "2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01")
 let "counter = 1"
 
 for i in "${Releases[@]}"
 do
-  echo "=== $counter git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}"
   git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}
   echo -n "Total $i: " 
   git log --pretty=oneline --after=${Dates[counter-1]} --before=${Dates[counter]} | wc -l