Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9

This reverts commit 8000777864.

.codeclimate.yml

@@ -0,0 +1,13 @@
+# Save as .codeclimate.yml (note leading .) in project root directory
+languages:
+  Ruby: false
+  JavaScript: true
+  PHP: true
+engines:
+  phpcodesniffer: true  
+exclude_paths:
+  - 'build/*'
+  - 'dev/*'
+  - 'doc/*'
+  - 'test/*'
+  - 'htdocs/includes/*'

.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

.editorconfig

@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+[*.php]
+indent_style = tab
+[*.js]
+indent_style = tab
+[*.css]
+indent_style = tab
+[*.xml]
+indent_style = tab

.gitattributes

@@ -31,3 +31,22 @@
 *.frm binary
 *.MYD binary
 *.MYI binary
+
+# Export ignores to generate clean production tarballs
+/build              export-ignore
+/dev                export-ignore
+/doc                export-ignore
+/test               export-ignore
+.buildpath          export-ignore
+/build.xml          export-ignore
+.codeclimate.yml    export-ignore
+Dockerfile          export-ignore
+.dockerignore       export-ignore
+.editorconfig       export-ignore
+.gitattributes      export-ignore
+.gitignore          export-ignore
+.mailmap            export-ignore
+.scrutinizer.yml    export-ignore
+.settings           export-ignore
+.travis.yml         export-ignore
+.tx                 export-ignore

.gitignore

@@ -9,6 +9,7 @@ default.properties
 .buildpath
 .gitmodules
 dolibarr_install.log
+upgrade.log
 doxygen_warnings.log
 /.project
 .DS_Store
@@ -16,4 +17,10 @@ doxygen_warnings.log
 *.iml
 Thumbs.db
 # Vagrant generated files
-.vagrant
+.vagrant
+# Composer installed repositories
+/htdocs/includes/**/.git
+# Composer autoloader and unwanted files
+htdocs/includes/autoload.php
+htdocs/includes/bin/
+htdocs/includes/composer/

.mailmap

@@ -0,0 +1,91 @@
+# This is mapping list between real user name/email and entry into sources files
+# If you don't want to have your real email appears here, just send a Pull Request to
+# replace the second field between <> with <secret>
+Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <eldy@users.sourceforge.net>
+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@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>
+Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@samsung>
+Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@alienware>
+Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
+Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
+Florian Henry <florian.henry@open-concept.pro> fhenry <florian.henry@open-concept.pro>
+Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-concept.pro>
+Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry.mail@gmail.com>
+Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-conept.pro>
+Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry@open-concept.pro>
+Florian Henry <florian.henry@open-concept.pro> HENRY Florian <florian.henry@open-concept.pro>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> aspangaro <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Spangaro Alexandre <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
+Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> Raphaël Doursenaud <rdoursenaud@free.fr>
+Philippe Grand <philippe.grand@atoo-net.com> Grand Philippe <contact@atoo-net.com>
+Philippe Grand <philippe.grand@atoo-net.com> Philippe GRAND <philippe.grand@atoo-net.com>
+Philippe Grand <philippe.grand@atoo-net.com> philippe grand <philippe.grand@atoo-net.com>
+Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe.grand@atoo-net.com>
+Philippe Grand <philippe.grand@atoo-net.com> unknown <Philippe@grandoc.(none)>
+Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe@PC-de-philippe>
+Philippe Grand <philippe.grand@atoo-net.com> Philippe Grand <contact@atoo-net.com>
+Jean-François Ferry <jfefe@aternatik.fr> jfefe <jfefe@aternatik.fr>
+Jean-François Ferry <jfefe@aternatik.fr> jfefe <jf.ferry@aternatik.fr>
+Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <jfefe@aternatik.fr>
+Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <meos@devmachine.(none)>
+Charles Benke <charles.fr@benke.fr> BENKE Charles <charles.fr@benke.fr>
+Charles Benke <charles.fr@benke.fr> BENKE Charlie <charles.fr@benke.fr>
+Charles Benke <charles.fr@benke.fr> defrance69 <charles.fr@benke.fr>
+Maxime Kohlhaas <mko@atm-consulting.fr> MAxime Kohlhaas <maxime@atm-consulting.fr>
+Frédéric France <frederic.france@free.fr> Frédéric FRANCE <frederic.france@free.fr>
+Frédéric France <frederic.france@free.fr> frederic34 <frederic.france@free.fr>
+Frédéric France <frederic.france@free.fr> FRANCE Frédéric <frederic.france@free.fr>
+Frédéric France <frederic.france@free.fr> frederic34 <fred@ubuntuserver.(none)>
+Cyrille de Lambert <cyrille.delambert@auguria.net> cdelambert <cdelambert>
+Cédric Gross <c.gross@kreiz-it.fr> KreizIT <KreizIT@users.noreply.github.com>
+Cédric Gross <c.gross@kreiz-it.fr> Cedric <c.gross@kreiz-it.fr>
+Cédric Gross <c.gross@kreiz-it.fr> Cedric GROSS <c.gross@kreiz-it.fr>
+Jean Heimburger <jean@tiaris.info> jean <jean@tiaris.info>
+Jean Heimburger <jean@tiaris.info> tiaris <tiaris>
+Benoit Mortier <benoit.mortier@opensides.be> opensides <opensides>
+Eric Seigne <contact@ryxeo.com> erics <erics>
+Jean-Louis Bergamo <jl@bergamo.fr> jlb <jlb>
+Remco Gerbrands <remco@artoge.nl> r2gnl <r2gnl>
+Phf <phf@atm-consulting.fr> phf <phf@atm-consulting.fr>
+Yannick Warnier <ywarnier@beeznest.org> ywarnier <ywarnier>
+Jerome Warnier <jwarnier@beeznest.org> jwarnier <jwarnier>
+Franky Van Liedekerke <liedekef@telenet.be> liedekef <liedekef>
+Lalaina Rasamoelina <lalaina.rasamoelina@biblibre.com> lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
+Marc Ocebo <marc_ocebo> marc_ocebo <marc_ocebo>
+Unknown <secret> box7890 <box7890>
+Unknown <secret> beedauchon <beedauchon>
+Loic <secret> loic <loic>
+Christophe Combelle <ccomb>
+Unknown <secret> activdev <activdev>
+Unknown <secret> bouba <bouba>
+Unknown <secret> bcroq <bcroq>
+Unknown <secret> dutoit <dutoit>
+Unknown <secret> bureau2crea <bureau2crea>
+Unknown <secret> unknown <mne02@.modula71.local>
+Simon Tosser <secret> simontosser <simontosser>
+Unknown <secret> tipaul <tipaul>
+Raphaël Bertrand <secret> raphael_bertrand <raphael_bertrand>
+Claudio Aschieri <c.aschieri@19.coop> cla <c.aschieri@19.coop>
+Tommaso Basilici <t.basilici@19.coop> kaos <t.basilici@19.coop>
+Tommaso Basilici <t.basilici@19.coop> Tommaso Basilici <t.basilici@19.coop>
+Faust <faust@19.coop> faust <faust@19.coop>
+Ferran Marcet <secret> fmarcet <fmarcet@imedia>
+Geoffrey Girard <geoffre.girard@atm-consulting.fr> geoffrey.girard <geoffre.girard@atm-consulting.fr>
+Bernard Paquier <eshop.bpaquier@gmail.com> BadPixxel <eshop.bpaquier@gmail.com>
+Patrick Delcroix <delcroip@gmail.com> delcroix Patrick <delcroip@gmail.com>
+Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.info>
+Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.com>
+Grégory David <groolot@groolot.net> Grégory DAVID <groolot@groolot.net>
+Grégory David <groolot@groolot.net> Gregory DAVID <groolot@groolot.net>
+Baffir Abbes <bafbes@users.noreply.github.com> bafbes <bafbes@users.noreply.github.com>
+Kevin Guerrier <guerrier.k@gmail.com> GUERRIER Kevin <guerrier.k@gmail.com>
+Remy Younes <ryounes@gmail.com> remy <ryounes@gmail.com>
+Estephe Loridan <github@estephe.me> Estephe L. <github@estephe.me>

.scrutinizer.yml

@@ -5,12 +5,13 @@ imports:
 
 filter:
     excluded_paths:
-        - 'build/*'
-        - 'dev/*'
-        - 'doc/*'
-        - 'test/*'
-        - 'htdocs/includes/*'
-    paths: {  }
+        - build/*
+        - dev/*
+        - doc/*
+        - test/*
+    paths: 
+        - htdocs/*
+        - scripts/*
     
 tools:
     # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
@@ -18,15 +19,18 @@ tools:
         enabled: true
         extensions:
             - php
-        dependency_paths: {  }
+        dependency_paths: 
+            - htdocs/includes/
         filter:
             excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
+                - build/*
+                - dev/*
+                - doc/*
+                - test/*
+                - htdocs/includes/*
+            paths:
+                - htdocs/
+                - scripts/
         config:
             parameter_reference_check:
                 enabled:              true

.travis.yml

@@ -1,114 +1,313 @@
 # This script is used by Travis CI to run automatically Continuous test integration
 # from Dolibarr GitHub repository.
-# Command run is phpunit
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
+sudo: required
+
+language: php
+
+php:
+- '5.3'
+- '5.4'
+- '5.5'
+- '5.6.29'
+- '7.0'
+- nightly
+
+addons:
+  mariadb: '10.0'
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #postgresql: '9.3'
+  apt:
+    packages:
+    # We need a webserver to test the webservices
+    # Let's install Apache with.
+    - apache2
+    # mod_php is not supported by Travis. Add fcgi. We install FPM later on.
+    - libapache2-mod-fastcgi
+
+# Start on every boot
+services:
+- memcached
+
+env:
+  global:
+  # Set to true for very verbose output
+  - DEBUG=false
+  matrix:
+  # MariaDB overrides MySQL installation so it's not possible to test both yet
+  #- DB=mysql
+  - DB=mariadb
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #- DB=postgresql
+  # TODO
+  #- DB=sqlite
+  # See https://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
+  #- WS=apache
+  # See https://github.com/DracoBlue/travis-ci-nginx-php-fpm-test
+  #- WS=nginx
+
+matrix:
+  fast_finish: true
+  allow_failures:
+  - php: '7.0'
+  - php: nightly
+  # FIXME
+  #- env: DB=postgresql
+  # TODO
+  #- env: DB=sqlite
+
 notifications:
   email:
     on_success: never # [always|never|change] default: change
     on_failure: change # [always|never|change] default: always
-    
-services:
- - memcached # will start memcached
+  irc:
+    channels:
+    - "chat.freenode.net#dolibarr"
+    on_success: change
+    on_failure: always
+    use_notice: true
 
-# This will tell travis to run phpunit
-language: php
-php:
-# - "5.2" is not supported because pyrus to install PHP_Codesniffer is not available
- - "5.3"
- - "5.4"
- - "5.5" 
+before_install:
+- |
+  echo "Disabling Xdebug for composer"
+  export PHP_VERSION_NAME=$(phpenv version-name)
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
+  phpenv config-rm xdebug.ini
+  echo
 
-env:
- - DB=mysql
-# - DB=postgres  
+install:
+- |
+  echo "Updating Composer"
+  composer self-update
+  echo
 
-before_script: 
- - echo Start travis
- - echo Current dir is `pwd`
- - echo Home dir is `echo ~`
- - export PHPV=`phpenv version-name`
- - echo PHP version $PHPV 
-# - echo Update composer
-# - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update 
- - echo PHPUnit version
- - phpunit --version
- - echo Install phpcs then show installed rules
- - pyrus install pear/PHP_CodeSniffer
- - phpenv rehash
- - phpcs --version
- - phpcs -i
- - echo Create dir $(pwd)/htdocs/documents
- - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
- - sudo touch $(pwd)/htdocs/documents/dolibarr.log;
- - sudo chmod a+rwx /home; sudo chmod a+rwx /home/travis; sudo chmod -R a+rwx /home/travis/build;
- - sudo chmod -R a+rwx $(pwd);
- - sudo chown -R www-data:travis $(pwd)/htdocs/documents;
- - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \;
- - echo Edit php.ini file
- - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-# - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - echo Mysql version
- - mysql --version
- - echo Init database
- - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"
- - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
- - echo Create config file htdocs/conf/conf.php
- - echo '<?php ' > htdocs/conf/conf.php
- - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then echo '$'dolibarr_main_db_type=\'mysqli\'';' >> htdocs/conf/conf.php; fi"
- - echo '$'dolibarr_main_url_root=\'http://localhost/\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_document_root=\'$(pwd)/htdocs\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_data_root=\'$(pwd)/htdocs/documents\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_db_host=\'localhost\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_db_name=\'myapp_test\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_db_user=\'travis\'';' >> htdocs/conf/conf.php
- - echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> htdocs/conf/conf.php
- - echo '?>' >> htdocs/conf/conf.php
- - echo Show conf.php content
- - cat htdocs/conf/conf.php
- - echo Install apache server
- - sudo apt-get update
- - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
- - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
- - echo Show default virtual host
- - sudo cat /etc/apache2/sites-available/default
- - sudo /etc/init.d/apache2 restart
- - wget http://localhost/
- - cat index.html
+- |
+  echo "Installing Parallel Lint"
+  composer -n require jakub-onderka/php-parallel-lint ^0
+  composer -n require jakub-onderka/php-console-highlighter ^0
+  echo
 
+- |
+  echo "Installing PHP Unit"
+  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" = 'nightly' ]; then
+    composer -n require phpunit/phpunit ^5
+  fi
+  echo
 
+- |
+  echo "Installing PHP CodeSniffer"
+  composer require squizlabs/php_codesniffer ^2
+  echo
 
-script: 
- - cd htdocs/install
- - date
-# - php upgrade.php 3.4.0 3.5.0 ignoredbversion > upgrade.log
-# - php upgrade2.php 3.4.0 3.5.0 ignoredbversion > upgrade2.log
- - php upgrade.php 3.5.0 3.6.0 ignoredbversion >> upgrade.log
- - php upgrade2.php 3.5.0 3.6.0 ignoredbversion >> upgrade2.log
- - php upgrade.php 3.6.0 3.7.0 ignoredbversion >> upgrade.log
-# - cat upgrade360370.log
- - php upgrade2.php 3.6.0 3.7.0 ignoredbversion >> upgrade2.log
-# - cat upgrade2.log
- - cd ../..
- - date
- - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
- - date
-# - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1
- - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
- - date
+- |
+  echo "Adding Composer binaries 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 "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.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 and nightly!
+    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  phpenv rehash
+  echo
+
+- |
+  if [ "$DEBUG" = true ]; then
+    echo "Debugging informations"
+    # Check PHP
+    php -i
+    # Check PHP CodeSniffer installation
+    which phpcs
+    phpcs --version
+    phpcs -i
+    # Check PHPUnit installation
+    which phpunit
+    phpunit --version
+    # Check MySQL
+    mysql --version
+    mysql -e "SELECT VERSION();"
+    echo
+  fi
+  
+- |
+  echo "Setting up database"
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo "MySQL"
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -D travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+  fi
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #if [ "$DB" = 'postgresql' ]; then
+  #  pgsql travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+  #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
+  # FIXME
+  #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
+
+- |
+  echo "Create documents directory and set permissions"
+  # and admin/temp subdirectory needed for unit tests
+  mkdir -p documents/admin/temp
+  echo
+
+- |
+  echo "Setting up Apache + FPM"
+  # enable php-fpm
+  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" = '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"
+  # Ensure we catch errors
+  set -e
+  wget http://127.0.0.1
+  if [ "$DEBUG" = true ]; then
+    cat index.html
+  fi
+  set +e
+  echo
+
+- |
+  echo "Checking PHP syntax errors"
+  # Ensure we catch errors
+  set -e
+  parallel-lint --exclude htdocs/includes --blame .
+  set +e
+  echo
+
+# TODO: dev/* checks
+
+- |
+  echo "Checking coding style"
+  # 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/codesniffer/ruleset.xml --encoding=utf-8 .
+  set +e
+  echo
+
+# TODO: Check Javascript (jshint?)
+
+# TODO: Check CSS (csslint?)
+
+# TODO: check SQL syntax (pgsanity?)
+
+- |
+  echo "Upgrading Dolibarr"
+  # Ensure we catch errors
+  set -e
+  cd htdocs/install
+  php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
+  php upgrade2.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-2.log
+  php step5.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-3.log
+  php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
+  php upgrade2.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-2.log
+  php step5.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-3.log
+  php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
+  php upgrade2.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  php step5.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-3.log
+  php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
+  php upgrade2.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-2.log
+  php step5.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-3.log
+  cd -
+  set +e
+  echo
+
+- |
+  echo "Unit testing"
+  # Ensure we catch errors
+  set -e
+  phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
+  set +e
+  echo
+
+after_success:
+
+after_failure:
+- |
+  if [ "$DEBUG" = true ]; then
+    echo "Debugging informations"
+    # Upgrade log files
+    cat *.log
+    # Dolibarr log file
+    cat documents/dolibarr.log
+    # Apache log file
+    sudo cat /var/log/apache2/error.log
+    # MariaDB log file
+    sudo cat /var/log/mysql/error.log
+    # TODO: PostgreSQL log file
+    echo
+  fi
 
 after_script:
-# - echo Output dolibarr log file; cat $(pwd)/htdocs/documents/dolibarr.log
- - echo Output apache log file; sudo cat /var/log/apache2/error.log
- - echo End travis
 

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = uz: uz_UZ, sw: sw_SW
+lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS
 
 [dolibarr.accountancy]
 file_filter = htdocs/langs/<lang>/accountancy.lang
@@ -146,6 +146,18 @@ source_file = htdocs/langs/en_US/holiday.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.hrm]
+file_filter = htdocs/langs/<lang>/hrm.lang
+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
@@ -176,6 +188,12 @@ source_file = htdocs/langs/en_US/link.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.loan]
+file_filter = htdocs/langs/<lang>/loan.lang
+source_file = htdocs/langs/en_US/loan.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.mailmanspip]
 file_filter = htdocs/langs/<lang>/mailmanspip.lang
 source_file = htdocs/langs/en_US/mailmanspip.lang
@@ -206,6 +224,12 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.oauth]
+file_filter = htdocs/langs/<lang>/oauth.lang
+source_file = htdocs/langs/en_US/oauth.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.opensurvey]
 file_filter = htdocs/langs/<lang>/opensurvey.lang
 source_file = htdocs/langs/en_US/opensurvey.lang
@@ -236,9 +260,9 @@ source_file = htdocs/langs/en_US/paypal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.printipp]
-file_filter = htdocs/langs/<lang>/printipp.lang
-source_file = htdocs/langs/en_US/printipp.lang
+[dolibarr.printing]
+file_filter = htdocs/langs/<lang>/printing.lang
+source_file = htdocs/langs/en_US/printing.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
@@ -266,6 +290,12 @@ source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.receiptprinter]
+file_filter = htdocs/langs/<lang>/receiptprinter.lang
+source_file = htdocs/langs/en_US/receiptprinter.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
@@ -302,6 +332,12 @@ source_file = htdocs/langs/en_US/suppliers.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.supplier_proposal]
+file_filter = htdocs/langs/<lang>/supplier_proposal.lang
+source_file = htdocs/langs/en_US/supplier_proposal.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang

CONTRIBUTING.md

@@ -0,0 +1,128 @@
+How to contribute to Dolibarr
+=============================
+
+Bug reports and feature requests
+--------------------------------
+
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
+
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues).
+
+1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
+2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
+4. Tell us the version you are using!
+3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
+
+
+
+<a name="code"></a>Code
+---------------------
+
+### Basic workflow
+
+1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
+2. Clone your fork.
+3. Choose a branch(See the [Branches](#branches) section below).
+4. Commit and push your changes.
+5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+
+### <a name="branches"></a>Branches
+
+Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
+
+If you're fixing a bug, it is preferred that you cook your fix and pull request it
+against the oldest version affected that's still supported.
+
+We officially support versions N, N − 1 and N − 2 for N the latest version available.
+
+Choose your base branch accordingly.
+
+### General rules
+Please don't edit the ChangeLog file. File will be generated from your commit messages during release process by the project manager.
+
+### <a name="commits"></a>Commits
+Use clear commit messages with the following structure:
+
+```
+[KEYWORD] [ISSUENUM] DESC
+
+LONGDESC
+```
+
+#### Keyword
+In uppercase if you want to have the log comment appears into the generated ChangeLog file.
+
+The keyword can be ommitted if your commit does not fit in any of the following categories:
+- Fix: for a bug fix
+- Close: for closing a referenced feature request
+- New: for an unreferenced new feature (Opening a feature request and using close is prefered)
+
+#### Issuenum
+If your commit fixes a referenced bug or feature request.
+
+In the form of a # followed by the GitHub issue number.
+
+#### Desc
+A short description of the commit content.
+
+This should ideally be less than 50 characters.
+
+#### LongDesc
+A long description of the commit content.
+
+You can really go to town here and explain in depth what you've been doing.
+
+Feel free to express technical details, use cases or anything relevant to the current commit.
+
+This section can span multiple lines.
+
+Try to keep lines under 120 characters.
+
+#### Samples
+<pre>
+FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
+or
+CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
+or
+NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
+or
+Short description (when the commit is not introducing feature nor closing a bug)
+
+Long description (Can span accross multiple lines).
+</pre>
+
+### Pull Requests
+When submitting a pull request, use same rule as [Commits](#commits) for the message.
+
+If your pull request only contains one commit, GitHub will be smart enough to fill it for you.
+Otherwise, please be a bit verbose about what you're providing.
+
+Your Pull Request must pass the Continuous Integration checks.
+Also, some code changes need a prior approbation:
+
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the project leader to see if such a library can be accepted.
+
+* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project leader if the new data model you plan to add can be accepted as you suggest.
+
+### Resources
+[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
+
+Translations
+------------
+The source language (en_US) is maintained in the repository. See the [Code](#code) section above.
+
+All other translations are managed online at [Transifex](https://www.transifex.com/dolibarr-association/dolibarr/).
+
+Join an existing translation team or create your own and translate into the interface.
+
+Your translations will be available in the next major release.
+
+### Resources
+[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
+
+Documentation
+-------------
+The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
+
+*Note*: to help prevent spam, you need to create an account before being able to edit.
+

COPYRIGHT

@@ -12,23 +12,30 @@ Dolibarr uses some external libraries released under different licenses. This is
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
-ChromePHP              4.3.3         Apache Software License 2.0 Yes             Return server log to chrome browser console
+AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
+ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
 CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
-FPDI                   1.4.2         Apache Software License 2.0 Yes             PDF templates management
-FPDF_TPL               1.2           Apache Software License 2.0 Yes             PDF templates management
+EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
+Escpos-php                           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
+FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel               1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
+PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
+Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services
+TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
+TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
-jQuery                 1.8.2         MIT License                 Yes             JS library
-jQuery UI              1.9.1         GPL and MIT License         Yes             JS library plugin UI
+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.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
+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 DataTables      1.9.4         BSD                         Yes             JS library for tables output
 jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
@@ -39,22 +46,27 @@ jQuery jNotify         1.1.00        Apache Software License 2.0 Yes
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
-jQuery Layout          1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
+jQuery Layout          1.4.3         GPL and MIT License         Yes             JS library plugin Layout
 jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
 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
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
+JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 
 For licenses compatibility informations:
-http://www.fsf.org/licensing/licenses/index_html
+http://www.gnu.org/licenses/licenses.en.html
 
 
 Copyright
 ---------
 
 Copyright (C) 2015
+- Laurent Destailleur <eldy@users.sourceforge.net>
 - Marcos García <marcosgdf@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+- Frederic France <frederic.france@free.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 
 Copyright (C) 2014
 - Laurent Destailleur <eldy@users.sourceforge.net>
@@ -66,7 +78,8 @@ Copyright (C) 2014
 - Regis Houssin <regis.houssin@capnetworks.com>
 - Maxime Kohlhaas <mko@atm-consulting.fr>
 - Juanjo Menent <jmenent@2byte.es>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+- Frederic France <frederic.france@free.fr>
 
 Copyright (C) 2013
 - Christophe Battarel <christophe.battarel@altairis.fr>
@@ -79,7 +92,7 @@ Copyright (C) 2013
 - Maxime Kohlhaas <mko@atm-consulting.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - Adolfo Segura <adolfo.segura@gmail.com>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
 
 Copyright (C) 2012
 - Christophe Battarel <christophe.battarel@altairis.fr>
@@ -93,7 +106,7 @@ Copyright (C) 2012
 - Maxime Kohlhaas <mko@atm-consulting.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - Nicolas Péré <nicolas@amarok2.net>
-- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
 
 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>

Dockerfile

@@ -0,0 +1,14 @@
+FROM php:5.6-apache
+
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-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
+
+RUN docker-php-ext-install mysqli
+
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+EXPOSE 80

README-FR.md

@@ -77,62 +77,75 @@ Voir fichier ChangeLog.
 
 ## CE QUE DOLIBARR PEUT FAIRE
 
-Modules principaux:
+### Modules principaux (tous optionnels):
+
 - Annuaires des prospects et/ou client et/ou fournisseurs
 - Gestion de catalogue de produits et services
-- Gestion de stock
+- Gestion des devis, propositions commerciales
+- Gestion des commandes
+- Gestion des factures clients/fournisseurs et paiements
+- Gestion des virements bancaires SEPA
 - Gestion des comptes bancaires
 - Agenda partagé
-- Gestion des commandes
-- Gestion des devis, propositions commerciales
-- Gestion des factures clients et fournisseurs
+- Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
-- Gestion des paiements
-- Gestion des virements bancaires
+- Gestion de stock
 - Gestion des expéditions
 - GED (Gestion Electronique de Documents)
 - EMailings de masse
 - Réalisation de sondages
 - Point de vente/Caisse enregistreuse
+- …
+
+### Autres modules:
 
-Autres modules:
 - 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
 - Connectivité LDAP
-- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 - De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+- …
+
+### Divers:
 
-Divers:
 - Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Peux être multi-société par ajout du module externe multi-société.
+- Peux-être multi-devise par ajout du module externe multi-devise.
 - Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
 - Application simple à utiliser.
 - Plusieurs thèmes visuels.
 - Code simple et facilement personnalisable.
 - Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
+- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 
 
 ## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
-- Pas de compta analytique double-partie (uniquement gestion de trésorerie).
+- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
-- Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - 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épendance entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
 
 
-## RESEAUX SOCIAUX
+## ACTUALITES ET RESEAUX SOCIAUX
 
-Suivez le projet Dolibarr project sur
+Suivez le projet Dolibarr project sur les réseaux francophones
 
-Facebook: <https://www.facebook.com/dolibarr.fr>
+- Facebook: <https://www.facebook.com/dolibarr.fr>
+- Google+: <https://plus.google.com/+DolibarrFrance>
+- Twitter: <http://www.twitter.com/dolibarr_france>
 
-Google+: <https://plus.google.com/+DolibarrFrance>
+ou sur les réseaux anglophones
 
-Twitter: <http://www.twitter.com/dolibarr_france>
+- [Facebook](https://www.facebook.com/dolibarr)
+- [Google+](https://plus.google.com/+DolibarrOrg)
+- [Twitter](http://www.twitter.com/dolibarr)
+- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
+- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
+- [GitHub](https://github.com/Dolibarr/dolibarr)

README.md

@@ -1,151 +1,171 @@
 # DOLIBARR ERP & CRM
 
-Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+
+Dolibarr ERP & CRM is a modern software to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
+
+It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.
+
+You can freely use, study, modify or distribute it according to its Free Software licence.
+
+You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
 ![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
 
-
 ## LICENSE
 
 Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
 
+See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license.
 
+Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
-## INSTALL
+## INSTALLING
 
-If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensuse, Mandriva or Mageia).
+### Download
 
-You can download this from the download area of [Official website] (<http://www.dolibarr.org/>)
+Releases can be downloaded from [official website](http://www.dolibarr.org/).
 
-If you already have installed a Web server and a Mysql database, you can install the standard version like this:
+### Simple setup
 
-- Uncompress the downloaded archive.
+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:
 
-- 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, call the dolibarr "install/" page.
+- DoliWamp for Windows
+- DoliDeb for Debian or Ubuntu
+- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
-Url depends on choice made on first step:
+### Advanced setup
 
-	http://localhost/dolibarr/htdocs/install/
-or
+You can use a Web server and a supported database (MySQL recommended) to install the standard version.
 
-	http://localhost/dolibarr/install/
-or
+- 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
 
-	http://yourdolibarrvirtualhost/install/
+    The URL will depends on choices made in the first step:
+
+        http://localhost/dolibarr/htdocs/install/
+        
+    or
+    
+        http://localhost/dolibarr/install/
+        
+    or
+    
+    	http://yourdolibarrvirtualhost/install/
    
-- Follow instructions provided by installer...
+- Follow the installer instructions
 
+## UPGRADING
 
+- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
+- If you're upgrading from version x.y.z to x.y.w (only third number differs), there is no need to run any migration process.
+- If you're upgrading from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access) and follow the upgrade process.
 
-## UPGRADE
-
-To upgrade Dolibarr from an old version to this one:
-
-- Overwrite all old files inside old 'dolibarr' directory by files provided into new version package.
-  
-- If you came from version x.y.z to x.y.w (only third number differ), there is no need to run any migrate process.
-  
-- If you came from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access).
-
-This URL should looks like:
-
-	http://localhost/dolibarr/htdocs/install/
-or
-
-	http://localhost/dolibarr/install/
-or
-
-	http://yourdolibarrhost/install/
-
-Then choose the "update" option according to your case.
-Note: Migrate process can be ran safely several times.
-  
-
+*Note: migration process can safely be done multiple times.*
 
 ## WHAT'S NEW
 
-See ChangeLog file found into package.
+See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+## FEATURES
 
+### Main modules (all optional)
 
-## WHAT DOLIBARR CAN DO
+- Customers, Prospects and/or Suppliers directory
+- Products and/or Services catalog
+- Commercial proposals management
+- Customer and Supplier Orders management
+- Invoices and payment management
+- Standing orders management (European SEPA)
+- Bank accounts management
+- Shared calendar
+- Opportunities and/or project management (following project benefit including invoices, expense reports, time spent, ...)
+- Projects management
+- Contracts management
+- Stock management
+- Shipping management
+- Interventions management
+- Agenda with ical and vcal export for third party tools integration
+- Electronic Document Management (EDM)
+- Foundations members management
+- Employee's holidays management
+- Mass emailing
+- Surveys
+- Point of Sale
+- …
 
-### Main modules/features:
+### Other modules
 
-- Customers, Prospects or Suppliers directory.
-- Products and services catalog.
-- Bank accounts management.
-- Orders management.
-- Commercial proposals management.
-- Contracts management.
-- Invoices management.
-- Payments management.
-- Standing orders management.
-- Stock management.
-- Shipping management.
+- Bookmarks management
+- Donations management
+- Reporting
+- Data export/import
+- Thirdparties and/or products categories
+- Barcodes support
+- Margin calculations
+- LDAP connectivity
+- ClickToDial integration
+- RSS integration
+- Skype integration
+- Payment platforms integration (PayBox, PayPal)
+- …
+
+### Other general features
+- Multi-Users and groups with finely grained rights
+- Localization in most major languages
+- Can manage several companies by adding external module multi-company.
+- Can manage several currencies by adding external module multi-currency.
+- Very user friendly and easy to use
+- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
+- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
+- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
+- 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
+    - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
 - PDF or ODT generation for invoice, proposals, orders...
-- Agenda with ical,vcal export for third tools integration.
-- EDM (Electronic Document Management).
-- Foundations members management.
-- Employee's holidays management.
-- Mass Emailing.
-- Realize surveys.
-- Point of Sale.
+- …
 
-### Other modules:
+### Extending
 
-- Bookmarks management.
-- Donations management.
-- Reporting.
-- Data export/import.
-- Third parties or products categories. 
-- LDAP connectivity.
-- ClickToDial integration.
-- RSS integration.
-- Can be extended with a lot of other external modules available onto DoliStore.com.
+Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](http://www.dolistore.com).
 
-### Miscellaneous:
+## FUTURE
 
-- Multi-user, with several permissions levels for each feature.
-- Very user friendly and easy to use.
-- Highly customizable: Enable only modules you need, user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one).
-- Works with PHP 5.3+, MySql 4.1 or PostgreSQL 8.1.
-- Require PHP and Mysql or Postgresql (See exatc versions on http://wiki.dolibarr.org/index.php/Prerequisite).
-- Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
-- Support countries 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.  
-   Compatible with European directives (2006/112/CE ... 2010/45/UE) (http://europa.eu/legislation_summaries/taxation/l31057_en.htm)
-   ...
+These are features that Dolibarr does **not** yet fully support:
 
+- Double-entry bookkeeping yet (only bank and treasury management)
+- Tasks dependencies in projects
+- Payroll module
+- Webmail
+- Dolibarr can't do coffee (yet)
 
-## WHAT DOLIBARR CAN'T DO YET (TODO LIST)
+## DOCUMENTATION
 
-This is features that Dolibarr does not support completely yet:
+Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](http://wiki.dolibarr.org).
 
-- No double party accountancy (only bank and treasury management).
-- Dolibarr manage one currency at once (mono-currency).
-- Dolibarr manage one master activity (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
-- Tasks on module project can't have dependencies between each other.
-- Dolibarr does not contains Payroll module.
-- Dolibarr does not include any Webmail.
-- Dolibarr can't do coffee (not yet).
+## CONTRIBUTING
 
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/CONTRIBUTING.md)
 
-## SOCIAL NETWORKS
+## CREDITS
 
-Follow Dolibarr project on
+Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
-Facebook: <https://www.facebook.com/dolibarr>
+See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
-Google+: <https://plus.google.com/+DolibarrOrg>
+## NEWS AND SOCIAL NETWORKS
 
-Twitter: <http://www.twitter.com/dolibarr>
+Follow Dolibarr project on:
 
+- [Facebook](https://www.facebook.com/dolibarr)
+- [Google+](https://plus.google.com/+DolibarrOrg)
+- [Twitter](http://www.twitter.com/dolibarr)
+- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
+- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
+- [GitHub](https://github.com/Dolibarr/dolibarr)

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Script build for hudson CI -->
 <project name="dolibarr" default="hudson" basedir=".">
-fdfds
 <!-- Exclude/ignore paths -->
  <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
  <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />

build/aps/configure.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /*-----------------------------------------------------
  *

build/aps/install.forced.php.install

@@ -21,4 +21,3 @@ $force_install_databaserootpass='';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-?>

build/debian/README.howto

@@ -29,6 +29,9 @@ Files are saved int .gnupg directory
 [DEFAULT]
 pristine-tar = True
 
+[buildpackage]
+ignore-branch = True
+
 [git-buildpackage]
 sign-tags = True
 export-dir = ../build-area/
@@ -38,6 +41,15 @@ filter-pristine-tar = True
 END
 
 
+# Complete .bashrc with DEBEMAIL and DEBFULLNAME
+Example:
+export DEBFULLNAME="Laurent Destailleur (eldy)" 
+export DEBEMAIL=eldy@users.sourceforge.net
+Other example:
+export DEBFULLNAME="Laurent Destailleur" 
+export DEBEMAIL="eldy@destailleur.fr"
+
+
 # To use Alioth.debian.org
 * Create an account login
 * Update your ~/.ssh/config file to add:
@@ -101,14 +113,51 @@ http://packages.qa.debian.org/package.html
 http://bugs.debian.org/package
 
 
+##### Modify severity of a bug ticket
+
+- Send this email to control@bugs.debian.org and wait 10 minutes
+
+severity 123 xxx
+
+
+##### Update bug tracker system
+
+To set status of a bug to "pending"
+> bts --smtp-host=yoursmtpserver tag 999999 +pending
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 +pending
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 +pending
+
+
+To remove status of a bug without "moreinfo" (bug can be processed)
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 -moreinfo
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 -moreinfo
+
+
 
 ##### Testing a package into unstable env
 
-Check you have a mysql server available from another interface than localhost
+Check you have a mysql server available from another interface than "localhost".
 Comment line in /etc/mysql/my.cnf if required and restart mysql
 #bind-address = 127.0.0.1
 
-Create a chroot called "unstable-amd64-sbuild"
+Create a chroot called "unstable-amd64-sbuild".
+Chroot env is stored into /srv/chroot directory.
 > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
@@ -116,6 +165,7 @@ Pour lister les env chroot
 
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot
+> cat /etc/debian_chroot       to check which debian branch we are into
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get install links mysql-client
 
@@ -129,7 +179,10 @@ Pour tester un package
 > dpkg -i dolibarr*.deb  ou   pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
 > apt-get install -f
 
-Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote).
+If there is a problem launching apache, because port is already used, change it into your chroot install with
+> vi /etc/apache2/ports.conf
+Then restart.
+Then you can call/test dolibarr with http://localhost:port/dolibarr/ (It can be also called from host).
 
 
 
@@ -158,7 +211,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 * Some files are removed from archive by the get-orig-source.sh 
 
 * Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
+> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
 
 Note: If there was errors solved manually, you may need to make a git commit
 
@@ -171,11 +224,15 @@ Warning: Date must have format reported by "date -R"
 Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
 
 * We try to build package
-> rm -fr ../build-area; git-buildpackage -us -uc
+> rm -fr ../build-area; 
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
 
+Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
+Note: To compare 2 packages: debdiff package1.dsc package2.dsc
+
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
@@ -183,7 +240,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu
 
 * If ok, you can tag.
 > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
-> git-buildpackage --git-tag-only --git-retag
+> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
 > git push --tags
 
 * Compilation is then done by a debian developer and sent
@@ -196,26 +253,9 @@ http://packages.qa.debian.org/t/tcpdf.html
 * Package will be into release when test will be moved as stable.
 
 
-
-##### Update but tracker system
-To set status of a bug to pending
-> bts tag 999999 +pending
-
-or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with: 
-Control: tag -1 +pending
-and then a text like:
-Thanks. Fixed into git.
-
-or replay to email control@bugs.debian.org
-With only message 
-tag 729538 +pending
-
-
-
 ##### Create/Maintain dolibarr package
 
-To update dolibarr debian package
+To update dolibarr debian package when upstream (official version of external project) has changed:
 
 * You can git clone debian git repo
 > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
@@ -229,7 +269,7 @@ from git clone dir and make link to git.
 * If local branch upstream and pristine-tar does not exists, create it
 from origin/upstream and origin/pristine.
 
-* If new upstream is available onto sourceforge, launch:
+* When new upstream is available onto sourceforge, launch:
 > debian/get-orig-source.sh
 If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
 
@@ -243,39 +283,53 @@ dolibarr-x.y.z+dfsgw.tgz
 (x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
 
 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
+> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
 and enter version when requested with format
 x.y.z+dfsgw
 (x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
-* Add an entry into debian/changelog
-> dch -v x.y.z+dfsg-w "My comment" will add entry.
-For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
-Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
+* Fix debian/* files used to build package.
+Add an entry into debian/changelog
+> dch -v x.y.z+dfsgw-v "My comment" will add entry.
+For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
+Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
 Then check/modify also the user/date signature:
 - Date must have format reported by "date -R"
 - Name and email must match value into debian/control file (Entry added here is used by next step).
 
-* We try to build package
-> rm -fr ../build-area; git-buildpackage -us -uc
 
+To update dolibarr debian package when only files into debian has changed, or if you include manually backport:
+
+* Change files and commit.
+* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
+
+
+Once files has been prepared, it's time to test:
+
+* Try to build package
+> rm -fr ../build-area;
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
+
+Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
+Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
 * Test package (see dedicated chapter to test it with debian unstable env)
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git push --all ou git push origin --all
+> git push --all
 
 * If ok, you can tag.
 > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
-> git-buildpackage --git-tag-only --git-retag
+> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
 > git push --tags
 
+
 * Compilation is then done by a debian developer and sent
 > sbuild ...
 > dput ...
@@ -288,3 +342,44 @@ http://packages.qa.debian.org
 
 * Package will be into release when test will be moved as stable.
 
+
+##### Send an unblock request 
+
+Use this to move from unstable to testing.
+
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
+Choose package "release.debian.org"
+Then "unblock"
+Then name of package "dolibarr"
+Fill message, for example:
+"Please unblock package dolibarr
+A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
+Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
+so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
+After discussion with ..., it appears that security holes are enough to request this unblock request."
+
+
+Use this to request an update of a stable package
+
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
+Choose package "release.debian.org"
+Then "unblock"
+Then name of package "dolibarr"
+Fill message, for example:
+"
+A security error CVE-2015-3935 was reported for Dolibarr ERP CRM package. This bug is fixed into official package 3.5.7 of Dolibarr.
+Package 3.5.7 is a maintenance release compared to 3.5.5 and contains only fixes. But not only bugs reported to debian, it includes also other fixes (but they are all related to stability or security).
+I think it is a better solution to validate this maintenance release based on the new upstream version of Dolibarr than applying a patch of the only CVE-2015-3935.
+Pro are:
+- It fixes all debian reported bugs (including security one)
+- It fixes also stability bugs
+- Patches were already tested because deployed and used by several thousands of users.
+- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
+- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
+Cons are: 
+- The patch include more than the only one security reported fxes
+
+So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
+since it provides more stability and is or me a more secured process.
+"
+

build/debian/apache/dolibarr.conf

@@ -15,7 +15,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 #	Require all granted
 #	</IfVersion>
 #	<IfVersion < 2.3>
-#	Order allow, deny
+#	Order allow,deny
 #	Allow from all
 #	</IfVersion>
 #
@@ -27,7 +27,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 	Require all granted
 	</IfVersion>
 	<IfVersion < 2.3>
-	Order allow, deny
+	Order allow,deny
 	Allow from all
 	</IfVersion>
 

build/debian/changelog

@@ -1,4 +1,4 @@
-dolibarr (3.7.1-3) UNRELEASED; urgency=low
+dolibarr (__VERSION__) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.

build/debian/conf.php.install

@@ -222,9 +222,13 @@ $dolibarr_main_prod='0';
 # $dolibarr_main_limit_users='0';
 
 # dolibarr_mailing_limit_sendbyweb
-# Can set a limit for mailing send by web, can be used for a restricted mode.
+# Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
 
-?>
+# dolibarr_mailing_limit_sendbycli
+# Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
+# Default value: 0 (use database value if exist)
+# Examples:
+# $dolibarr_mailing_limit_sendbycli='0';

build/debian/copyright

@@ -159,7 +159,7 @@ Comments:
  Those files are not shipped in the binary package as we
  configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
   
-Files: docs/images/*
+Files: doc/images/*
 Copyright: Laurent Destailleur 
 License: CC-BY-SA-3.0
  You are free:
@@ -176,7 +176,7 @@ License: CC-BY-SA-3.0
  .
  For more information, see http://creativecommons.org/licenses/by-sa/3.0/
 
-Files: htdocs/includes/fpdi/*
+Files: htdocs/includes/fpdfi/*
 Copyright: 2004-2011 Setasign - Jan Slabon
 License: GPL-2+
  This program is free software; you can redistribute it

build/debian/dolibarr.desktop

@@ -22,5 +22,6 @@ Type=Application
 Categories=Office
 StartupNotify=true
 InitialPreference=5
+Keywords=erp,crm,billing,customer,supplier,stock,agenda,project,order,shipment
 #NoDisplay=true
 #OnlyShowIn=GNOME

build/debian/dolibarr.docs

@@ -1,2 +1 @@
 README.md
-README-FR.md

build/debian/dolibarr.postinst

@@ -40,10 +40,28 @@ enable_install_upgrade_wizard() {
     rm -f /var/lib/dolibarr/documents/install.lock
 }
 
+
+php_install() {
+	if which php5enmod >/dev/null 2>&1 ;then
+		# php5endmod exists for ubuntu only
+		echo "Enable php module mysqli with php5enmod"
+		php5enmod mysqli
+    fi
+}
+
 apache_install() {
 	webserver=$1
+	
+	# Enable Apache 2 alias module
+	if which a2enmod >/dev/null 2>&1 ;then
+		echo "Enable apache module alias with a2enmod"
+		a2enmod alias
+	fi
+	
+	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
+		echo "Enable link for Apache config file with a3enconf"
 		a2enconf dolibarr
 	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
@@ -88,11 +106,7 @@ case "$1" in
 			echo This is not a first install
 		fi
 
-		# Apache 2 setup
-		if which a2enmod >/dev/null 2>&1 ;then
-			a2enmod alias
-		fi
-		
+		php_install
 		apache_install
 		lighttpd_install
 		

build/debian/install.forced.php.install

@@ -26,7 +26,7 @@ $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If we enable/disable libraries declaration during install, we must also check they are 
+// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';
@@ -42,5 +42,3 @@ $force_install_lockinstall='444';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 //$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
-
-?>

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

@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // 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";
@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined

build/debian/watch

@@ -2,4 +2,4 @@
 version=3
 
 #http://sf.net/dolibarr/dolibarr-(.+)\.tgz
-http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz
+http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.orig\.tar\.gz

build/doxygen/doxygen_footer.html

@@ -26,7 +26,7 @@ for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversio
 
 
 <!--  Google AdSense -->
-<center>
+<div class="center">
 <script type="text/javascript"><!--
 google_ad_client = "pub-1071905880519467";
 /* PUBBANDEAUDOLIBARR */
@@ -36,7 +36,7 @@ google_ad_height = 60;
 //-->
 </script>
 <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-</center>
+</div>
 <!-- End google adsense -->
 <br>
 

build/doxygen/doxygen_header.html

@@ -24,7 +24,7 @@ File added into doxygen generated documentation
 </div>
 
 <div id="logodol">
-<center>
+<div class="center">
 <table width="100%">
 	<tr>
 		<td><div id="projectname">$projectname</div> - <span id="projectnumber">$projectnumber</span></td>
@@ -54,7 +54,7 @@ File added into doxygen generated documentation
 		<!-- banner end --></td>
 	</tr>
 </table>
-</center>
+</div>
 
 </div>
 

build/exe/doliwamp/UsedPort.cpp

@@ -277,7 +277,7 @@ help=!(Port > 0);
 Usage:
 if (help) {
 	printf("----- %s V%s (c)Laurent Destailleur -----\n",PROG,VERSION);
-	printf("%s is a software that allows you to know if a TCP/IP port is used\n",PROG);
+	printf("%s is software that allows you to know if a TCP/IP port is used\n",PROG);
 	printf("%s sources can be compiled for WIN32 (VC++, GCC CYGWIN, MINGW) or for\n");
 	printf("Unix/Linux (GCC)\n",PROG);
 	printf("\n");

build/generate_filecheck_xml.php

@@ -0,0 +1,99 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       build/generate_filecheck_xml.php
+ *		\ingroup    dev
+ * 		\brief      This script create a xml checksum file
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+
+// Main
+parse_str($argv[1]);
+//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
+$outputfile=dirname(__FILE__).'/../htdocs/install/filelist.xml';
+$fp = fopen($outputfile,'w');
+fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
+fputs($fp, '<checksum_list version="'.$release.'">'."\n");
+
+fputs($fp, '<dolibarr_htdocs_dir>'."\n");
+
+$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
+$iterator1 = new RecursiveIteratorIterator($dir_iterator1);
+// need to ignore document custom etc
+$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+$dir='';
+$needtoclose=0;
+foreach ($files as $file) {
+    $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    if ($newdir!=$dir) {
+        if ($needtoclose)
+            fputs($fp, '</dir>'."\n");
+        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
+        $dir = $newdir;
+        $needtoclose=1;
+    }
+    if (filetype($file)=="file") {
+        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
+    }
+}
+fputs($fp, '</dir>'."\n");
+fputs($fp, '</dolibarr_htdocs_dir>'."\n");
+
+
+fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
+
+$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
+$iterator2 = new RecursiveIteratorIterator($dir_iterator2);
+// need to ignore document custom etc
+$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+$dir='';
+$needtoclose=0;
+foreach ($files as $file) {
+    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    if ($newdir!=$dir) {
+        if ($needtoclose)
+            fputs($fp, '</dir>'."\n");
+        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
+        $dir = $newdir;
+        $needtoclose=1;
+    }
+    if (filetype($file)=="file") {
+        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
+    }
+}
+fputs($fp, '</dir>'."\n");
+fputs($fp, '</dolibarr_script_dir>'."\n");
+
+
+fputs($fp, '</checksum_list>'."\n");
+fclose($fp);
+
+print "File ".$outputfile." generated\n";
+
+exit(0);

build/launchpad/README

@@ -41,23 +41,21 @@ If you want to build/test package locally:
 # Push/declare Dolibarr sources to Launchpad
 #----------------------------------
 - From Launchpad project (https://launchpad.net/dolibarr), register a series: 
-    Call it 'trunk' or 'beta' or 'stable'
+    Call it 'trunk' or 'stable'
     Use branch (dev):
-    ~eldy/dolibarr/develop
-    ~eldy/dolibarr/beta
-    ~eldy/dolibarr/stable
+    https://launchpad.net/~eldy/dolibarr/develop
+    https://launchpad.net/~eldy/dolibarr/stable
     or 
-    Use URL pattern (beta or stable):
+    Use URL pattern (stable):
     For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
-    For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
     
 - For Dev, you can also add link serie to GIT HEAD.
-- For beta and stable, you can init from command line
-	cd bzr/dolibarr-[beta|stable]
+- For stable, you can init from command line
+	cd bzr/dolibarr-stable
     bzr init
     bzr add
     bzr commit -m "Init"
-    bzr push lp:~yourlogin/dolibarr/[beta|stable]
+    bzr push lp:~yourlogin/dolibarr/stable
 
 - List of series are visible here: https://launchpad.net/dolibarr/+series
 
@@ -65,19 +63,19 @@ If you want to build/test package locally:
 #----------------------------------
 	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable]
-    cd dolibarr-[dev|beta|stable]
+	bzr branch lp:~yourlogin/dolibarr/[develop|stable] dolibarr-[dev|stable]
+    cd dolibarr-[dev|stable]
     # Update
     bzr update
-	-- Update files here. Remove all and overwrite --
+	-- Update files here: Remove all (except .bzr dir) and overwrite --
     bzr status
 	bzr add *
-    bzr commit -m "Description of change"
+    bzr commit -m "Upstream version x.y"
     bzr push
 
 # Init debian dir repository into launchpad (when repository for sources does not exist)
 #----------------------------------
--  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
     cd bzr
     mkdir debian
     cd debian
@@ -85,25 +83,25 @@ If you want to build/test package locally:
     bzr init
     bzr add
     bzr commit -m "Init control files"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name or just bzr push if into a known branch)
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]    (put here any branch name or just bzr push if into a known branch)
 - or download it from launchpad bazaar:
     cd bzr
-    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
 
 # Get debian dir repository from launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
 
 # To update debian dir into launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-    cd debian-[dev|beta|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+    cd debian-[dev|stable]
     bzr status
-	-- Update files here --
+	-- Update files here: Remove all (except .bzr dir) and overwrite. Restore version into the file changelog --
     bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]
 
 
 # Define a recipe into launchpad (a rule to build packages into a PPA)
@@ -115,10 +113,6 @@ If you want to build/test package locally:
 	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
 		lp:dolibarr
 		merge packaging lp:~yourlogin/+junk/debian-dev
-    	For beta:
-	    # bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
-		lp:dolibarr/beta
-		merge packaging lp:~yourlogin/+junk/debian-beta
     	For stable:
 	    # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
 		lp:dolibarr/stable
@@ -126,13 +120,12 @@ If you want to build/test package locally:
 - Run command
     cd bzr
     bzr dailydeb dolibarr.recipe working-dir
-  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|beta|stable]
+  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|stable]
 - Test package sources
     sudo pbuilder build <working-dir>/<project>_<version>.dsc
 
 List of recipes created
 https://code.launchpad.net/~eldy/+recipe/dolibarr-dev
-https://code.launchpad.net/~eldy/+recipe/dolibarr-beta
 https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 
     
@@ -147,9 +140,6 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 For the development snapshot version: 
 deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
-For the beta version: 
-deb http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
-deb-src http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
 For the stable version:
 deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 

build/makepack-dolibarr.pl

@@ -22,7 +22,8 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
-@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","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",
 "ASSO"=>"git ssh rsync"
@@ -64,6 +65,13 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
+if ($SOURCE !~ /^\//)
+{
+	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
+	print "$PROG.$Extension aborted.\n";
+	sleep 2;
+	exit 1;
+}
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
@@ -140,9 +148,9 @@ $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 $ARCH='noarch';
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev (fedora)
-$newbuild =~ s/beta/0.2.beta1/gi;				# beta (fedora)
-$newbuild =~ s/rc./0.3.rc1/gi;					# rc (fedora)
-if ($newbuild !~ /-/) { $newbuild.='-0.3'; }	# finale (fedora)
+$newbuild =~ s/beta(.?)/0.2.beta/gi;			# beta (fedora)    (we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/0.3.rc/gi;				# rc (fedora)      (we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-0.4'; }	# finale (fedora)
 #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
 #$newbuild =~ s/beta/1/gi;						# beta
 #$newbuild =~ s/rc./2/gi;						# rc
@@ -154,10 +162,10 @@ $FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
 # For Deb
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/1/gi;                # dev
-$newbuild =~ s/beta/2/gi;                       # beta
-$newbuild =~ s/rc./3/gi;                        # rc
-if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc. 
-# now newbuild is 0-1 or 0-3 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
+$newbuild =~ s/beta(.?)/2/gi;                   # beta    			(we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/3/gi;                     # rc				(we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale is same than rc. 
+# now newbuild is 0-1 or 0-4 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
 $build = $newbuild;
 $build =~ s/-.*$//g;
 # now build is 0 for example
@@ -165,6 +173,7 @@ $build =~ s/-.*$//g;
 # now build is 0+nmu1 for example
 $FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
 $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
+$FILENAMEDEBSHORT="${PROJECT}_${MAJOR}.${MINOR}.${build}";
 
 
 my $copyalreadydone=0;
@@ -337,16 +346,41 @@ foreach my $target (sort keys %CHOOSEDPUBLISH) {
 
 if ($nboftargetok) {
 
-	# Update CVS if required
-	#-----------------------
+	# Update GIT tag if required
+	#---------------------------
 	if ($nbofpublishneedtag)
 	{
 		print "Go to directory $SOURCE\n";
 		$olddir=getcwd();
 		chdir("$SOURCE");
+		
+		# Test that the ChangeLog is ok
+		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
+		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
+		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
+		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
+		if (! $ret)
+		{
+			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\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\' | 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 "\n";
+			exit;
+		}
+		else
+		{
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n";
+		}
+			
 		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
 		$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-		if ($ret =~ /already exists/)
+		if ($ret =~ /(already exists|existe déjà)/)
 		{
 			print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
 			$QUESTIONOVERWRITETAG=<STDIN>; 
@@ -355,10 +389,15 @@ if ($nboftargetok) {
 			{
 				print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
 				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
+				print 'Run git push -f --tags'."\n";
+				$ret=`git push -f --tags`;
 			}
 		}
-		print 'Run git push --tags'."\n";
-		$ret=`git push --tags`;
+		else
+		{
+			print 'Run git push --tags'."\n";
+			$ret=`git push --tags`;
+		}
 		chdir("$olddir");
 	}
 	
@@ -420,6 +459,7 @@ if ($nboftargetok) {
 
 		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
 
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
@@ -428,6 +468,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/multitail`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
@@ -455,23 +496,33 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-		# Removed known external modules to avoir any error when packaging on test env 
+
+		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`;	# For custom we want to keep dir
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimed*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimod*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$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/oscim*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
-		# Removed other test files
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
+		$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
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`;				# This is a dev tool
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
@@ -481,20 +532,36 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+        $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
    	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
+        $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`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
+        $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/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
 
@@ -679,7 +746,7 @@ if ($nboftargetok) {
 			use Date::Language;
 			$lang=Date::Language->new('English');
 			$datestring = $lang->time2str("%a %b %e %Y", time);
-    		$changelogstring="* ".$datestring." Laurent Destailleur $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
+    		$changelogstring="* ".$datestring." Laurent Destailleur (eldy) $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
 
 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
 			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
@@ -711,7 +778,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
 			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-			$ret=`$cmd`;
+			#$ret=`$cmd`;
 			next;
 		}
 
@@ -746,7 +813,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 
 			print "Remove other files\n";
-			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR.md`;
 			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
 			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
@@ -782,17 +849,28 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
 			# Removed duplicate license files
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/php-iban/LICENSE`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColReorder/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColVis/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/FixedColumns/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/Responsive/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/license.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/select2/LICENSE`;
+			$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`;
+			
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
 			# Removed files we don't need
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			$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`;
@@ -801,8 +879,17 @@ if ($nboftargetok) {
 			print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
 			$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
 			print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+			# Add files for dpkg-source (changelog)
+			#$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			open (SPECFROM,"<$SOURCE/build/debian/changelog") || die "Error";
+			open (SPECTO,">$BUILDROOT/$PROJECT.tmp/debian/changelog") || die "Error";
+			while (<SPECFROM>) {
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
 			# Add files for dpkg-source
-			$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
 			$ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -845,8 +932,11 @@ 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/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
@@ -1020,10 +1110,20 @@ if ($nboftargetok) {
 		%filestoscansf=(
 			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
 		);
+		%filestoscanstableasso=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
+		);
+
 		use POSIX qw/strftime/;
 		foreach my $file (sort keys %filestoscansf)
 		{
@@ -1064,15 +1164,24 @@ if ($nboftargetok) {
 
 				print "\n";
 	    		
-	    		if ($target eq 'SF') { 
+	    		if ($target eq 'SF' && $filestoscan{$file} ne 'none') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n";
 	    		}
-	    		else
-	    		{
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
+	    			$destFolder="$NEWPUBLISH/$filestoscanstableasso{$file}";
+	    		} 
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH !~ /stable/) {
 	    			$destFolder="$NEWPUBLISH";
-		    		print "Publish file ".$file." to $NEWPUBLISH\n";
+	    		} 
+	    		else	# No more used
+	    		{
+	    			$dirnameonly=$file;
+	    			$dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/;  
+	    			$filenameonly=$file;
+	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
+	    			$destFolder="$NEWPUBLISH/$dirnameonly";
 	    		}
+	    		print "Publish file ".$file." to ".$destFolder."\n";
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
@@ -1092,7 +1201,7 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 
-				$command="rsync -s $OPTIONUPDATEDIST -e 'ssh' \"$file\" \"".$destFolder."\"";
+				$command="rsync -s -e 'ssh' \"$file\" \"".$destFolder."\"";
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";

build/makepack-howto.txt

@@ -8,15 +8,16 @@ This files describe steps made by Dolibarr packaging team to make a
 beta version of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIXED\|NEW'"
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..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"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-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"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
-- Update version number with x.y.z-w in build/debian/changelog
 - Commit all changes.
-- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
-- Create a branch (x.y).
 
 - Run makepack-dolibarr.pl to generate all packages.
 
+- Create a branch (x.y), if version seems stable enough.
+
 - Move build files into www.dolibarr.org web site
   (/home/dolibarr/wwwroot/files/lastbuild).
 
@@ -29,9 +30,10 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^Fix\|New\|Sec'"
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..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"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-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"
 - Update version number with x.y.z in htdocs/filefunc.inc.php
-- Update version number with x.y.z in build/debian/changelog
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.

build/obs/README

@@ -14,7 +14,7 @@ https://build.opensuse.org
 Packaging rules: http://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot
+OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 

build/pad/DoliWamp.pml

@@ -1,195 +1,195 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_PML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<CompanyName />
-	<Program_Info>
-		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
-		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>26048004</File_Size_Bytes>
-			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>24.84</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
-			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
-			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
-
-DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
-			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
-			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_PML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<CompanyName />
+	<Program_Info>
+		<Program_Name>DoliWamp</Program_Name>
+		<Program_Version>3.5.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
+		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>26048004</File_Size_Bytes>
+			<File_Size_K>25437</File_Size_K>
+			<File_Size_MB>24.84</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
+			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
+			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
+			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
+		</French>
+		<Italian>
+			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
+			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</PADGEN_PML>

build/pad/Dolibarr.pml

@@ -1,202 +1,202 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_PML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<CompanyName />
-	<Program_Info>
-		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>No Install Support</Program_Install_Support>
-		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>9359175</File_Size_Bytes>
-			<File_Size_K>9139</File_Size_K>
-			<File_Size_MB>8.93</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
-
-Simple to install
-
-Simple to use
-
-Simple to develop 
-
-Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
-		</English>
-		<Italian>
-			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-
-Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
-
-Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
-
-Simple pour le développement (pas de frameworks lourds). 
-
-Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
-		</French>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
-			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_PML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<CompanyName />
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<Program_Version>3.5.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>9359175</File_Size_Bytes>
+			<File_Size_K>9139</File_Size_K>
+			<File_Size_MB>8.93</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+Simple to install
+Simple to use
+Simple to develop 
+Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
+		</English>
+		<Italian>
+			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+		<French>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
+Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
+Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
+Simple pour le développement (pas de frameworks lourds). 
+Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
+		</French>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</PADGEN_PML>

build/pad/pad_dolibarr.xml

@@ -1,232 +1,232 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>No Install Support</Program_Install_Support>
-		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>18037439</File_Size_Bytes>
-			<File_Size_K>18037</File_Size_K>
-			<File_Size_MB>18.03</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
-
-Simple to install
-
-Simple to use
-
-Simple to develop 
-
-Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-
-Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
-
-Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
-
-Simple pour le développement (pas de frameworks lourds). 
-
-Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
-			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
+<?xml version="1.0" encoding="UTF-8" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>Dolibarr team</Company_Name>
+		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>Dolibarr team</Author_First_Name>
+			<Author_Last_Name>Dolibarr team</Author_Last_Name>
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name>Dolibarr team</Contact_First_Name>
+			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
+			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
+			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
+			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<Program_Version>3.5</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>18037439</File_Size_Bytes>
+			<File_Size_K>18037</File_Size_K>
+			<File_Size_MB>18.03</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+Simple to install
+Simple to use
+Simple to develop 
+Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
+Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
+Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
+Simple pour le développement (pas de frameworks lourds). 
+Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
+		</French>
+		<Italian>
+			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</XML_DIZ_INFO>

build/pad/pad_doliwamp.xml

@@ -1,225 +1,225 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>11 Rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>contact@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>contact@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>support@nltechno.com</Sales_Email>
-			<Support_Email>support@nltechno.com</Support_Email>
-			<General_Email>support@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
-		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>26048004</File_Size_Bytes>
-			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>24.84</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
-			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
-			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
-
-DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
-			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
-			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>contact@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>contact@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>support@nltechno.com</Sales_Email>
+			<Support_Email>support@nltechno.com</Support_Email>
+			<General_Email>support@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>DoliWamp</Program_Name>
+		<Program_Version>3.5</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
+		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>26048004</File_Size_Bytes>
+			<File_Size_K>25437</File_Size_K>
+			<File_Size_MB>24.84</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
+			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
+			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
+			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
+		</French>
+		<Italian>
+			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
+			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</XML_DIZ_INFO>

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2012 Regis Houssin  <regis.houssin@capnetworks.com>
+# \author       (c)2009-2015 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,8 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-	# TODO Replace this with version of Dolibar we want to install 
-	return ( "x.y.z", "3.6.0");
+return ( "3.8.1", "3.7.1", "3.6.4", "3.5.7" );
 }
 
 sub script_dolibarr_category
@@ -57,6 +56,26 @@ local ($d, $ver) = @_;
 return ("mysql", "postgres");
 }
 
+# script_dolibarr_depends(&domain, version)
+sub script_dolibarr_depends
+{
+local ($d, $ver, $sinfo, $phpver) = @_;
+local @rv;
+
+if ($ver >= 3.6) {
+	# Check for PHP 5.3+
+	local $phpv = &get_php_version($phpver || 5, $d);
+	if (!$phpv) {
+		push(@rv, "Could not work out exact PHP version");
+		}
+	elsif ($phpv < 5.3) {
+		push(@rv, "Dolibarr requires PHP version 5.3 or later");
+		}
+	}
+
+return @rv;
+}
+
 # script_dolibarr_params(&domain, version, &upgrade-info)
 # Returns HTML for table rows for options for installing dolibarr
 sub script_dolibarr_params
@@ -78,8 +97,7 @@ else {
 	$rv .= &ui_table_row("Database for Dolibarr tables",
 		     &ui_database_select("db", undef, \@dbs, $d, "dolibarr"));
 	$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
-			     &ui_opt_textbox("dir", "dolibarr", 30,
-					     "At top level"));
+			     &ui_opt_textbox("dir", &substitute_scriptname_template("dolibarr", $d), 30, "At top level"));
 	if ($d->{'ssl'} && $ver >= 3.0) {
 		$rv .= &ui_table_row("Force https connection?",
 				     &ui_yesno_radio("forcehttps", 0));
@@ -145,7 +163,7 @@ return ("tar", "gunzip");
 }
 
 # script_dolibarr_install(&domain, version, &opts, &files, &upgrade-info)
-# Actually installs joomla, and returns either 1 and an informational
+# Actually installs dolibarr, and returns either 1 and an informational
 # message, or 0 and an error
 sub script_dolibarr_install
 {
@@ -159,7 +177,8 @@ if ($opts->{'newdb'} && !$upgrade) {
 local ($dbtype, $dbname) = split(/_/, $opts->{'db'}, 2);
 local $dbuser = $dbtype eq "mysql" ? &mysql_user($d) : &postgres_user($d);
 local $dbpass = $dbtype eq "mysql" ? &mysql_pass($d) : &postgres_pass($d, 1);
-local $dbphptype = $dbtype eq "mysql" ? "mysqli" : "pgsql";
+local $dbphptype = $dbtype eq "mysql" && $version >= 3.6 ? "mysql" :
+		   $dbtype eq "mysql" ? "mysqli" : "pgsql";
 local $dbhost = &get_database_host($dbtype);
 local $dberr = &check_script_db_connection($dbtype, $dbname, $dbuser, $dbpass);
 return (0, "Database connection failed : $dberr") if ($dberr);
@@ -187,6 +206,9 @@ $pgcharset = $tmpl->{'postgres_encoding'};
 $charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
 $collate = $dbtype eq "mysql" ? $mycollate : "C";
 
+# Install filename
+local $step = $version >= 3.8 ? "step" : "etape";
+
 $path = &script_path_url($d, $opts);
 if ($path =~ /^https:/ || $d->{'ssl'}) {
         $url = "https://$d->{'dom'}";
@@ -201,12 +223,14 @@ if ($opts->{'path'} =~ /\w/) {
 if (!$upgrade) {
 	local $cdef = "$opts->{'dir'}/conf/conf.php.example";
     &run_as_domain_user($d, "cp ".quotemeta($cdef)." ".quotemeta($cfile));
-	&set_ownership_permissions(undef, undef, 0777, $cfiledir);
-	&set_ownership_permissions(undef, undef, 0666, $cfile);
+	&set_permissions_as_domain_user($d, 0777, $cfiledir);
+	&set_permissions_as_domain_user($d, 0666, $cfile);
 	&run_as_domain_user($d, "mkdir ".quotemeta($docdir));
-	&set_ownership_permissions(undef, undef, 0777, $docdir);
-	&run_as_domain_user($d, "mkdir ".quotemeta($altdir));
-	&set_ownership_permissions(undef, undef, 0777, $altdir);
+	&set_permissions_as_domain_user($d, 0777, $docdir);
+	if (!$version >= 3.7.2) {
+		&run_as_domain_user($d, "mkdir ".quotemeta($altdir));
+		&set_permissions_as_domain_user($d, 0777, $altdir);
+	}
 }
 else {
 	# Preserve old config file, documents and custom directory
@@ -242,7 +266,7 @@ if ($upgrade) {
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Remove the installation directory.
@@ -265,15 +289,15 @@ else {
 			  [ "main_force_https", $opts->{'forcehttps'} ],
 			  [ "dolibarr_main_db_character_set", $charset ],
 			  [ "dolibarr_main_db_collation", $collate ],
-			  [ "usealternaterootdir", "1" ],
+			  [ "main_use_alt_dir", "1" ],
 			  [ "main_alt_dir_name", "custom" ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."1", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Second page (Populate database)
 	local @params = ( [ "action", "set" ] );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape2", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Third page (Add administrator account)
@@ -282,15 +306,15 @@ else {
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
 	 		 );
-	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# 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_ownership_permissions(undef, undef, 0644, $cfile);
-	&set_ownership_permissions(undef, undef, 0755, $cfiledir);
+	&set_permissions_as_domain_user($d, 0644, $cfile);
+	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
  
 # Return a URL for the user
@@ -307,13 +331,10 @@ local ($params, $page, $d, $opts) = @_;
 local $params = join("&", map { $_->[0]."=".&urlize($_->[1]) } @$params );
 local $ipage = $opts->{'path'}."/install/".$page.".php";
 local ($iout, $ierror);
-
 &post_http_connection($d, $ipage, $params, \$iout, \$ierror);
-
 if ($ierror) {
 	return $ierror;
 	}
-
 return undef;
 }
 
@@ -329,10 +350,10 @@ local $derr = &delete_script_install_directory($d, $opts);
 return (0, $derr) if ($derr);
 
 # Remove all llx_ tables from the database
-# 3 times because of constraints
-&cleanup_script_database($d, $opts->{'db'}, "llx_");
-&cleanup_script_database($d, $opts->{'db'}, "llx_");
-&cleanup_script_database($d, $opts->{'db'}, "llx_");
+# 10 times because of constraints
+for(my $i=0; $i<10; $i++) {
+	&cleanup_script_database($d, $opts->{'db'}, "llx_");
+	}
 
 # Take out the DB
 if ($opts->{'newdb'}) {
@@ -363,9 +384,10 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-                $ver >= 3.2 ? "dolibarr\\-(3\\.[0-9\\.]+)\\.tgz" :
-                $ver >= 3.1 ? "dolibarr\\-(3\\.1\\.[0-9\\.]+)\\.tgz" :
-                $ver >= 3 ? "dolibarr\\-(3\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.8 ? "dolibarr\\-(3\\.[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);

build/rpm/dolibarr-forrpm.patch

@@ -25,7 +25,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // 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
@@ -39,4 +39,4 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined

build/rpm/dolibarr_fedora.spec

@@ -159,6 +159,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
@@ -172,30 +173,35 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
+%_datadir/dolibarr/htdocs/printing
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_generic.spec

@@ -239,6 +239,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
@@ -252,30 +253,35 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
+%_datadir/dolibarr/htdocs/printing
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_mandriva.spec

@@ -156,6 +156,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
@@ -169,30 +170,35 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
+%_datadir/dolibarr/htdocs/printing
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_opensuse.spec

@@ -167,6 +167,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
@@ -180,30 +181,35 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
+%_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
+%_datadir/dolibarr/htdocs/printing
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/install.forced.php.fedora

@@ -31,5 +31,3 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf';
-
-?>

build/rpm/install.forced.php.generic

@@ -20,4 +20,3 @@ $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 // We don't force any external lib with generic package
-?>

build/rpm/install.forced.php.mandriva

@@ -31,5 +31,3 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf';
-
-?>

build/rpm/install.forced.php.opensuse

@@ -31,5 +31,3 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf';
-
-?>

build/travis-ci/apache.conf

@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+  DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
+
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
+    Options FollowSymLinks MultiViews ExecCGI
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+  </Directory>
+
+  # Wire up Apache to use Travis CI's php-fpm.
+  <IfModule mod_fastcgi.c>
+    AddHandler php5-fcgi .php
+    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
+  </IfModule>
+</VirtualHost>

composer.json

@@ -6,26 +6,41 @@
     "homepage": "http://www.dolibarr.org",
     "license": "GPL-3.0+",
     "support": {
-        "issues": "https://doliforge.org/projects/dolibarr",
+        "issues": "https://github.com/Dolibarr/dolibarr/issues",
         "forum": "http://www.dolibarr.org/forum",
-        "wiki": "http://wiki.dolibarr.org"
+        "wiki": "http://wiki.dolibarr.org",
+        "irc": "irc://chat.freenode.net/dolibarr",
+        "source": "https://github.com/Dolibarr/dolibarr"
     },
     "require": {
         "php": ">=5.3.0",
-        "ext-gd": "*",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "ccampbell/chromephp": "^4.1",
+        "ckeditor/ckeditor": "dev-full/4.3.x#0b7c3f1",
+        "mike42/escpos-php": "dev-master",
+        "mobiledetect/mobiledetectlib": "2.8.17",
+        "phpoffice/phpexcel": "1.8.1",
+        "restler/framework": "^3.0",
+        "tecnickcom/tcpdf": "6.2.12"
     },
     "suggest": {
-        "ext-mysqli": "*",
-        "ext-pgsql": "*",
-        "ext-mssql": "*",
-        "ext-pdo_sqlite": "*",
-        "ext-imagick": "*",
-        "ext-mcrypt": "*",
-        "ext-openssl": "*",
-        "ext-mbstring": "*",
-        "ext-soap": "*",
-        "ext-zip": "*",
-        "ext-xml": "*"
+        "ext-mysqlnd": "To use with MySQL or MariaDB",
+        "ext-mysqli": "To use with MySQL or MariaDB",
+        "ext-pgsql": "To use with PostgreSQL",
+        "ext-mssql": "To use with MSSQL (experimental)",
+        "ext-pdo_sqlite": "To use with SQLite (experimental)",
+        "ext-gd": "Image manipulation (Required but maybe built-in PHP)",
+        "ext-imagick": "Image manipulation (TCPDF)",
+        "ext-mcrypt": "(Required but maybe built-in PHP)",
+        "ext-openssl": "Secure connections (Emails, SOAP…)",
+        "ext-mbstring": "Handle non UTF-8 databases",
+        "ext-soap": "Native SOAP",
+        "ext-zip": "ODT and Excel support",
+        "ext-xml": "Excel support",
+        "firephp/firephp-core": "Logging to Firebug console support",
+        "raven/raven": "Sentry logging server support"
+    },
+    "config": {
+        "vendor-dir": "htdocs/includes"
     }
 }

composer.lock

@@ -0,0 +1,415 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "d8229cbb9aea945c9ca803bbe54d7aa7",
+    "content-hash": "47929ed42fb67e5159ccec6a3a5a45eb",
+    "packages": [
+        {
+            "name": "ccampbell/chromephp",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ccampbell/chromephp.git",
+                "reference": "c3c297615d48ae5b2a86a82311152d1ed095fcef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ccampbell/chromephp/zipball/c3c297615d48ae5b2a86a82311152d1ed095fcef",
+                "reference": "c3c297615d48ae5b2a86a82311152d1ed095fcef",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "ChromePhp": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Craig Campbell",
+                    "email": "iamcraigcampbell@gmail.com",
+                    "homepage": "http://craig.is",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Log variables to the Chrome console (via Chrome Logger Google Chrome extension).",
+            "homepage": "http://github.com/ccampbell/chromephp",
+            "keywords": [
+                "log",
+                "logging"
+            ],
+            "time": "2013-06-26 03:44:33"
+        },
+        {
+            "name": "ckeditor/ckeditor",
+            "version": "dev-full/4.3.x",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ckeditor/ckeditor-releases.git",
+                "reference": "0b7c3f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/252e512e911f21d880ea542fe162c4643885b317",
+                "reference": "0b7c3f1",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+",
+                "LGPL-2.1+",
+                "MPL-1.1+"
+            ],
+            "authors": [
+                {
+                    "name": "CKSource - Frederico Knabben",
+                    "homepage": "http://cksource.com"
+                }
+            ],
+            "description": "JavaScript WYSIWYG web text editor.",
+            "homepage": "http://ckeditor.com",
+            "keywords": [
+                "CKEditor",
+                "editor",
+                "fckeditor",
+                "html",
+                "javascript",
+                "richtext",
+                "text",
+                "wysiwyg"
+            ],
+            "time": "2014-02-26 15:43:10"
+        },
+        {
+            "name": "mike42/escpos-php",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mike42/escpos-php.git",
+                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/63648d03d47b81e8f6c1020ac92f051a3f3b5793",
+                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.5.*"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roni Saha",
+                    "email": "roni.cse@gmail.com"
+                },
+                {
+                    "name": "Michael Billington",
+                    "email": "michael.billington@gmail.com"
+                },
+                {
+                    "name": "Gergely Radics",
+                    "email": "gerifield@ustream.tv"
+                },
+                {
+                    "name": "Warren Doyle",
+                    "email": "w.doyle@fuelled.co"
+                },
+                {
+                    "name": "vharo",
+                    "email": "vharo@geepok.com"
+                }
+            ],
+            "description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
+            "homepage": "https://github.com/mike42/escpos-php",
+            "keywords": [
+                "ESC-POS",
+                "driver",
+                "escpos",
+                "print",
+                "receipt"
+            ],
+            "time": "2015-12-04 10:23:55"
+        },
+        {
+            "name": "mobiledetect/mobiledetectlib",
+            "version": "2.8.17",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/serbanghita/Mobile-Detect.git",
+                "reference": "b87da5f63a76e9615a0c74fcf168657b1ea7e41d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/b87da5f63a76e9615a0c74fcf168657b1ea7e41d",
+                "reference": "b87da5f63a76e9615a0c74fcf168657b1ea7e41d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.0.0"
+            },
+            "require-dev": {
+                "codeclimate/php-test-reporter": "dev-master",
+                "johnkary/phpunit-speedtrap": "~1.0@dev",
+                "phpunit/phpunit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Mobile_Detect.php"
+                ],
+                "psr-0": {
+                    "Detection": "namespaced/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Serban Ghita",
+                    "email": "serbanghita@gmail.com",
+                    "homepage": "http://mobiledetect.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
+            "homepage": "https://github.com/serbanghita/Mobile-Detect",
+            "keywords": [
+                "detect mobile devices",
+                "mobile",
+                "mobile detect",
+                "mobile detector",
+                "php mobile detect"
+            ],
+            "time": "2015-09-17 14:45:21"
+        },
+        {
+            "name": "phpoffice/phpexcel",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PHPExcel.git",
+                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPExcel": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "http://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Mark Baker"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://blog.rootslabs.net"
+                },
+                {
+                    "name": "Erik Tilt"
+                }
+            ],
+            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "http://phpexcel.codeplex.com",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "time": "2015-05-01 07:00:55"
+        },
+        {
+            "name": "restler/framework",
+            "version": "3.0.0",
+            "target-dir": "Luracast/Restler",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Luracast/Restler-Framework.git",
+                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6ee10b3e5dbc6376916fed55ec2340a37cce436b",
+                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "luracast/restler": "3.*"
+            },
+            "require-dev": {
+                "bshaffer/oauth2-server-php": "v1.0",
+                "luracast/explorer": "*",
+                "mustache/mustache": "dev-master",
+                "rodneyrehm/plist": "dev-master",
+                "symfony/yaml": "*",
+                "twig/twig": "v1.13.0",
+                "zendframework/zendamf": "dev-master"
+            },
+            "suggest": {
+                "bshaffer/oauth2-server-php": "Restler can provide OAuth2 authentication using this library (see require-dev for details)",
+                "luracast/explorer": "Restler's very own api explorer (see require-dev for details)",
+                "mustache/mustache": "Restler can render HtmlView using mustache/handlebar templates (see require-dev for details)",
+                "rodneyrehm/plist": "Restler supports tho Apple plist xml format (see require-dev for details)",
+                "symfony/yaml": "Restler can produce content in yaml format as well (see require-dev for details)",
+                "twig/twig": "Restler can render HtmlView using twig templates (see require-dev for details)",
+                "zendframework/zendamf": "Support for the amf document format  (see require-dev for details)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "master": "v3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Luracast\\Restler": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Luracast",
+                    "email": "arul@luracast.com"
+                },
+                {
+                    "name": "Nick nickl- Lombard",
+                    "email": "github@jigsoft.co.za"
+                }
+            ],
+            "description": "Just the Restler Framework without the tests and examples",
+            "homepage": "http://luracast.com/products/restler/",
+            "keywords": [
+                "api",
+                "framework",
+                "rest",
+                "server"
+            ],
+            "time": "2015-08-04 07:52:49"
+        },
+        {
+            "name": "tecnickcom/tcpdf",
+            "version": "6.2.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "fonts",
+                    "config",
+                    "include",
+                    "tcpdf.php",
+                    "tcpdf_parser.php",
+                    "tcpdf_import.php",
+                    "tcpdf_barcodes_1d.php",
+                    "tcpdf_barcodes_2d.php",
+                    "include/tcpdf_colors.php",
+                    "include/tcpdf_filters.php",
+                    "include/tcpdf_font_data.php",
+                    "include/tcpdf_fonts.php",
+                    "include/tcpdf_images.php",
+                    "include/tcpdf_static.php",
+                    "include/barcodes/datamatrix.php",
+                    "include/barcodes/pdf417.php",
+                    "include/barcodes/qrcode.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPLv3"
+            ],
+            "authors": [
+                {
+                    "name": "Nicola Asuni",
+                    "email": "info@tecnick.com",
+                    "homepage": "http://nicolaasuni.tecnick.com"
+                }
+            ],
+            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
+            "homepage": "http://www.tcpdf.org/",
+            "keywords": [
+                "PDFD32000-2008",
+                "TCPDF",
+                "barcodes",
+                "datamatrix",
+                "pdf",
+                "pdf417",
+                "qrcode"
+            ],
+            "time": "2015-09-12 10:08:34"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "ckeditor/ckeditor": 20,
+        "mike42/escpos-php": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.0",
+        "ext-curl": "*"
+    },
+    "platform-dev": []
+}

dev/codesniffer/README

@@ -1,9 +1,12 @@
 README (English)
 --------------------------------
 
-This directory contains ruleset files to use to
-develop Dolibarr EPR & CRM with Eclipse.
+This directory contains ruleset files to use to develop Dolibarr EPR & CRM.
 
-Note: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
+To install/upgrade phpcs:
+> sudo pear upgrade PHP_CodeSniffer
+
+Note with Eclipse: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
 * tab value to 4
-* path of code sniffer standard to dev/codesniffer 
+* path of code sniffer standard to dev/codesniffer 
+

dev/codesniffer/ruleset.dtd

@@ -3,6 +3,7 @@
 <!ATTLIST ruleset name CDATA "">
 <!ELEMENT description (#PCDATA)>
 <!ELEMENT exclude-pattern (#PCDATA)>
+<!ATTLIST exclude-pattern type CDATA "">
 <!ELEMENT rule (properties*,severity*)>
 <!ATTLIST rule ref CDATA "">
 <!ELEMENT properties (property+)>

dev/codesniffer/ruleset.xml

@@ -3,12 +3,12 @@
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>
 
-	<exclude-pattern>*/conf.php</exclude-pattern>
-	<exclude-pattern>*/includes/*</exclude-pattern>
-	<exclude-pattern>*/documents/*</exclude-pattern>
-	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
-	<exclude-pattern>*/custom/*</exclude-pattern>
-	<exclude-pattern>*/nltechno*</exclude-pattern>
+	<exclude-pattern type="relative">build/html</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>
 
 		<!-- List of all tests -->
 
@@ -124,7 +124,7 @@
     <!-- Tweaks to metrics -->
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
-            <property name="complexity" value="80" />
+            <property name="complexity" value="120" />
             <property name="absoluteComplexity" value="250" />
         </properties>
     </rule>
@@ -173,138 +173,44 @@
 
 
 
-	<!-- Rules from PEAR Standard -->
+    <!-- Rules from PEAR Standard -->
 
-	<rule ref="PEAR.Classes.ClassDeclaration" />
+    <rule ref="PEAR.Classes.ClassDeclaration" />
 
     <!-- Check for duplicate class names -->
     <!-- <rule ref="Generic.Classes.DuplicateClassName" /> -->
 
     <rule ref="PEAR.Commenting.ClassComment" />
-    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
+
     <!-- TODO Remove this and fix reported errors -->
     <rule ref="PEAR.Commenting.ClassComment.Missing">
         <severity>0</severity>
     </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-    
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
     
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag" />
+
     <rule ref="PEAR.Commenting.ClassComment.MissingAuthorTag">
         <severity>0</severity>
     </rule>
+
     <rule ref="PEAR.Commenting.ClassComment.MissingCategoryTag">
         <severity>0</severity>
     </rule>
+
     <rule ref="PEAR.Commenting.ClassComment.MissingLicenseTag">
         <severity>0</severity>
     </rule>
+
     <rule ref="PEAR.Commenting.ClassComment.MissingLinkTag">
         <severity>0</severity>
     </rule>
+        
     <rule ref="PEAR.Commenting.ClassComment.MissingPackageTag">
         <severity>0</severity>
     </rule>
-    
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
         
+
+   
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -317,15 +223,40 @@
         <severity>0</severity>
     </rule>
     -->
-    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
-        <severity>0</severity>
-    </rule>
     
+    <rule ref="PEAR.Commenting.FunctionComment" />
+
     <rule ref="PEAR.Commenting.FunctionComment.Empty">
         <severity>5</severity>
     </rule>
     
-    <rule ref="PEAR.Commenting.FunctionComment" />
+	<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName" />
+
+    <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>
@@ -358,6 +289,15 @@
 
 	<rule ref="PEAR.Functions.FunctionCallSignature" />
 
+    <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine">
+	    <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
 	    <severity>0</severity>
 	</rule>
@@ -373,12 +313,6 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
         <severity>0</severity>
     </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
-        <severity>0</severity>
-    </rule>
 	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -419,6 +353,11 @@
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
+	<!-- 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

dev/dolibarr_changes.txt

@@ -23,6 +23,21 @@ Replace call to serialize_val with no bugged value
 
 
 
+FPDI:
+-----
+Replace:
+	$this->_readXref($this->_xref, $this->_findXref());
+with:
+    try {
+	        $this->_readXref($this->_xref, $this->_findXref());
+    }
+    catch(Exception $e)
+    {
+        	print $e->getMessage();
+        	exit;
+    }
+
+
 TCPDF:
 ------
 * Removed all fonts except 
@@ -47,6 +62,26 @@ In htdocs/includes/tcpdf/tcpdf.php
 * Renamed getmypid into dol_getmypid().
 
 
+To avoid to have QRcode changed because generated with a random mask, replace
+define('QR_FIND_FROM_RANDOM', 2);
+with
+define('QR_FIND_FROM_RANDOM', false);
+
+
+
+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');
+
+
+
+
+
 JSGANTT:
 --------
 * Replace in function JSGantt.taskLink
@@ -67,3 +102,13 @@ JQUERYFILETREE:
 ---------------
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
+
+
+RESTLER:
+--------
+
+   if ($className == 'Luracast\Restler\string') return;
+   if ($className == 'Luracast\Restler\mixed') return;
+
+
+        

dev/examples/create_invoice.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/create_order.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/create_product.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -66,11 +66,11 @@ $myproduct=new Product($db);
 
 // Definition of product instance properties
 $myproduct->ref                = '1234';
-$myproduct->libelle            = 'libelle';
+$myproduct->label              = 'label';
 $myproduct->price              = '10';
 $myproduct->price_base_type    = 'HT';
 $myproduct->tva_tx             = '19.6';
-$myproduct->type               = 0;
+$myproduct->type               = Product::TYPE_PRODUCT;
 $myproduct->status             = 1;
 $myproduct->description        = 'Description';
 $myproduct->note               = 'Note';

dev/examples/create_user.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/get_contracts.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -73,7 +73,7 @@ $obj->socid=$argv[1];
 
 $listofcontractsforcompany=$obj->getListOfContracts('all');
 
-print_r($listofcontractsforcompany);
+print $listofcontractsforcompany;
 
 
 // -------------------- END OF YOUR CODE --------------------

dev/fixdosfiles.sh

@@ -10,21 +10,21 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-    echo "Detect and fix files ending with bad ending chars (must be LF)"
+	echo "This script detect or clean files with CR+LF into files with LF only. All source files are included, also files into includes."
 	echo "Usage: fixdosfiles.sh [list|fix]"
 fi
 
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	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 "*.txt" \) -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 "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | 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 "*.txt" -o -iname "*.xml" \) -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 "*.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 "*.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 "*.txt" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `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 "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix $fic

dev/ical/event_recu.txt

@@ -0,0 +1,57 @@
+Example fo recurring event, 1 week, no end, exported by Google
+
+# The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
+# first occurence was moved on tuesday. So this record were added.
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Paris:20150519T100000
+DTEND;TZID=Europe/Paris:20150519T110000
+DTSTAMP:20150517T175754Z
+UID:9026chuafli29ns5soshvckamc@google.com
+RECURRENCE-ID;TZID=Europe/Paris:20150518T100000
+CREATED:20150517T174404Z
+DESCRIPTION:
+LAST-MODIFIED:20150517T175008Z
+LOCATION:
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:aaa
+TRANSP:OPAQUE
+END:VEVENT
+
+# The recurring event were recorded every monday the 20150518.
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Paris:20150518T100000
+DTEND;TZID=Europe/Paris:20150518T110000
+RRULE:FREQ=WEEKLY;BYDAY=MO
+DTSTAMP:20150517T175754Z
+UID:9026chuafli29ns5soshvckamc@google.com
+CREATED:20150517T174404Z
+DESCRIPTION:
+LAST-MODIFIED:20150517T174404Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:aaa
+TRANSP:OPAQUE
+END:VEVENT
+
+
+
+
+Example fo recurring event, every 2 month, no end, exported by Google
+
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Paris:20150519T080000
+DTEND;TZID=Europe/Paris:20150519T090000
+RRULE:FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19
+DTSTAMP:20150517T175754Z
+UID:urkq3ih1mlaqeu4dbkpdh4i61s@google.com
+CREATED:20150517T175658Z
+DESCRIPTION:
+LAST-MODIFIED:20150517T175658Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:bbbbb
+TRANSP:OPAQUE
+END:VEVENT

dev/initdata/documents_demo/.htaccess

@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all

dev/initdata/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/initdata/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';