Compatibility with higher php version

Conflicts:
	ChangeLog

.gitignore

@@ -1,6 +1,7 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
 documents/
+custom/
 custom2/
 test/report/
 nbproject
@@ -16,4 +17,7 @@ doxygen_warnings.log
 *.iml
 Thumbs.db
 # Vagrant generated files
-.vagrant
+.vagrant
+/index.html
+/phpmyadmin
+/xhprof

.scrutinizer.yml

@@ -180,38 +180,8 @@ tools:
                 - 'htdocs/includes/*'
             paths: {  }
 
-    php_changetracking:
-        enabled: false
-        bug_patterns:
-            - '\bfix(?:es|ed)?\b'
-        feature_patterns:
-            - '\badd(?:s|ed)?\b'
-            - '\bimplement(?:s|ed)?\b'
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-            
     # Coding-Style / Bug Detection
-    js_hint:
-        enabled: false
-        use_native_config: true
-        extensions:
-            - js
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-        config: {  }
-        path_configs: {  }
+    js_hint: false
 
 
 before_commands: {  }

.travis.yml

@@ -1,114 +1,302 @@
 # 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'
+- '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
+  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,12 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = uz: uz_UZ, sw: sw_SW
-
-[dolibarr.accountancy]
-file_filter = htdocs/langs/<lang>/accountancy.lang
-source_file = htdocs/langs/en_US/accountancy.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
+lang_map = uz: uz_UZ
 
 [dolibarr.admin]
 file_filter = htdocs/langs/<lang>/admin.lang
@@ -218,6 +212,12 @@ source_file = htdocs/langs/en_US/orders.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.oscommerce]
+file_filter = htdocs/langs/<lang>/oscommerce.lang
+source_file = htdocs/langs/en_US/oscommerce.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.other]
 file_filter = htdocs/langs/<lang>/other.lang
 source_file = htdocs/langs/en_US/other.lang
@@ -236,18 +236,6 @@ 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
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.productbatch]
-file_filter = htdocs/langs/<lang>/productbatch.lang
-source_file = htdocs/langs/en_US/productbatch.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.products]
 file_filter = htdocs/langs/<lang>/products.lang
 source_file = htdocs/langs/en_US/products.lang
@@ -266,12 +254,6 @@ source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.resource]
-file_filter = htdocs/langs/<lang>/resource.lang
-source_file = htdocs/langs/en_US/resource.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.salaries]
 file_filter = htdocs/langs/<lang>/salaries.lang
 source_file = htdocs/langs/en_US/salaries.lang
@@ -284,6 +266,12 @@ source_file = htdocs/langs/en_US/sendings.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.shop]
+file_filter = htdocs/langs/<lang>/shop.lang
+source_file = htdocs/langs/en_US/shop.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.sms]
 file_filter = htdocs/langs/<lang>/sms.lang
 source_file = htdocs/langs/en_US/sms.lang
@@ -325,3 +313,4 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
+

COPYRIGHT

@@ -9,42 +9,41 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
-Component              Version       License                     GPL Compatible  Usage
+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
-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
-GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
-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
-PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
+AdoDb-Date            0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
+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
+GeoIP                 1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap                0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+odtPHP                1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+PHPExcel              1.7.6         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPPrintIPP           1.3           GPL-2+                      Yes             Library to send print IPP requests
+TCPDF                 6.0.093       LGPL-3+                     Yes             PDF generation
 
 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 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 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
-jQuery Flot            0.7           MIT License                 Yes             JS library to build graph
-jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
-jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
-jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
-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 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)
+jQuery                1.8.2         MIT License                 Yes             JS library
+jQuery UI             1.9.1         GPL and MIT License         Yes             JS library plugin UI
+jQuery UI Multiselect ?             GPL and MIT 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 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
+jQuery Flot           0.7           MIT License                 Yes             JS library to build graph
+jQuery JCrop          0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
+jQuery Jeditable      1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
+jQuery jNotify        1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
+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 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)
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html

ChangeLog

@@ -2,261 +2,63 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-WARNING: Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
-Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
-You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
-Upgrading to any other version or database system is abolutely required BEFORE trying to
-make a Dolibarr upgrade.
+***** ChangeLog for 3.6.7 compared to 3.6.6 *****
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: CVE CVE-2015-8685
 
-
-***** ChangeLog for 3.7.2 compared to 3.7.1 *****
-FIX [ bug #2855 ] Wrong translation key in localtax report page
-FIX [ bug #1852 ] JS error when editing a customer order line
-FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form
-FIX [ bug #3055 ] Product image thumbnails were not deleted after deleting the image
-FIX [ bug 1634 ] Error deleting a project when it had many linked objects
-FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly
-FIX [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
-FIX: Not showing delivery date on rouget pdf
-FIX: Not showing task extrafields when creating from left menu
-FIX [ bug #3288 ] Tasks box is not properly drawn
-FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts
-FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
-FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
-FIX [ bug #3431 ] Invoice bank account is not respected
-FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
-FIX [ bug #3358 ] Tasks box does not work with PostgreSQL
-FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models
-FIX [ bug #3460 ] Bank account is not saved when creating a customer invoice and facing an error message
-
-NEW: Created new ContratLigne::insert function
-
-***** ChangeLog for 3.7.1 compared to 3.7.* *****
-FIX Bug in the new photo system
-FIX Error management
-FIX [ Bug #2714 ] Members -> Memberxy-> Agenda -> technical Error
-FIX [ Bug #2713 ] 3.7.0 mailing-unsubscribe.php not unsubscribe
-FIX #2901
-FIX when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status
-FIX check the user status during authentication
-FIX top links menu have target attribute with wrong value
-FIX extrafields required on thirdparty
-FIX create contact with extrafield is null when it is require
-FIX width multiselect
-FIX "script" tag with wrong syntax
-Fix bug debian 786479
-FIX update usergroup name
-Fix facturestats was not filtering on invoice type
-FIX #2856 : Wrong table design
-FIX button create payment hide if tax amount is less than 1
-FIX event for restricted user was restricted if company null
-FIX send mail, copy sendto don't read the list of contact
-FIX Properly escape untrusted data to prevent HTML injection.
-FIX send mail, copy sendto don't read the list of contact
-
-Path to save photos of products was moved in 3.7.0 to match path of other attached files. If you had loose
-your photo on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to
-restore old path.
-
-WARNING:
-
-Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
-Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
-You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
-Upgrading to any other version or database system is abolutely required BEFORE trying to
-make a Dolibarr upgrade.
-
-***** ChangeLog for 3.7 compared to 3.6.* *****
-For users:
-- New: Match other auth system: Login can be done entering login or user
-       email (this open the road for SSO).
-- New: Agenda export by project #1967.
-- New: Increase length of thirdparty to 128 chars.
-- New: "Is Order shippable" icon #1975.
-- New: statistics on supplier orders and invoices on home page.
-- New: Add permissions to read all trips and expenses.
-- New: Can filter on date into tab "Referring object" of a project.
-- New: Module notification has been enhanced:
-       EMail use now language of target contact.
-       Can also define a fixed email for notifications.
-- New: Feature to link manually an order to an invoice does not disappear once
-       link has been done.
-- New: Can set a color on user card (visible into agenda view).
-- New: extrafields for projects and tasks are exported to ODT documents.
-- New: Add number of active notification into tab title (like we do for notes and documents)
-- New: Can add product into category from category card.
-- New: PDF event report show project and status of event.
-- New: Can filter on status on interventions.
-- New: Add help info of field type into dictionary of payment types.
-- New: Add proposals into referer page of thirdparty.
-- New: On contact list can set filter on both active and not active (no more exclusive select).
-- New: Intervention documents are now available in ECM module.
-- New: Can attach supplier order to a customer order.
-- New: Supervisor is now visible into user list.
-- New: Add user of creation and validation on invoice export.
-- New: Add info page about browser.
-- New: Enable feature developed for 3.6 we forgot to enabled: Adding prefix
-       on uploaded file names.
-- New: No more dependency between contract and service module.
-- New: [ task #867 ] Remove ESAEB external module code from core.
-- New: Can create proposal from an intervention.
-- New: An event can be assigned to several users.
-- New: Can filter events on a group of users.
-- New: Can filter events of a thirdparty.
-- New: Onto event summary of elements, end date and status are visible.
-- New: Split Agenda view (month, week, day) into different tabs.
-- New: Add a view "per user" of agenda events (with different colors according to type of event).
-- New: Each user can include its own external ics calendar into dolibarr agenda view.
-- New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to
-       create an automatic event into agenda.
-- New: Add new type of event (when type of events are used, not by default).
-- New: Can disable predefined type of events.
-- New: Form to add a photo is immediatly available on photo page if
-       permissions are ok (save one click per photo to add).
-- New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos
-       shown on main product card.
-- New: Add country into table of thirdparties type. This will allow to provide
-       a list of thirdparty types specific to a country (like argentina that
-       need type A or B).
-- New: Can force a specific bank account onto an invoice/order.
-- New: Home page of project area shows list of draft project (like other main page).
-- New: Can search on project ref or string from project main page (like other main page).
-- New: First change to match accessibility rules: http://www.w3.org/TR/WCAG10-HTML-TECHS/
-       Differentiate text and img.
-       Use label into quick search form.
-       Use accesskey on form search.
-- New: Intervention documents are now available in ECM module.
-- New: Add attachments on user card + in ECM module.
-- New: Can add __PROJECT_REF__ and __THIRDPARTY_NAME__ into email topic or content template.
-- New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
-- New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
-- New: Enable supplier price log table.
-- New: [ task #1204 ] add a supplier reference to contract.
-- New: [ task #1218 ] Can drag and drop an event from calendar to change its day.
-- New: Optimize size of image static resources.
-- New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.
-- New: Content of predefined email come firstly from table llx_c_email_template, then translation key.
-- New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture
-       onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
-- New: Add more search field in list of cheque deposits.
-- New: Add feature to order to invoice on supplier part.
-- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export.
-- New: Direct invoice creation from predefined invoice.
-- New: Add dunning into accountancy report.
-- New: Add favorite button into country dictionary to put value on top select list
-- Upgrade phpexcel lib to 1.7.8
-- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export.
-- New : Option on extrafields to have them always editable regardless of the document status.
-- New : New module PrintIPP to print without opening document is available as stable.
-- New : Introduce hidden option STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve at no risk
-        a missing control on missing warehouse.
-- Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
-- Fix: [ bug #1470, #1472, #1473] User trigger problem
-- Fix: [ bug #1489, #1491 ] Intervention trigger problem
-- Fix: [ bug #1492, #1493 ] Member trigger problem
-- Fix: [ bug #1474, #1475 ] Contract trigger problem
-- Fix: [ bug #1496 ] ACTION_DELETE trigger does not show trigger error
-- Fix: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action
-- Fix: [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
-- Fix: [ bug #1505, #1504] Project trigger problem
-- Fix: [ bug #1463, #1464 ] Proposal triggers problem
-- Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
-- Fix: [ bug #1465, #1466 ] Product triggers problem
-- Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
-- Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
-- Fix: [ bug #1506, #1507 ] ECM trigger error problem
-- Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
-- Fix: [ bug #1533 ] Links triggers do not show trigger error message
-- Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
-- Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
-- Fix: datepicker first day of week can be monday by setting into display setup
-- Fix: [ bug #575 ] GED doesn't works if there is "/" in a mask
-
-For users, new experimental module (need to set feature level of instance to experimental to see them):
-- New: Module Accounting Expert to manage accountancy
-		Special Thanks to developpers :
-			Olivier Geffroy
-			Alexandre Spangaro
-			Ari Elbaz
-			Florian Henry
-			Juanjo Menent
-		And to the contributors :
-			Jeff Info				2000 euros
-			Nord Anim		 		 120 euros
-			Hydroflex		 		 120 euros
-			Asysteo			 		 120 euros
-			Fournisseur médical		 120 euros
-- Removed: unmaintained OScommerce module
-
-For translators:
-- Update language files.
-- New: When a translation is not available we always jump to en_US and only en_US.
-
-For developers:
-- New: Syslog module can be set to use ChromePHP plugin to output log server into browser console.
-- New: Add a css style "cursorpointer".
-- New: Select list of users can return user into hierarchy.
-- New: getBrowserInfo can return type of layout of browser (classic/phone/tablet)
-- New: Add hook "searchAgendaFrom" and "beforePDFCreation".
-- New: Add trigger DON_UPDATE, DON_DELETE
-- New: Add country iso code on 3 chars into table of countries.
-- Qual: Removed hard coded rowid into data init of table llx_c_action_trigger.
-- LINEBILL_DELETE, LINK_DELETE, ORDER_SUPPLIER_DELETE, RESOURCE_DELETE trigger called before SQL delete
-- New: [ Task #1481 ] Add trigger BILL_SUPPLIER_UPDATE.
-- New: [ Task #1495 ] Add trigger LINECONTRACT_CREATE.
-- New: Added hook "formConfirm" and "doActions" for supplier invoice card.
-- New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card.
-- New: renamed table llx_c_pays to llx_c_country & libelle field to label.
-- New: Added hook "formConfirm" and "doActions" for fichinter card
-- New: Can search list of thirdparties from web service on part of name.
-- New: Function getCurrencyAmount is marked as deprecated. Use function price to output a price
-       including currency symbol.
-- Qual: Renamed table llx_c_civilite into llx_c_civility,
-		field civilite into label in the same table,
-		and field civilite into civility in other table.
-- Qual: Renamed all files & links "liste.php" into "list.php".
-- Qual: Renamed all files & links "fiche.php" into "card.php".
-- Qual: Replace all constants COMPTA_* by ACCOUNTING_*.
-- Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module
-- Fix: [ bug #1724 ] Can't add a submenu to projects
-
-WARNING:
-
-Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
-Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
-You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration.
-Upgrading to any other version or database system is abolutely required BEFORE trying to
-make a Dolibarr upgrade.
-
-WARNING: Following changes may create regression for some external modules, but was necessary to make
-Dolibarr better:
-
-- Path to save photos of products was moved to match path of other attached files. If you had loose your photo
-  on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to restore old path.
-- If you can't see trips and expenses records, check that you have the new permission "read all
-  trips and expenses".
-- Deprecated module "oscommerce" were removed.
-- Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php
-- Some field into database were renamed from "libelle" to "label".
-- Table llx_c_pays were renamed into llx_c_country.
-- Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after
-  creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead.
-- A lot of pages named fiche.php were renamed into card.php
-- A lot of pages named liste.php were renamed into list.php
-- If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the
-  warehouse module and your Point Of Sale module setup if you use one.
-- Replaced USER_UPDATE_SESSION trigger with an updateSession hook may break modules using it.
+***** ChangeLog for 3.6.6 compared to 3.6.5 *****
+FIX: #3734 Do not show empty links of deleted source objects in stock movement list
+FIX: #4081 Added missing translation
+FIX: #4097 Public holiday calculation
+FIX: #4242 Allow disabling dashes in documents
+FIX: #4243 sql injection
+FIX: Add a protection to not make release if ChangeLog was not generated. Prepare package 3.6.5
+FIX: export with category contact extrafields
+FIX: Not delete a product when have customer price
+FIX: Not deleting contrats on element_element table
 
 ***** ChangeLog for 3.6.5 compared to 3.6.4 *****
-- Fix: [ bug #1776 ] Undefined $deliverycompany variable in pdf_build_address
-- Fix: [ bug #1794 ] Error when cloning Proposal gives error in a malformed page
+FIX: #2957 : missing $langs object for trigger
+FIX: #2983 Load gravatar avatar images securely over HTTPS
+FIX: #3009: Better filtering to prevent SQL injection
+FIX: #3841 creation of a task completed has not status set to finished by default
+FIX: #3890 Expected transactions bank account page, shows negative numbers
+FIX: #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
+FIX: bad calculation for stock value
+FIX: bad stock valo
+FIX: bad stock valorisation
+FIX: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
+FIX: button create payment hide if tax amount is less than 1
+FIX: change object statut on close shipping and remove erratic db commit
+FIX: change order date on clone (as everywhere else)
+FIX: Close #2835 Customer prices of a product shows incorrect history order
+FIX: Close #2837 Product list table column header does not match column body
+FIX: Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0
+FIX: Close bug #2891 Category hooks do not work
+FIX: Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
+FIX: contact country had wrong display if the country dont have translate
+FIX: double db escape add too quote
+FIX: End log must use same level then start log.
+FIX: error in SQL due to a previous fix
+FIX: event for restricted user was restricted if company null
+FIX: facturestat bad sql when customer view is limited
+FIX: If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
+FIX: keep filter by category or by not enough stock if we switch page
+FIX: no need to remove file into mail form, the temp dir will be deleted after any sending
+FIX: no projet_task_time id from trigger TASK_TIMESPENT_CREATE
+FIX: pmp
+FIX: send mail, copy sendto don't read the list of contact
+FIX: The hours of date filter aren't correct
+FIX: tool export handle the type "select" extrafields and return the value instead of id
+FIX: top links menu have target attribute with wrong value
+FIX: total amount in tpl linked object are not reset
+FIX: when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
 
 ***** ChangeLog for 3.6.4 compared to 3.6.3 *****
 - Fix: [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
 
 ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
 - Fix: ref_ext was not saved when recording a customer order from web service
-- Fix: withdrawal create error if in the same month are deleted previus withdrawals.
 - Fix: amarok is a bugged theme making dolidroid failed. We switch to eldy automatically with dolidroid.
 - Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php
 - Fix: withdrawal create error if in the same month are deleted previous withdrawals.
@@ -311,7 +113,6 @@ Dolibarr better:
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
-- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 - Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 - Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 - Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
@@ -406,9 +207,6 @@ For users:
 - Fix: Add actions events not implemented.
 - Fix: Price min of composition is not supplier price min by quantity.
 - Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.
-- Fix: [ bug #1439 ] impossible to remove a a translation (multilanguage-feature)
-- New: If multilangue is enabled, mail (from propal, invoice, etc...) message is pre-defaulted in Customer language
-- Fix: [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error
 - Fix: [ bug #1478 ] BILL_PAYED trigger action does not intercept failure under some circumstances
 - Fix: [ bug #1479 ] Several customer invoice triggers do not intercept trigger action
 - Fix: [ bug #1477 ] Several customer invoice triggers do not show trigger error messages
@@ -436,8 +234,6 @@ For developers:
 - New: A module can disable a standard ECM view.
 - New: Add multilang support into product webservice.
 - New: Add hooks on project card page.
-- New: Add call_trigger method on CommonObject class. So new trigger call within object is just :
-$result = $this->call_trigger($trigger_name, $user)
 
 WARNING: Following change may create regression for some external modules, but was necessary to make
 Dolibarr better:
@@ -445,16 +241,27 @@ Dolibarr better:
 - The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been
 removed. You must now use the 6 parameters way. See file modMyModule.class.php for example. 
 - Remove the javascript function ac_delay() that is not used anymore by core code.
-- Properties "dictionnaries" into module descriptor files have been renamed into "dictionaries".
+- Properties "dictionnaries" into module descriptor files has been renamed into "dictionaries".
 - Method form->select_currency() has been removed. Use instead print form->selectCurrency().
 - Method form->select_methodes_commande() has been renamed into english name selectInputMethod().
 - The following hooks are now 'addreplace' hooks: "formCreateThirdpartyOptions" 
-  So check that return value is 0 to keep default standard behaviour after hook, or 1 to disable
+  So check that return value is 0 to keep default standard behaviour after hook or 1 to disable
   default standard behaviour.
 - Properties "civilite_id" were renamed into "civility_id".
 - Remove add_photo_web() that is not used anymore by core code.
 
 
+***** ChangeLog for 3.5.8 compared to 3.5.7 *****
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: bad calculation for stock value
+FIX: bad stock valo
+FIX: change order date on clone (as everywhere else)
+FIX: CVE CVE-2015-8685
+FIX: The hours of date filter aren't correct
+FIX: #3442 Remove useless syslog
+FIX: #3448 Pass expected date format
+FIX: #3471 3.5 Rounding issue when dispatching non-integer
+
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken due to SSL v3 closed.
 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers

INSTALL

@@ -1,6 +1,6 @@
 INSTALL
 -------
 
-English:     See README.md file.
+English:     See README file.
 
-French:      Voir fichier README-FR.md.
+French:      Voir fichier README-FR.

README-FR.md

@@ -1,16 +1,21 @@
 # DOLIBARR ERP & CRM
 
+## INTRODUCTION
+
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). 
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
  
 ![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
 
+--------------------------------
+Documentation démarrage rapide
+--------------------------------
 
-
-## LICENCE
-
-Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
-
+1) Installer Dolibarr
+2) Mettre à jour Dolibarr depuis une ancienne version
+3) Ce qui est nouveau dans cette version
+4) Ce que peux faire Dolibarr
+5) Ce que ne peux pas faire Dolibarr (pas encore)
 
 
 ## INSTALLER DOLIBARR
@@ -21,9 +26,8 @@ vous devez vous réorienter vers DoliWamp (la version tout-en-un
 de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
 Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
 OpenSuse, Mandriva ou Mageia).
-
-Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
-http://www.dolibarr.org/
+Vous pouvez les télécharger à l'adresse: 
+http://www.dolibarr.org/downloads/
 
 Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:

README.md

@@ -15,7 +15,7 @@ Dolibarr is released under the terms of the GNU General Public License as publis
 
 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).
 
-You can download this from the download area of [Official website] (<http://www.dolibarr.org/>)
+You can download this at: [Official website] (<http://www.dolibarr.org/downloads/>)
 
 If you already have installed a Web server and a Mysql database, you can install the standard version like this:
 

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Script build for hudson CI -->
 <project name="dolibarr" default="hudson" basedir=".">
+
 <!-- 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/README

@@ -28,6 +28,9 @@ Note: Prerequisites to build autoexe DoliWamp package:
   recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
 
+- To build a translaction package, launch the script
+> perl makepack-dolibarrlang.pl
+
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 

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

@@ -153,9 +153,6 @@ from origin/upstream and origin/pristine.
 
 * Into root dir, 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.
-
-* 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
@@ -163,9 +160,9 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dfsg-1 "My comment" will add entry.
-For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
-Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
+> dch -v x.y.z-dsfg-1 "My comment" will add entry.
+For example: dch -v x.y.z-dsfg-1 "New upstream release." for a new version
+Then modify changelog to replace "unstable" with "UNRELEASED".
 
 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).
@@ -231,29 +228,23 @@ from origin/upstream and origin/pristine.
 
 * If 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.
 
-* Edit tgz file to remove 
-- htdocs/includes/ckeditor
-- htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf
-- htdocs/includes/phpexcel
-- htdocs/includes/tcpdf
-And rename file into 
-dolibarr-x.y.z+dfsgw.tgz
-(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
+* Edit tgz file to remove ckeditor and phpexcel and rename file into 
+dolibarr-x.y.z+dsfgw.tgz
+(x.y.z = version, w start from 1 and is increased for each new import)
 
 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
+> git-import-orig -vv ../dolibarr-x.y.z+dsfgw.tgz
 and enter version when requested with format
-x.y.z+dfsgw
+x.y.z+dsfgw
 (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".
+> dch -v x.y.z-w "My comment" will add entry.
+For example: dch -v x.y.z-w "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 "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).

build/debian/apache/.htaccess

@@ -1,8 +1,7 @@
-# File used to disable access into directory documents
 <IfVersion >= 2.3>
 Require all denied
 </IfVersion>
 <IfVersion < 2.3>
-Order deny, allow
-Denied from all
-</IfVersion>
+Order deny,allow
+Deny from all
+</IfVersion>

build/debian/apache/dolibarr.conf

@@ -10,26 +10,12 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 #     DocumentRoot /usr/share/dolibarr/
 #     ErrorLog logs/ldap.example.com-error.log
 #     CustomLog logs/ldap.example.com-access.log common
-#
-#	<IfVersion >= 2.3>
-#	Require all granted
-#	</IfVersion>
-#	<IfVersion < 2.3>
-#	Order allow,deny
-#	Allow from all
-#	</IfVersion>
-#
 # </VirtualHost>
 
 # Directory for web pages
 <Directory /usr/share/dolibarr/htdocs>
-	<IfVersion >= 2.3>
-	Require all granted
-	</IfVersion>
-	<IfVersion < 2.3>
-	Order allow,deny
-	Allow from all
-	</IfVersion>
+    Order deny,allow
+    Allow from all
 
     DirectoryIndex index.php
     Options +FollowSymLinks +Indexes

build/debian/changelog

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

build/debian/conf.php.install

@@ -226,5 +226,3 @@ $dolibarr_main_prod='0';
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
-
-?>

build/debian/control

@@ -22,7 +22,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 #    libnusoap-php,
 #    libphp-pclzip,
 # Required javascript libraries
-#    javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-flot, ckeditor,
+#    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
 # Misc dependencies
 #    fonts-dejavu-core | ttf-dejavu-core,
     xdg-utils,

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/get-orig-source.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
+# Scan for new official sources and download file
+# run with debian/get-orig-source.sh [x.y.z]
 
 tmpdir=$(mktemp -d)
+echo "tmpdir = $tmpdir"
 
-
-# Download source file
 if [ -n "$1" ]; then
     uscan_opts="--download-version=$1"
 fi

build/debian/install.forced.php.install

@@ -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/exe/doliwamp/config.inc.php.install

@@ -376,7 +376,7 @@ $cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
 //        libraries/select_lang.lib.php
 // $cfg['Lang']     = 'en-iso-8859-1';
 
-// Regular expression to limit listed languages, eg. '^(cs|en)' for Czech and
+// Regullar expression to limit listed languages, eg. '^(cs|en)' for Czech and
 // English only
 $cfg['FilterLanguages'] = '';
 

build/launchpad/README

@@ -61,17 +61,13 @@ If you want to build/test package locally:
 
 - List of series are visible here: https://launchpad.net/dolibarr/+series
 
-# To update Dolibarr into launchpad (when remote repository for sources already exists)
+# To update Dolibarr into launchpad (when repository for sources already exists)
 #----------------------------------
-	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable]
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
     cd dolibarr-[dev|beta|stable]
-    # Update
-    bzr update
-	-- Update files here. Remove all and overwrite --
     bzr status
-	bzr add *
+	-- Update files here --
     bzr commit -m "Description of change"
     bzr push
 

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";
@@ -337,16 +345,38 @@ 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
+		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$BUILD" "$SOURCE/ChangeLog" 2>&1`;
+		if (! $ret)
+		{
+			print "Error: The ChangeLogFile was not updated. Run the following command first:\n";
+			if (! $BUILD)
+			{
+				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n`.. --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
+			{
+				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>; 
@@ -420,6 +450,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 +459,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,25 +487,28 @@ 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/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*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		# 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`;
@@ -490,6 +525,7 @@ if ($nboftargetok) {
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $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/php-iban/docs`;
         $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`;
@@ -681,7 +717,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";
@@ -713,7 +749,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;
 		}
 
@@ -803,8 +839,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"`;

build/makepack-dolibarrlang.pl

@@ -0,0 +1,300 @@
+#!/usr/bin/perl
+#----------------------------------------------------------------------------
+# \file         build/makepack-dolibarrlang.pl
+# \brief        Package builder (tgz, zip, rpm, deb, exe)
+# \author       (c)2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+#----------------------------------------------------------------------------
+
+use Cwd;
+
+$PROJECT = "dolibarr";
+
+@LISTETARGET       = ("TGZ");    # Possible packages
+%REQUIREMENTTARGET = (           # Tool requirement for each package
+	"TGZ" => "tar",
+	"ZIP" => "7z",
+	"EXE" => "makensis.exe"
+);
+%ALTERNATEPATH = (
+	"7z"           => "7-ZIP",
+	"makensis.exe" => "NSIS"
+);
+
+use vars qw/ $REVISION $VERSION /;
+$REVISION = '1.10';
+$VERSION  = "1.0 (build $REVISION)";
+
+#------------------------------------------------------------------------------
+# MAIN
+#------------------------------------------------------------------------------
+( $DIR  = $0 ) =~ s/([^\/\\]+)$//;
+( $PROG = $1 ) =~ s/\.([^\.]*)$//;
+$Extension = $1;
+$DIR ||= '.';
+$DIR =~ s/([^\/\\])[\\\/]+$/$1/;
+
+# Detect OS type
+# --------------
+if ( "$^O" =~ /linux/i || ( -d "/etc" && -d "/var" && "$^O" !~ /cygwin/i ) ) {
+	$OS = 'linux';
+	$CR = '';
+}
+elsif ( -d "/etc" && -d "/Users" ) { $OS = 'macosx'; $CR = ''; }
+elsif ( "$^O" =~ /cygwin/i || "$^O" =~ /win32/i ) {
+	$OS = 'windows';
+	$CR = "\r";
+}
+if ( !$OS ) {
+	print "$PROG.$Extension was not able to detect your OS.\n";
+	print "Can't continue.\n";
+	print "$PROG.$Extension aborted.\n";
+	sleep 2;
+	exit 1;
+}
+
+# Define buildroot
+# ----------------
+if ( $OS =~ /linux/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+}
+if ( $OS =~ /macos/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+}
+if ( $OS =~ /windows/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "c:/temp";
+	$PROGPATH = $ENV{"ProgramFiles"};
+}
+if ( !$TEMP || !-d $TEMP ) {
+	print "Error: A temporary directory can not be find.\n";
+	print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "makepack-dolibarrlang.pl aborted.\n";
+	sleep 2;
+	exit 2;
+}
+$BUILDROOT = "$TEMP/dolibarr-buildroot";
+
+my $copyalreadydone = 0;
+my $batch           = 0;
+
+print "Makepack langs version $VERSION\n";
+print "Enter language code to package (en_US, fr_FR, ...) : ";
+$PROJECT = <STDIN>;
+chomp($PROJECT);
+
+# Ask and set version $MAJOR and $MINOR
+print "Enter value for version: ";
+$PROJVERSION = <STDIN>;
+chomp($PROJVERSION);
+( $MAJOR, $MINOR ) = split( /\./, $PROJVERSION, 2 );
+if ( $MINOR eq '' ) {
+	print "Enter value for minor version: ";
+	$MINOR = <STDIN>;
+	chomp($MINOR);
+}
+
+$FILENAME    = "$PROJECT";
+$FILENAMETGZ = "lang_$PROJECT-$MAJOR.$MINOR";
+if ( -d "/usr/src/redhat" ) {
+
+	# redhat
+	$RPMDIR = "/usr/src/redhat";
+}
+if ( -d "/usr/src/RPM" ) {
+
+	# mandrake
+	$RPMDIR = "/usr/src/RPM";
+}
+
+$SOURCE = "$DIR/../../dolibarr";
+$DESTI  = "$SOURCE/build";
+
+# Choose package targets
+#-----------------------
+$target = "ZIP";    # Les langs sont au format zip
+if ($target) {
+	$CHOOSEDTARGET{ uc($target) } = 1;
+}
+else {
+	my $found = 0;
+	my $NUM_SCRIPT;
+	while ( !$found ) {
+		my $cpt = 0;
+		printf( " %d - %3s    (%s)\n",
+			$cpt, "All", "Need " . join( ",", values %REQUIREMENTTARGET ) );
+		foreach my $target (@LISTETARGET) {
+			$cpt++;
+			printf( " %d - %3s    (%s)\n",
+				$cpt, $target, "Need " . $REQUIREMENTTARGET{$target} );
+		}
+
+		# Are asked to select the file to move
+		print "Choose one package number or several separated with space: ";
+		$NUM_SCRIPT = <STDIN>;
+		chomp($NUM_SCRIPT);
+		if ( $NUM_SCRIPT =~ s/-//g ) {
+
+			# Do not do copy
+			$copyalreadydone = 1;
+		}
+		if ( $NUM_SCRIPT !~ /^[0-$cpt\s]+$/ ) {
+			print "This is not a valid package number list.\n";
+			$found = 0;
+		}
+		else {
+			$found = 1;
+		}
+	}
+	print "\n";
+	if ($NUM_SCRIPT) {
+		foreach my $num ( split( /\s+/, $NUM_SCRIPT ) ) {
+			$CHOOSEDTARGET{ $LISTETARGET[ $num - 1 ] } = 1;
+		}
+	}
+	else {
+		foreach my $key (@LISTETARGET) {
+			$CHOOSEDTARGET{$key} = 1;
+		}
+	}
+}
+
+# Test if requirement is ok
+#--------------------------
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
+
+		# Test
+		print "Test requirement for target $target: Search '$req'... ";
+		$ret         = `"$req" 2>&1`;
+		$coderetour  = $?;
+		$coderetour2 = $coderetour >> 8;
+		if (
+			$coderetour != 0
+			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
+				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
+			&& $PROGPATH
+		  )
+		{
+
+			# Not found error, we try in PROGPATH
+			$ret         = `"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+			$coderetour  = $?;
+			$coderetour2 = $coderetour >> 8;
+			$REQUIREMENTTARGET{$target} = "$PROGPATH/$ALTERNATEPATH{$req}/$req";
+		}
+
+		if (
+			$coderetour != 0
+			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
+				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
+		  )
+		{
+
+			# Not found error
+			print
+"Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+			$CHOOSEDTARGET{$target} = -1;
+			last;
+		}
+		else {
+
+			# Pas erreur ou erreur autre que programme absent
+			print " Found " . $REQUIREMENTTARGET{$target} . "\n";
+		}
+	}
+}
+
+print "\n";
+
+# Check if there is at least on target to build
+#----------------------------------------------
+$nboftargetok = 0;
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
+	$nboftargetok++;
+}
+
+if ($nboftargetok) {
+
+	# Update buildroot
+	#-----------------
+	if ( !$copyalreadydone ) {
+		print "Delete directory $BUILDROOT\n";
+		$ret = `rm -fr "$BUILDROOT"`;
+		mkdir "$BUILDROOT";
+		mkdir "$BUILDROOT/htdocs";
+		mkdir "$BUILDROOT/htdocs/langs";
+		mkdir "$BUILDROOT/htdocs/langs/$PROJECT";
+
+		print "Copy $SOURCE into $BUILDROOT\n";
+		mkdir "$BUILDROOT";
+		$ret =
+		  `cp -pr "$SOURCE/htdocs/langs/$PROJECT" "$BUILDROOT/htdocs/langs"`;
+	}
+	print "Clean $BUILDROOT\n";
+	$ret =
+`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/Thumbs.db`;
+	$ret =
+`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/*/CVS*`;
+
+	# Build package for each target
+	#------------------------------
+	foreach my $target ( keys %CHOOSEDTARGET ) 
+	{
+		if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
+
+		print "\nBuild package for target $target\n";
+
+		if ( $target eq 'TGZ' ) 
+		{
+			unlink $FILENAMETGZ . tgz;
+
+			#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
+			print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
+			$cmd =
+"tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
+			$ret = `$cmd`;
+
+#        	$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
+#        	$ret=`$cmd`;
+			if ( $OS =~ /windows/i ) {
+				print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
+				$ret = `mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+
+   #        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+			}
+			next;
+		}
+
+		if ( $target eq 'ZIP' ) 
+		{
+			unlink $FILENAMEZIP . zip;
+			print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+			chdir("$BUILDROOT");
+
+#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+			$ret =
+			  `7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+			print "Move $FILENAMEZIP.zip to $DESTI\n";
+			rename( "$BUILDROOT/$FILENAMEZIP.zip", "$DESTI/$FILENAMEZIP.zip" );
+			next;
+		}
+	}
+}
+
+print "\n----- Summary -----\n";
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	if ( $CHOOSEDTARGET{$target} < 0 ) {
+		print "Package $target not built (bad requirement).\n";
+	}
+	else {
+		print "Package $target built succeessfully in $DESTI\n";
+	}
+}
+
+if ( !$btach ) {
+	print "\nPress key to finish...";
+	my $WAITKEY = <STDIN>;
+}
+
+0;

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`.. --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`.. --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

@@ -29,18 +29,12 @@ To submit a snapshot for building, we should have a service file with content
 </services>
 
 How to have such a service file created automatically ?
+Click on "Add file", then select mode "Upload From: Remote URL"
+Enter the Remote URL that should looks like this: http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-3.src.rpm
 
-Go into project you want to update. It mught be:
-- openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
-- or your private project
-
-Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
-Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.3.src.rpm
-
-Then add into Advanded - Attributes
+Then add into advanded - attributes
 OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Stable|Testing|Development|Private
+OBS:QualityCategory Testing
 
 
 # Move project into official directory

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2015 Regis Houssin  <regis.houssin@capnetworks.com>
+# \author       (c)2009-2012 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,8 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.7.2", "3.6.3", "3.5.6" );
+	# TODO Replace this with version of Dolibar we want to install 
+	return ( "x.y.z", "3.6.0");
 }
 
 sub script_dolibarr_category
@@ -56,26 +57,6 @@ 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
@@ -97,7 +78,8 @@ 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", &substitute_scriptname_template("dolibarr", $d), 30, "At top level"));
+			     &ui_opt_textbox("dir", "dolibarr", 30,
+					     "At top level"));
 	if ($d->{'ssl'} && $ver >= 3.0) {
 		$rv .= &ui_table_row("Force https connection?",
 				     &ui_yesno_radio("forcehttps", 0));
@@ -177,8 +159,7 @@ 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" && $version >= 3.6 ? "mysql" :
-		   $dbtype eq "mysql" ? "mysqli" : "pgsql";
+local $dbphptype = $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);
@@ -220,10 +201,12 @@ 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_permissions_as_domain_user($d, 0777, $cfiledir);
-	&set_permissions_as_domain_user($d, 0666, $cfile);
+	&set_ownership_permissions(undef, undef, 0777, $cfiledir);
+	&set_ownership_permissions(undef, undef, 0666, $cfile);
 	&run_as_domain_user($d, "mkdir ".quotemeta($docdir));
-	&set_permissions_as_domain_user($d, 0777, $docdir);
+	&set_ownership_permissions(undef, undef, 0777, $docdir);
+	&run_as_domain_user($d, "mkdir ".quotemeta($altdir));
+	&set_ownership_permissions(undef, undef, 0777, $altdir);
 }
 else {
 	# Preserve old config file, documents and custom directory
@@ -306,8 +289,8 @@ else {
 	local $dinstall = "$opts->{'dir'}/install";
 	$dinstall  =~ s/\/$//;
 	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
-	&set_permissions_as_domain_user($d, 0644, $cfile);
-	&set_permissions_as_domain_user($d, 0755, $cfiledir);
+	&set_ownership_permissions(undef, undef, 0644, $cfile);
+	&set_ownership_permissions(undef, undef, 0755, $cfiledir);
 	}
  
 # Return a URL for the user
@@ -326,7 +309,6 @@ local $ipage = $opts->{'path'}."/install/".$page.".php";
 local ($iout, $ierror);
 
 &post_http_connection($d, $ipage, $params, \$iout, \$ierror);
-print STDERR $iout;
 
 if ($ierror) {
 	return $ierror;
@@ -347,10 +329,10 @@ local $derr = &delete_script_install_directory($d, $opts);
 return (0, $derr) if ($derr);
 
 # Remove all llx_ tables from the database
-# 4 times because of constraints
-for(my $i=0; $i<4; $i++) {
-	&cleanup_script_database($d, $opts->{'db'}, "llx_");
-	}
+# 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_");
 
 # Take out the DB
 if ($opts->{'newdb'}) {

build/rpm/dolibarr_fedora.spec

@@ -162,6 +162,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
+%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_generic.spec

@@ -242,6 +242,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
+%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_mandriva.spec

@@ -159,6 +159,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
+%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_opensuse.spec

@@ -170,6 +170,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
+%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

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,32 @@
     "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": "*"
     },
     "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"
+    },
+    "config": {
+        "vendor-dir": "htdocs/includes"
     }
 }

dev/codesniffer/ruleset.xml

@@ -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/dbmodel/emulate_oscommerce/llx_osc_categories.sql

@@ -0,0 +1,26 @@
+-- ===================================================================
+-- Copyright (C) 2005 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/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_osc_categories (
+  rowid integer unsigned NOT NULL auto_increment,
+  dolicatid integer NOT NULL default '0',
+  osccatid integer NOT NULL default '0',
+  PRIMARY KEY  (rowid),
+  UNIQUE KEY dolicatid (dolicatid),
+  UNIQUE KEY osccatid (osccatid)
+) ENGINE=InnoDB;

dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql

@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2005 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);

dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql

@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2005 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/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_osc_customer (
+  rowid integer NOT NULL default '0',
+  datem datetime default NULL,
+  fk_soc integer NOT NULL default '0',
+  PRIMARY KEY  (rowid),
+  UNIQUE KEY fk_soc (fk_soc)
+) ENGINE=InnoDB;

dev/dbmodel/emulate_oscommerce/llx_osc_order.sql

@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2005 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/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_osc_order (
+  rowid integer NOT NULL default '0',
+  datem datetime default NULL,
+  fk_commande integer NOT NULL default '0',
+  PRIMARY KEY  (rowid),
+  UNIQUE KEY fk_commande (fk_commande)
+) ENGINE=InnoDB;

dev/dbmodel/emulate_oscommerce/llx_osc_product.sql

@@ -0,0 +1,27 @@
+-- ===================================================================
+-- Copyright (C) 2005 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/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_osc_product (
+  rowid integer NOT NULL default '0',
+  datem datetime default NULL,
+  fk_product integer NOT NULL default '0',
+  PRIMARY KEY  (rowid),
+  UNIQUE KEY fk_product (fk_product)
+) ENGINE=InnoDB;
+
+

dev/deduplicatefilelinesrecursively.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+# Recursively deduplicate file lines on a per file basis
+# Useful to deduplicate language files
+#
+# Needs awk 4.0 for the inplace fixing command
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]"
+fi
+
+# To detect
+if [ "x$1" = "xlist" ]
+then
+    for file in `find . -type f -name *.lang`
+    do
+        if [ `sort "$file" | uniq -d | wc -l` -gt 0 ]
+        then
+            echo "$file"
+        fi
+    done
+fi
+
+# To fix
+if [ "x$1" = "xfix" ]
+then
+    for file in `find . -type f -name *.lang`
+    do
+    	awk -i inplace ' !x[$0]++' "$file"
+    done;
+fi

dev/detectduplicatelangkey.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+# Helps find duplicate translation keys in language files
+#
+# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+for file in `find . -type f`
+do
+    dupes=$(
+    sed "s/^\s*//" "$file" | # Remove any leading whitespace
+    sed "s/\s*\=/=/" | # Remove any whitespace before =
+    grep -Po "(^.*?)=" | # Non greedeely match everything before =
+    sed "s/\=//" | # Remove trailing = so we get the key
+    sort | uniq -d # Find duplicates
+    )
+
+    if [ -n "$dupes" ]
+    then
+        echo "Duplicates found in $file"
+        echo "$dupes"
+    fi
+done

dev/detectnotabfiles.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Detect files that does not contains any tab inside
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: fixnotabfiles.sh [list|fix]
-#------------------------------------------------------
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Usage: fixnotabfiles.sh [list|fix]"
-fi
-
-# To detec
-if [ "x$1" = "xlist" ]
-then
-	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
-fi
-
-# To convert
-if [ "x$1" = "xfix" ]
-then
-	echo Feature not implemented. Please fix files manually.
-fi

dev/dolibarr_changes.txt

@@ -44,8 +44,6 @@ In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
 
-* Renamed getmypid into dol_getmypid().
-
 
 JSGANTT:
 --------

dev/fixaltlanguages.sh

@@ -1,68 +0,0 @@
-#!/bin/sh
-# Recursively deduplicate file lines on a per file basis
-# Useful to deduplicate language files
-#
-# Needs awk 4.0 for the inplace fixing command
-#
-# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Scan alternate language files and remove entries found into parent file"
-	echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]"
-	exit
-fi
-if [ "x$2" = "x" ]
-then
-	echo "Scan alternate language files and remove entries found into parent file"
-	echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]"
-	exit
-fi
-
-# To detect
-if [ "x$1" = "xlist" ]
-then
-	echo Feature not available
-fi
-
-# To fix
-if [ "x$1" = "xfix" ]
-then
-    for dir in `find htdocs/langs/$3* -type d`
-    do
-    	dirshort=`basename $dir`
-    	
-    	#echo $dirshort
-    	
-		export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'`
-        export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'`
-        aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'`
-        if [ $aaupper = "EN" ]
-        then
-        	aaupper="US"
-        fi
-    	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
-    	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
-    	then
-    	    reflang="htdocs/langs/"$aa"_"$aaupper
-    	    if [ -d $reflang ]
-    	    then
-		    	echo "***** Process language "$aa"_"$bb" - Search original into "$reflang
-    			echo $dirshort is an alternative language of $reflang
-    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
-    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
-    			do f=`cat $fic | wc -l`; 
-    			    #echo $f lines into file $fic; 
-    			    if [ $f = 1 ] 
-    			    then 
-    			        echo Only one line remainging into file $fic, we delete it;
-    			        rm $fic 
-    			    fi;
-    			done
-    		fi
-    	fi
-    done;
-fi

dev/fixdosfiles.sh

@@ -10,7 +10,6 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-    echo "Detect and fix files ending with bad ending chars (must be LF)"
 	echo "Usage: fixdosfiles.sh [list|fix]"
 fi
 

dev/fixduplicatelangkey.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-# Helps find duplicate translation keys in language files
-#
-# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
-
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-    echo "Detect duplicate translation keys inside a file (there is no cross file check)."
-	echo "Usage: detectduplicatelangkey.sh (list|fix)"
-fi
-
-
-if [ "x$1" = "xlist" ]
-then
-	for file in `find htdocs/langs/en_US -name *.lang -type f`
-	do
-	    dupes=$(
-	    sed "s/^\s*//" "$file" | # Remove any leading whitespace
-	    sed "s/\s*\=/=/" | # Remove any whitespace before =
-	    grep -Po "(^.*?)=" | # Non greedeely match everything before =
-	    sed "s/\=//" | # Remove trailing = so we get the key
-	    sort | uniq -d # Find duplicates
-	    )
-	
-	    if [ -n "$dupes" ]
-	    then
-	        echo "Duplicates found in $file"
-	        echo "$dupes"
-	    fi
-	done
-fi
-
-# To convert
-if [ "x$1" = "xfix" ]
-then
-	echo Feature not implemented. Please fix files manually.
-fi

dev/fixduplicatelines.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-# Recursively deduplicate file lines on a per file basis
-# Useful to deduplicate language files
-#
-# Needs awk 4.0 for the inplace fixing command
-#
-# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Find exact duplicated lines into file (not cross file checking)"
-	echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]"
-fi
-
-# To detect
-if [ "x$1" = "xlist" ]
-then
-    for file in `find htdocs/langs/en_US -type f -name *.lang`
-    do
-        if [ `sort "$file" | grep -v '^$' | uniq -d | wc -l` -gt 0 ]
-        then
-            echo "***** $file"
-            sort "$file" | grep -v '^$' | uniq -d
-        fi
-    done
-fi
-
-# To fix
-if [ "x$1" = "xfix" ]
-then
-    for file in `find htdocs/langs/en_US -type f -name *.lang`
-    do
-    	awk -i inplace ' !x[$0]++' "$file"
-    done;
-fi

dev/fixnotabfiles.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+#------------------------------------------------------
+# Script to find files that are not Unix encoded
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: fixnotabfiles.sh [list|fix]
+#------------------------------------------------------
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: fixnotabfiles.sh [list|fix]"
+fi
+
+# To detec
+if [ "x$1" = "xlist" ]
+then
+	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
+fi
+
+# To convert
+if [ "x$1" = "xfix" ]
+then
+	echo Feature not implemented. Please fix files manually.
+fi

dev/fixperms.sh

@@ -10,7 +10,6 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-	echo "Fix permissions of files"
 	echo "Usage: fixperms.sh (list|fix)"
 fi
 
@@ -26,6 +25,4 @@ then
 	find ./htdocs -type f -iname "*.php" -exec chmod a-x {} \; 
 	chmod a+x ./scripts/*/*.php
 	chmod a+x ./scripts/*/*.sh
-	chmod g-w ./scripts/*/*.php
-	chmod g-w ./scripts/*/*.sh
 fi

dev/fixutf8bomfiles.sh

@@ -12,7 +12,6 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-    echo "Detect and fix bad UTF8 encoded files (UTF8 must not use BOM char)"
 	echo "Usage: fixutf8bomfiles.sh (list|fix) [addincludes]"
 fi
 

dev/initdata/generate-facture.php

@@ -94,7 +94,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 
 	print "Invoice ".$i." for socid ".$socid;
 
-	$facture = new Facture($db);
+	$facture = new Facture($db, $socids[$socid]);
 	$facture->date = time();
 	$facture->cond_reglement_id = 3;
 	$facture->mode_reglement_id = 3;

dev/initdata/generate-propale.php

@@ -122,7 +122,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	$soc = new Societe($db);
 
 
-	$propal = new Propal($db);
+	$propal = new Propal($db, $socids[$socid]);
 
 	$obj = $conf->global->PROPALE_ADDON;
 	$modPropale = new $obj;
@@ -130,7 +130,6 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 
 	$propal->ref = $numpr;
 	$propal->contactid = $contids[$socids[$socid]][0];
-	$propal->socid = $socids[$socid];
 	$propal->datep = time();
 	$propal->cond_reglement_id = 3;
 	$propal->mode_reglement_id = 3;

dev/initdata/savedemo.sh

@@ -193,15 +193,13 @@ export list="
 	--ignore-table=$base.llx_cabinetmed_societe
 	--ignore-table=$base.llx_fournisseur_ca
 	--ignore-table=$base.llx_google_maps
-	--ignore-table=$base.llx_notes
 	--ignore-table=$base.llx_pos_paiement_ticket
 	--ignore-table=$base.llx_pos_places
 	--ignore-table=$base.llx_pos_ticket
 	--ignore-table=$base.llx_publi_c_contact_list 
 	--ignore-table=$base.llx_publi_c_dnd_list
 	--ignore-table=$base.llx_publi_c_method_list
-	--ignore-table=$base.llx_ultimatepdf
-	--ignore-table=$base.llx_ventilation_achat
+	--ignore-table=$base.llx_ultimatepdf 
 	" 
 echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
 mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile

dev/initdata/sftpget_and_loaddump.php

@@ -1,138 +0,0 @@
-#!/usr/bin/php
-<?php
-/* Copyright (C) 2012 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 2 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/>.
- * or see http://www.gnu.org/
- */
-
-$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;
-}
-
-// Global variables
-$error=0;
-
-$sourceserver=isset($argv[1])?$argv[1]:'';		// user@server:/src/file
-$password=isset($argv[2])?$argv[2]:'';
-$database=isset($argv[3])?$argv[3]:'';
-$loginbase=isset($argv[4])?$argv[4]:'';
-$passwordbase=isset($argv[5])?$argv[5]:'';
-
-// Include Dolibarr environment
-$res=0;
-if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
-if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
-if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
-if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
-if (! $res) die ("Failed to include master.inc.php file\n");
-include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
-
-
-/*
- *	Main
- */
-
-$login='';
-$server='';
-if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg))
-{
-	$login=$reg[1];
-	$server=$reg[2];
-	$sourcefile=$reg[3];
-	$targetfile=basename($sourcefile);
-}
-if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase))
-{
-	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh database loginbase passbase\n";
-	print "Return code: 0 if success, <>0 if error\n";
-	print "Warning, this script may take a long time.\n";
-	exit(-1);
-}
-
-
-$targetdir='/tmp';
-print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n";
-
-$sftpconnectstring=$sourceserver;
-print 'SFTP connect string : '.$sftpconnectstring."\n";
-//print 'SFTP password '.$password."\n";
-
-
-// SFTP connect
-if (! function_exists("ssh2_connect")) {
-	dol_print_error('','ssh2_connect function does not exists'); exit(1);
-}
-
-$connection = ssh2_connect($server, 22);
-if ($connection)
-{
-	if (! @ssh2_auth_password($connection, $login, $password))
-	{
-		dol_syslog("Could not authenticate with username ".$login." . and password ".$password,LOG_ERR);
-		exit(-5);
-	}
-	else
-	{
-		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
-		/*
-		print "Generate dump ".$filesys1.'.bz2'."\n";
-			$stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2');
-			stream_set_blocking($stream, true);
-			// The command may not finish properly if the stream is not read to end
-			$output = stream_get_contents($stream);
-		*/
-
-		$sftp = ssh2_sftp($connection);
-
-		print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
-		ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
-
-		$fullcommand="cat ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
-		if (preg_match('/\.bz2$/',$targetfile))
-		{
-			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
-		}
-		if (preg_match('/\.gz$/',$targetfile))
-		{
-			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
-		}
-		print "Load dump with ".$fullcommand."\n";
-		$output=array();
-		$return_var=0;
-		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
-		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
-
-		//ssh2_sftp_unlink($sftp, $fileinstalllock);
-		//print $output;
-	}
-}
-else
-{
-	print 'Failed to connect to ssh2 to '.$server;
-	exit(-6);
-}
-
-
-exit(0);

dev/optimize_images.sh

@@ -1,233 +0,0 @@
-#!/bin/bash
-# Borrowed from https://gist.github.com/lgiraudel/6065155
-# Inplace mode added by Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
-
-PROGNAME=${0##*/}
-INPUT=''
-QUIET='0'
-NOSTATS='0'
-INPLACE='0'
-max_input_size=0
-max_output_size=0
-
-
-usage()
-{
-  cat <<EO
-Usage: $PROGNAME [options]
-
-Script to optimize JPG and PNG images in a directory.
-
-Options:
-EO
-cat <<EO | column -s\& -t
-	-h, --help  	   & shows this help
-	-q, --quiet 	   & disables output
-	-i, --input [dir]  & specify input directory (current directory by default)
-	-o, --output [dir] & specify output directory ("output" by default)
-	-ns, --no-stats	& no stats at the end
-	-p, --inplace	  & optimizes files inplace
-EO
-}
-
-# $1: input image
-# $2: output image
-optimize_image()
-{
-	input_file_size=$(stat -c%s "$1")
-	max_input_size=$(expr $max_input_size + $input_file_size)
-
-	if [ "${1##*.}" = "png" ]; then
-		#optipng -o1 -clobber -quiet $1 -out $2.firstpass
-		optipng -o1 -quiet $1 -out $2.firstpass
-		pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null
-		rm -fr $2.firstpass
-	fi
-	if [ "${1##*.}" = "jpg" -o "${1##*.}" = "jpeg" ]; then
-		jpegtran -copy none -progressive $1 > $2
-	fi
-
-	output_file_size=$(stat -c%s "$2")
-	max_output_size=$(expr $max_output_size + $output_file_size)
-}
-
-get_max_file_length()
-{
-	local maxlength=0
-
-	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
-
-	for CURRENT_IMAGE in $IMAGES; do
-		filename=$(basename "$CURRENT_IMAGE")
-		if [[ ${#filename} -gt $maxlength ]]; then
-			maxlength=${#filename}
-		fi
-	done
-
-	echo "$maxlength"
-}
-
-main()
-{
-	test=`type pngcrush >/dev/null 2>&1`
-	result=$?
-	if [ "x$result" == "x1" ]; then
-		echo "Tool pngcrush not found" && exit 
-	fi
-	
-	test=`type optipng >/dev/null 2>&1`
-	result=$?
-	if [ "x$result" == "x1" ]; then
-		echo "Tool optipng not found" && exit 
-	fi
-
-	test=`type jpegtran >/dev/null 2>&1`
-	result=$?
-	if [ "x$result" == "x1" ]; then
-		echo "Tool jpegtran not found" && exit 
-	fi
-
-
-	# If $INPUT is empty, then we use current directory
-	if [[ "$INPUT" == "" ]]; then
-		INPUT=$(pwd)
-	fi
-
-	# If $OUTPUT is empty, then we use the directory "output" in the current directory
-	if [[ "$OUTPUT" == "" ]]; then
-		OUTPUT=$(pwd)/output
-	fi
-	# If inplace, we use /tmp for output
-	if [[ "$INPLACE" == "1" ]]; then
-		OUTPUT='/tmp/optimize'
-	fi
-
-	echo "Mode is $INPLACE (1=Images are replaced, 0=New images are stored into $OUTPUT)"
-	
-	# We create the output directory
-	mkdir -p $OUTPUT
-
-	# To avoid some troubles with filename with spaces, we store the current IFS (Internal File Separator)...
-	SAVEIFS=$IFS
-	# ...and we set a new one
-	IFS=$(echo -en "\n\b")
-
-	max_filelength=`get_max_file_length`
-	pad=$(printf '%0.1s' "."{1..600})
-	sDone=' [ DONE ]'
-	linelength=$(expr $max_filelength + ${#sDone} + 5)
-
-	# Search of all jpg/jpeg/png in $INPUT
-	# We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT
-	echo "Scan $INPUT to find images"
-	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
-
-	if [ "$QUIET" == "0" ]; then
-		echo --- Optimizing $INPUT ---
-		echo
-	fi
-	for CURRENT_IMAGE in $IMAGES; do
-		echo "Process $CURRENT_IMAGE"
-		filename=$(basename $CURRENT_IMAGE)
-		if [ "$QUIET" == "0" ]; then
-			printf '%s ' "$filename"
-			printf '%*.*s' 0 $((linelength - ${#filename} - ${#sDone} )) "$pad"
-		fi
-
-		optimize_image $CURRENT_IMAGE $OUTPUT/$filename
-
-		# Replace file
-		if [[ "$INPLACE" == "1" ]]; then
-			mv $OUTPUT/$filename $CURRENT_IMAGE
-		fi
-
-		if [ "$QUIET" == "0" ]; then
-			printf '%s\n' "$sDone"
-		fi
-	done
-
-	# Cleanup
-	if [[ "$INPLACE" == "1" ]]; then
-		rm -rf $OUTPUT
-	fi
-
-	# we restore the saved IFS
-	IFS=$SAVEIFS
-
-	if [ "$NOSTATS" == "0" -a "$QUIET" == "0" ]; then
-		echo
-		echo "Input: " $(human_readable_filesize $max_input_size)
-		echo "Output: " $(human_readable_filesize $max_output_size)
-		space_saved=$(expr $max_input_size - $max_output_size)
-		echo "Space save: " $(human_readable_filesize $space_saved)
-	fi
-}
-
-human_readable_filesize()
-{
-echo -n $1 | awk 'function human(x) {
-	 s=" b  Kb Mb Gb Tb"
-	 while (x>=1024 && length(s)>1)
-		   {x/=1024; s=substr(s,4)}
-	 s=substr(s,1,4)
-	 xf=(s==" b ")?"%5d   ":"%.2f"
-	 return sprintf( xf"%s", x, s)
-  }
-  {gsub(/^[0-9]+/, human($1)); print}'
-}
-
-SHORTOPTS="h,i:,o:,q,s,p"
-LONGOPTS="help,input:,output:,quiet,no-stats,inplace"
-ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGNAME -- "$@")
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Usage: optimize_images.sh (list|fix) -i dirtoscan"
-	exit
-fi
-
-eval set -- "$ARGS"
-while true; do
-	case $1 in
-		-h|--help)
-			usage
-			exit 0
-			;;
-		-i|--input)
-			shift
-			INPUT=$1
-			;;
-		-o|--output)
-			shift
-			OUTPUT=$1
-			;;
-		-q|--quiet)
-			QUIET='1'
-			;;
-		-s|--no-stats)
-			NOSTATS='1'
-			;;
-		-p|--inplace)
-			INPLACE='1'
-			;;
-		--)
-			shift
-			break
-			;;
-		*)
-			shift
-			break
-			;;
-	esac
-	shift
-done
-
-# To convert
-if [ "x$1" = "xlist" ]
-then
-	INPLACE=0
-fi
-
-main
-

dev/skeletons/build_class_from_table.php

@@ -254,11 +254,11 @@ foreach($property as $key => $prop)
 		$varprop.="\t\t\$sql.= \" ";
 		if ($prop['istime'])
 		{
-			$varprop.='".(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
+			$varprop.='".(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':$this->db->idate(';
 			$varprop.="\$this->".$prop['field']."";
-			$varprop.=')."\'")."';
+			$varprop.='))."';
 			if ($i < count($property)) $varprop.=",";
-			$varprop.='";';
+			$varprop.="\";";
 		}
 		elseif ($prop['ischar'])
 		{

dev/skeletons/modMyModule.class.php

@@ -113,9 +113,9 @@ class modMyModule extends DolibarrModules
 		$this->const = array();
 
 		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     						// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
@@ -173,7 +173,7 @@ class modMyModule extends DolibarrModules
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
 		// $this->rights[$r][1] = 'Permision label';	// Permission label
 		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
 		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)

dev/skeletons/skeleton_class.class.php

@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,7 +79,7 @@ class Skeleton_Class extends CommonObject
 		// Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mytable(";
 		$sql.= " field1,";
 		$sql.= " field2";
 		//...
@@ -92,13 +91,13 @@ class Skeleton_Class extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(__METHOD__, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
         $resql=$this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
         {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mytable");
 
 			if (! $notrigger)
 			{
@@ -106,8 +105,10 @@ class Skeleton_Class extends CommonObject
 	            // want this action calls a trigger.
 
 	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
 	            //// End call triggers
 			}
         }
@@ -117,7 +118,7 @@ class Skeleton_Class extends CommonObject
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 	            $this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
@@ -134,11 +135,10 @@ class Skeleton_Class extends CommonObject
     /**
      *  Load object in memory from the database
      *
-     *  @param	int		$id    	Id object
-     *  @param	string	$ref	Ref
+     *  @param	int		$id    Id object
      *  @return int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$ref='')
+    function fetch($id)
     {
     	global $langs;
         $sql = "SELECT";
@@ -146,11 +146,10 @@ class Skeleton_Class extends CommonObject
 		$sql.= " t.field1,";
 		$sql.= " t.field2";
 		//...
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-        if ($ref) $sql.= " WHERE t.ref = '".$ref."'";
-        else $sql.= " WHERE t.rowid = ".$id;
+        $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
+        $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch");
+    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -170,6 +169,7 @@ class Skeleton_Class extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -182,7 +182,7 @@ class Skeleton_Class extends CommonObject
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user, $notrigger=0)
+    function update($user=0, $notrigger=0)
     {
     	global $conf, $langs;
 		$error=0;
@@ -196,7 +196,7 @@ class Skeleton_Class extends CommonObject
 		// Put here code to add a control on parameters values
 
         // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET";
         $sql.= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
         $sql.= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
 		//...
@@ -204,7 +204,7 @@ class Skeleton_Class extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(__METHOD__);
+		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -216,10 +216,12 @@ class Skeleton_Class extends CommonObject
 	            // want this action calls a trigger.
 
 	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
 	            //// End call triggers
-			 }
+	    	}
 		}
 
         // Commit or rollback
@@ -227,7 +229,7 @@ class Skeleton_Class extends CommonObject
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 	            $this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
@@ -262,19 +264,21 @@ class Skeleton_Class extends CommonObject
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action calls a trigger.
 
-	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-	            //// End call triggers
+		        //// Call triggers
+		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		        //$interface=new Interfaces($this->db);
+		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+		        //// End call triggers
 			}
 		}
 
 		if (! $error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mytable";
     		$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(__METHOD__);
+    		dol_syslog(get_class($this)."::delete sql=".$sql);
     		$resql = $this->db->query($sql);
         	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -284,7 +288,7 @@ class Skeleton_Class extends CommonObject
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 	            $this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();

dev/skeletons/skeleton_page.php

@@ -43,7 +43,6 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/formcompany.class.php');
 dol_include_once('/module/class/skeleton_class.class.php');
 
 // Load traductions files requiredby by page
@@ -53,7 +52,6 @@ $langs->load("other");
 // Get parameters
 $id			= GETPOST('id','int');
 $action		= GETPOST('action','alpha');
-$backtopage = GETPOST('backtopage');
 $myparam	= GETPOST('myparam','alpha');
 
 // Protection if external user
@@ -62,16 +60,6 @@ if ($user->societe_id > 0)
 	//accessforbidden();
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action='create';
-
-// Load object if id or ref is provided as parameter
-$object=new Skeleton_Class($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add')
-{
-	$result=$object->fetch($id,$ref);
-	if ($result < 0) dol_print_error($db);
-}
-
 
 
 /*******************************************************************
@@ -80,104 +68,19 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
 * Put here all code to do according to value of "action" parameter
 ********************************************************************/
 
-// Action to add record
 if ($action == 'add')
 {
-	if (GETPOST('cancel'))
-	{
-		$urltogo=$backtopage?$backtopage:dol_buildpath('/buildingmanagement/list.php',1);
-		header("Location: ".$urltogo);
-		exit;
-	}
-
-	$error=0;
-
-	/* object_prop_getpost_prop */
-	$object->prop1=GETPOST("field1");
-	$object->prop2=GETPOST("field2");
-
-	if (empty($object->ref))
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors');
-	}
-
-	if (! $error)
-	{
-		$result=$object->create($user);
-		if ($result > 0)
-		{
-			// Creation OK
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-		{
-			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
-		}
-	}
-	else
-	{
-		$action='create';
-	}
-}
-
-// Cancel
-if ($action == 'update' && GETPOST('cancel')) $action='view';
-
-// Action to update record
-if ($action == 'update' && ! GETPOST('cancel'))
-{
-	$error=0;
-
-	$object->prop1=GETPOST("field1");
-	$object->prop2=GETPOST("field2");
-
-	if (empty($object->ref))
-	{
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),null,'errors');
-	}
-
-	if (! $error)
-	{
-		$result=$object->update($user);
-		if ($result > 0)
-		{
-			$action='view';
-		}
-		else
-		{
-			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-			$action='edit';
-		}
-	}
-	else
-	{
-		$action='edit';
-	}
-}
-
-// Action to delete
-if ($action == 'confirm_delete')
-{
-	$result=$object->delete($user);
+	$object=new Skeleton_Class($db);
+	$object->prop1=$_POST["field1"];
+	$object->prop2=$_POST["field2"];
+	$result=$object->create($user);
 	if ($result > 0)
 	{
-		// Delete OK
-		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		header("Location: ".dol_buildpath('/buildingmanagement/list.php',1));
-		exit;
+		// Creation OK
 	}
-	else
 	{
-		if (! empty($object->errors)) setEventMessages(null,$object->errors,'errors');
-		else setEventMessages($object->error,null,'errors');
+		// Creation KO
+		$mesg=$object->error;
 	}
 }
 
@@ -198,7 +101,7 @@ $form=new Form($db);
 
 // Put here content of your page
 
-// Example : Adding jquery code
+// Example 1 : Adding jquery code
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
 	function init_myfunc()
@@ -214,8 +117,13 @@ jQuery(document).ready(function() {
 </script>';
 
 
-// Part to show a list
-if ($action == 'list' || empty($id))
+// Example 2 : Adding links to objects
+// The class must extends CommonObject class to have this method available
+//$somethingshown=$object->showLinkedObjectBlock();
+
+
+// Example 3 : List of data
+if ($action == 'list')
 {
     $sql = "SELECT";
     $sql.= " t.rowid,";
@@ -231,24 +139,27 @@ if ($action == 'list' || empty($id))
     print_liste_field_titre($langs->trans('field2'),$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
     print '</tr>';
 
-    dol_syslog($script_file, LOG_DEBUG);
+    dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        while ($i < $num)
+        if ($num)
         {
-            $obj = $db->fetch_object($resql);
-            if ($obj)
+            while ($i < $num)
             {
-                // You can use here results
-                print '<tr><td>';
-                print $obj->field1;
-                print $obj->field2;
-                print '</td></tr>';
+                $obj = $db->fetch_object($resql);
+                if ($obj)
+                {
+                    // You can use here results
+                    print '<tr><td>';
+                    print $obj->field1;
+                    print $obj->field2;
+                    print '</td></tr>';
+                }
+                $i++;
             }
-            $i++;
         }
     }
     else
@@ -262,102 +173,6 @@ if ($action == 'list' || empty($id))
 
 
 
-// Part to create
-if ($action == 'create')
-{
-	print_fiche_titre($langs->trans("NewResidence"));
-
-	dol_fiche_head();
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	print '<table class="border centpercent">'."\n";
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-	print '<input class="flat" type="text" size="36" name="label" value="'.$label.'">';
-	print '</td></tr>';
-
-	print '</table>'."\n";
-
-	print '<br>';
-
-	print '<center><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-	print '</form>';
-
-	dol_fiche_end();
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	dol_fiche_head();
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-
-	print '<br>';
-
-	print '<center><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></center>';
-
-	print '</form>';
-
-	dol_fiche_end();
-}
-
-
-
-// Part to show record
-if ($id && (empty($action) || $action == 'view'))
-{
-	dol_fiche_head();
-
-
-
-	dol_fiche_end();
-
-
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-			{
-				print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-			}
-		}
-	}
-	print '</div>'."\n";
-
-
-	// Example 2 : Adding links to objects
-	// The class must extends CommonObject class to have this method available
-	//$somethingshown=$object->showLinkedObjectBlock();
-
-}
-
-
 // End of page
 llxFooter();
 $db->close();

dev/skeletons/skeleton_script.php

@@ -57,7 +57,7 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." param1 param2 ...\n";
 	exit(-1);
@@ -119,7 +119,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
 $sql.= " WHERE field3 = 'xxx'";
 $sql.= " ORDER BY field1 ASC";
 
-dol_syslog($script_file, LOG_DEBUG);
+dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {

dev/skeletons/skeleton_webservice_server.php

@@ -141,7 +141,7 @@ $server->register(
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of object
  * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
+ * @param	ref_ext		$ref_ext			Ref external of object
  * @return	mixed
  */
 function getSkeleton($authentication,$id,$ref='',$ref_ext='')
@@ -269,4 +269,5 @@ function createSkeleton($authentication,$skeleton)
 }
 
 // Return the results.
-$server->service(file_get_contents("php://input"));
+$server->service($HTTP_RAW_POST_DATA);
+

dev/translation/strip_language_file.php

@@ -1,22 +1,9 @@
 #!/usr/bin/php
 <?php
-/* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+/*
+ * strip_language_file.php
  *
- * 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 2 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/>.
- *
- * -----
+ * (c) 2014 by FromDual GmbH, licensed under GPL v2
  *
  * Compares a secondary language translation file with its primary
  * language file and strips redundant translations.
@@ -25,10 +12,11 @@
  *
  * Usage:
  * cd htdocs/langs
- * ./dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
+ * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> <languagefile.lang>
  *
- * To rename all .delta files, you can do
- * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
+ * Parameters:
+ * 1 - Primary Language
+ * 2 - Secondary Language
  *
  * Rules:
  * secondary string == primary string -> strip
@@ -36,6 +24,9 @@
  * secondary string not in primary -> strip and warning
  * secondary string has no value -> strip and warning
  * secondary string != primary string -> secondary.lang.delta
+ *
+ * To rename all .delta fils, you can do
+ * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
  */
 
 /**
@@ -60,26 +51,24 @@ $rc = 0;
 
 $lPrimary = isset($argv[1])?$argv[1]:'';
 $lSecondary = isset($argv[2])?$argv[2]:'';
-$lEnglish = 'en_US';
 $filesToProcess = isset($argv[3])?$argv[3]:'';
 
 if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess))
 {
 	$rc = 1;
 	$msg = '***** Script to clean language files *****'."\n";
-	$msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
+	$msg.= 'Usage: ../../dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
 	print $msg . "(rc=$rc).\n";
 	exit($rc);
 }
 
 $aPrimary = array();
 $aSecondary = array();
-$aEnglish = array();
 
 // Define array $filesToProcess
 if ($filesToProcess == 'all')
 {
-	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
+	$dir = new DirectoryIterator($lPrimary);
 	while($dir->valid()) {
 		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
 			$files[] =  $dir->getFilename();
@@ -96,9 +85,8 @@ else $filesToProcess=explode(',',$filesToProcess);
 // Loop on each file
 foreach($filesToProcess as $fileToProcess)
 {
-	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
-	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
-	$lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
+	$lPrimaryFile = $lPrimary.'/'.$fileToProcess;
+	$lSecondaryFile = $lSecondary.'/'.$fileToProcess;
 	$output = $lSecondaryFile . '.delta';
 
 	print "---- Process language file ".$lSecondaryFile."\n";
@@ -117,13 +105,6 @@ foreach($filesToProcess as $fileToProcess)
 		continue;
 	}
 
-	if ( ! is_readable($lEnglishFile) ) {
-		$rc = 3;
-		$msg = "Cannot read english language file $lEnglishFile. We discard this file.";
-		print $msg . "\n";
-		continue;
-	}
-
 	// Start reading and parsing Secondary
 
 	if ( $handle = fopen($lSecondaryFile, 'r') )
@@ -182,65 +163,6 @@ foreach($filesToProcess as $fileToProcess)
 	}
 
 
-	// Start reading and parsing English
-
-	if ( $handle = fopen($lEnglishFile, 'r') )
-	{
-		print "Read English File $lEnglishFile:\n";
-		$cnt = 0;
-		while (($line = fgets($handle)) !== false)
-		{
-			$cnt++;
-
-			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
-				continue;
-			}
-			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
-				continue;
-			}
-
-			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n";
-				continue;
-			}
-
-			list($key, $value) = $a;
-
-			// key is redundant
-			if ( array_key_exists($key, $aEnglish) ) {
-				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
-				continue;
-			}
-
-			// String has no value
-			if ( $value == '' ) {
-				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
-				continue;
-			}
-
-			$aEnglish[$key] = trim($value);
-		}
-		if ( ! feof($handle) )
-		{
-			$rc = 5;
-			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
-			exit($rc);
-		}
-		fclose($handle);
-	}
-	else {
-		$rc = 6;
-		$msg = "Cannot open file $lEnglishFile";
-		print $msg . " (rc=$rc).\n";
-		exit($rc);
-	}
-
-
-
 	// Start reading and parsing Primary. See rules in header!
 
 	$arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
@@ -314,12 +236,8 @@ foreach($filesToProcess as $fileToProcess)
 				continue;
 			}
 
-			// String exists in both files and value into alternative language differs from main language but also from english files
-			if (
-				(! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
-			    && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
-				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)
-				)
+			// String exists in both files and does not match
+			if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]) || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key))
 			{
 				//print "Key $key differs so we add it into new secondary language (line: $cnt).\n";
 				fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
@@ -342,9 +260,6 @@ foreach($filesToProcess as $fileToProcess)
 	}
 
 	print "Output can be found at $output.\n";
-
-	print "To rename all .delta files, you can do:\n";
-	print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }