Try to fix travis for very old versions

Fix compatibility php7
2019-05-11 16:56:10 +02:00 · 2019-05-08 00:09:01 +02:00
11132 changed files with 501994 additions and 535459 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,11 +15,6 @@
 *.lang text eol=lf
 *.txt text eol=lf
 *.md text eol=lf
-*.pp text eol=lf
-*.sh text eol=lf
-*.yaml text eol=lf
-
-.bash_aliases text eol=lf

 # Denote all files that are truly binary and should not be modified.
 *.bmp binary
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
 documents/
+custom/
 custom2/
 test/report/
 nbproject
@@ -15,5 +16,4 @@ doxygen_warnings.log
 .idea
 *.iml
 Thumbs.db
-# Vagrant generated files
-.vagrant
+
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,220 +0,0 @@
-# .scrutinizer.yml
-imports:
-    - javascript
-    - php
-
-filter:
-    excluded_paths:
-        - 'build/*'
-        - 'dev/*'
-        - 'doc/*'
-        - 'test/*'
-        - 'htdocs/includes/*'
-    paths: {  }
-    
-tools:
-    # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
-    php_analyzer:
-        enabled: true
-        extensions:
-            - php
-        dependency_paths: {  }
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-        config:
-            parameter_reference_check:
-                enabled:              true
-            checkstyle:
-                enabled:              false
-                no_trailing_whitespace:  true
-                naming:
-                    enabled:              true
-                    local_variable:       ^[a-z][a-zA-Z0-9]*$
-                    abstract_class_name:  ^Abstract|Factory$
-                    utility_class_name:   Utils?$
-                    constant_name:        ^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$
-                    property_name:        ^[a-z][a-zA-Z0-9]*$
-                    method_name:          ^(?:[a-z]|__)[a-zA-Z0-9]*$
-                    parameter_name:       ^[a-z][a-zA-Z0-9]*$
-                    interface_name:       ^[A-Z][a-zA-Z0-9]*Interface$
-                    type_name:            ^[A-Z][a-zA-Z0-9]*$
-                    exception_name:       ^[A-Z][a-zA-Z0-9]*Exception$
-                    isser_method_name:    ^(?:is|has|should|may|supports)
-            unreachable_code:
-                enabled:              true
-            check_access_control:
-                enabled:              true
-            typo_checks:
-                enabled:              true
-            check_variables:
-                enabled:              true
-            check_calls:
-                enabled:              true
-                too_many_arguments:   true
-                missing_argument:     true
-                argument_type_checks:  lenient # Allowed Values: "disabled", "lenient", "strict"
-            suspicious_code:
-                enabled:              true
-                overriding_parameter:  false
-                overriding_closure_use:  true
-                parameter_closure_use_conflict:  true
-                parameter_multiple_times:  true
-                non_existent_class_in_instanceof_check:  true
-                non_existent_class_in_catch_clause:  true
-                assignment_of_null_return:  true
-                non_commented_switch_fallthrough:  true
-                non_commented_empty_catch_block:  true
-                overriding_private_members:  true
-                use_statement_alias_conflict:  true
-                precedence_in_condition_assignment:  true
-            dead_assignments:
-                enabled:              true
-            verify_php_doc_comments:
-                enabled:              false
-                parameters:           true
-                return:               true
-                suggest_more_specific_types:  true
-                ask_for_return_if_not_inferrable:  true
-                ask_for_param_type_annotation:  true
-            loops_must_use_braces:
-                enabled:              true
-            check_usage_context:
-                enabled:              true
-            simplify_boolean_return:
-                enabled:              false
-            phpunit_checks:
-                enabled:              false
-            reflection_checks:
-                enabled:              true
-
-            # Checks Common Precedence Mistakes
-            precedence_checks:
-                enabled:              true
-                assignment_in_condition:  true
-                comparison_of_bit_result:  true
-            basic_semantic_checks:
-                enabled:              true
-            # Disabled unused code. In most cases, we want to keep it.
-            unused_code:
-                enabled:              false		
-            deprecation_checks:
-                enabled:              true
-            useless_function_calls:
-                enabled:              true
-            metrics_lack_of_cohesion_methods:
-                enabled:              true
-            metrics_coupling:
-                enabled:              true
-                stable_code:
-                    namespace_prefixes:   []
-                    classes:              []
-            doctrine_parameter_binding:
-                enabled:              false
-            doctrine_entity_manager_injection:
-                enabled:              false
-            symfony_request_injection:
-                enabled:              false
-            doc_comment_fixes:
-                enabled:              true
-            reflection_fixes:
-                enabled:              false
-            use_statement_fixes:
-                enabled:              true
-                remove_unused:        true
-                # Whether you would like multiple imports in one USE statement to be preserved, e.g. ``use A, B;``.
-                preserve_multiple:    false
-                # Whether you would like to preserve blank lines between use statements.
-                preserve_blanklines:  false
-                order_alphabetically:  false
-         # To use specific config for a specific path, use path_configs: (see example on page https://scrutinizer-ci.com/docs/configuration/tool_config_structure)
-                        
-    # php_depend
-    php_pdepend:
-        enabled: false
-        configuration_file: null
-        suffixes:
-            - php
-        excluded_dirs: {  }
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-
-    # change tracking
-    php_changetracking:
-        enabled: false
-        bug_patterns:
-            - '\bfix(?:es|ed)?\b'
-        feature_patterns:
-            - '\badd(?:s|ed)?\b'
-            - '\bimplement(?:s|ed)?\b'
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-
-    # Similar code detection
-    php_sim:
-        enabled: false
-        min_mass: 30
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-
-    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: {  }
-
-
-before_commands: {  }
-after_commands: {  }
-artifacts: {  }
-build_failure_conditions: {  }
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,124 +1,38 @@
 # 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
-  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
-
- |
-  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
-
- |
-  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
+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 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 "Setting up PHP"
@@ -138,23 +52,6 @@ before_script:
  phpenv rehash
  echo

- |
-  if [ "$DEBUG" = true ]; then
-    # 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
@@ -169,7 +66,7 @@ before_script:
  #fi
  # TODO: SQLite
  echo
-
+ 
 - |
  export CONF_FILE=htdocs/conf/conf.php
  echo "Setting up Dolibarr $CONF_FILE"
@@ -192,12 +89,6 @@ before_script:
  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
@@ -224,80 +115,23 @@ before_script:
  sudo service apache2 restart
  echo

-script:
- |
-  echo "Checking webserver availability"
-  # Ensure we catch errors
-  set -e
-  wget http://127.0.0.1
-  if [ "$DEBUG" = true ]; then
-    cat index.html
-  fi
-  set +e
-  echo
-
- |
-  echo "Checking PHP syntax errors"
-  # Ensure we catch errors
-  set -e
-  parallel-lint --exclude htdocs/includes --blame .
-  set +e
-  echo
-
-# TODO: dev/* checks
-
- |
-  echo "Checking coding style"
-  # Ensure we catch errors
-  set -e
-  # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/codesniffer/ruleset.xml --encoding=utf-8 .
-  set +e
-  echo
-
-# TODO: Check Javascript (jshint?)
-
-# TODO: Check CSS (csslint?)
-
-# TODO: check SQL syntax (pgsanity?)
-
- |
-  echo "Upgrading Dolibarr"
-  # Ensure we catch errors
-  set -e
-  cd htdocs/install
-  php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
-  php upgrade2.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-2.log
-  php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
-  php upgrade2.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-2.log
-  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
+script: 
+ - cd htdocs/install
+ - date
+ - php upgrade.php 3.4.0 3.5.0 > upgrade.log
+ - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log
+# - cat upgrade.log
+# - cat upgrade2.log
+ - cd ../..
+ - 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=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
+ - date
+# - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+ - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php

 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
+
--- a/.tx/config
+++ b/.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
@@ -170,12 +164,6 @@ source_file = htdocs/langs/en_US/ldap.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

-[dolibarr.link]
-file_filter = htdocs/langs/<lang>/link.lang
-source_file = htdocs/langs/en_US/link.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.mailmanspip]
 file_filter = htdocs/langs/<lang>/mailmanspip.lang
 source_file = htdocs/langs/en_US/mailmanspip.lang
@@ -218,6 +206,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 +230,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,24 +248,18 @@ 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
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.sendings]
 file_filter = htdocs/langs/<lang>/sendings.lang
 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 +301,4 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
+
--- a/88
+++ b/88
@@ -7,44 +7,41 @@ published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
 More information: http://www.gnu.org/licenses/gpl-3.0.txt

-Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
+Dolibarr uses some external libraries released under different licences. This is compatibility summary:

-Component              Version       License                     GPL Compatible  Usage
-------------------------------------------------------------------------------------
+Composant             Version  License                     Compatible GPL   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.21		Modified BSD License		Yes				Date convertion (not into rpm package)
+CKEditor		      3.6.4		LGPL-2.1+					Yes				Editor WYSIWYG
+FPDI                  1.4.2		Apache Software License 2.0	Yes				PDF templates management (with FPDF_TPL 1.2)
+GeoIP			      2004      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+						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                 5.9.180	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 Licence					Yes				JS library
+jQuery UI             1.9.1		GPL and MIT Licence			Yes				JS library plugin UI
+jQuery blockUI        2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery Colorpicker    1.1	    MIT Licence					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 Licence			Yes				JS library to upload files
+jQuery Flot           0.7		MIT Licence					Yes				JS library to build graph
+jQuery JCrop          0.9.8		GPL and MIT Licence			Yes				JS library plugin Crop (to crop images)
+jQuery jeditable      1.7.1		GPL and MIT Licence			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.00	GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
+jQuery jqueryFileTree 1.0.1	    GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
+jQuery jquerytreeview 1.4.1	    MIT	Licence			 		Yes				JS library for color picker with not defined list of colors
+jQuery Layout         1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
+jQuery Mobile	      1.3		GPL and MIT Licence			Yes				JS library for smartphone (not used)
+jQuery TableDnD       0.6		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker     1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
+jQuery Tiptip         1.3		GPL and MIT Licence			Yes				JS library for tooltips
+JSGantt               1.2		BSD Licence					Yes				JS library (to build Gantt reports)

 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -53,21 +50,6 @@ http://www.fsf.org/licensing/licenses/index_html
 Copyright
 ---------

-Copyright (C) 2015
- Marcos García <marcosgdf@gmail.com>
-
-Copyright (C) 2014
- Laurent Destailleur <eldy@users.sourceforge.net>
- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
- Jean-François Ferry <jfefe@aternatik.fr>
- Marcos García <marcosgdf@gmail.com>
- Philippe Grand <philippe.grand@atoo-net.com>
- Florian Henry <florian.henry@open-concept.pro>
- Regis Houssin <regis.houssin@capnetworks.com>
- Maxime Kohlhaas <mko@atm-consulting.fr>
- Juanjo Menent <jmenent@2byte.es>
- Alexandre Spangaro <alexandre.spangaro@gmail.com>
-
 Copyright (C) 2013
 - Christophe Battarel <christophe.battarel@altairis.fr>
 - Laurent Destailleur <eldy@users.sourceforge.net>
@@ -75,11 +57,10 @@ Copyright (C) 2013
 - Marcos García <marcosgdf@gmail.com>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Florian Henry <florian.henry@open-concept.pro>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Maxime Kohlhaas <mko@atm-consulting.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - Adolfo Segura <adolfo.segura@gmail.com>
- Alexandre Spangaro <alexandre.spangaro@gmail.com>

 Copyright (C) 2012
 - Christophe Battarel <christophe.battarel@altairis.fr>
@@ -89,15 +70,14 @@ Copyright (C) 2012
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>
 - Florian Henry <florian.henry@open-concept.pro>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Maxime Kohlhaas <mko@atm-consulting.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - Nicolas Péré <nicolas@amarok2.net>
- Alexandre Spangaro <alexandre.spangaro@gmail.com>

 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>
--- a/628
+++ b/628
@@ -2,612 +2,6 @@
 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.7.4 compared to 3.7.3 *****
-FIX: #3694
-FIX: #4239
-FIX: #4291 Correctly filter external calendar GETPOSTs
-FIX: #4341
-FIX: #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
-FIX: #4440 Wrong price is filled by Product::fetch into multiprices arrays
-FIX: add missing global def for ttc column
-FIX: Contrat card don't consider user permissions to show active/unactive service button
-FIX: CVE CVE-2015-8685
-FIX: Email templates not compatible with Multicompany
-Fix: for avoid division by 0
-FIX: ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
-FIX: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
-FIX: sql injection even when code is on several lines
-FIX: The third dashboard don't consider user permissions
-
-***** ChangeLog for 3.7.3 compared to 3.7.2 *****
-FIX: #3734 Do not show empty links of deleted source objects in stock movement list
-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: #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
-FIX: #4081 Added missing translation
-FIX: #4097 Public holiday calculation
-FIX: #4242 Allow disabling dashes in documents
-FIX: #4243 sql injection
-FIX: Can use formated float number on old expense report module.
-FIX: Change object statut when closing shipment and remove erratic db commit
-FIX: Export with category contact extrafields
-FIX: NB task and percent progress in box project
-FIX: Not delete a product when have customer price
-FIX: Not deleting contrats on element_element table
-FIX: Not use localtaxes when invoice some orders
-FIX: Product link in project box
-FIX: Use "WHERE true" instead of "WHERE 1" #4132
-
-***** ChangeLog for 3.7.2 compared to 3.7.1 *****
-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: #3091 TotalHT amount in supplier order is bold unlike the rest of Dolibarr
-FIX: #3262 Webservice getProductsForCategory()
-FIX: #3318
-FIX: [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
-FIX: #3530
-FIX: #3630 - Wrong balance report when module salaries and donation disabled
-FIX: #3679 Error when deleting a Localtax2 special payment
-FIX: #3707 Thirdparty bank account page table has a glitch
-FIX: #3724 Bug: Blank page after cloning proposal with changed client
-FIX: #3836 Unable to upload a document to an invoice under some circunstances
-FIX: #3841 creation of a task completed has not status set to finished by default
-FIX: Add a protection to not make release if ChangeLog was not generated.
-FIX: adjusted test for affecting supplier reference
-FIX: Admin fiche inter page do not take good action
-FIX: Avoid warning strict mode when hosting server do not have php5_curl installed
-FIX: bad calculation for stock value
-FIX: Bad condition into invoice export request making reporting too many rows.
-FIX: bad stock valorisation
-FIX: Bad visualization of suppliers name on Incomes-Expenses mode
-FIX: Better management error into the color conversion functions
-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 #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
-FIX: [ bug #3211 ] Error about sold to pay (Montant encours)
-FIX: [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
-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 #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: Can create Proposal on close thridparty #3526
-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 #2855 Wrong translation key in localtax report page
-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 #2900 Courtesy title is not stored in create thirdparty form
-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: Display country name instead of country id (display country id makes no sense on vcard files)
-FIX: display error on extrafields on ficheinter
-FIX: double db escape add too quote
-FIX: Email selector contact must not include inactive contact
-FIX: End log must use same level then start log.
-FIX: error in SQL due to a previous fix
-FIX: event's data lost on user assign update
-FIX: Export of tags for contact and member
-FIX: facturestat bad sql when customer view is limited
-FIX: if multicompany enabled, call to undifend method _setCookie instead of setCookie
-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: Line break display as a block
-FIX: load propal langs for availability traduction
-FIX: loss data also if update was cancel by error of ended state with no end date, try a generic patch
-FIX: Mass Mailing activity don't display all status
-FIX: Missing to set context into workflow actions, so triggers can't know we are creating an invoice from order or an order from a proposal.
-FIX: multientity warehouse management
-FIX: New adherent from, always redirect on entity
-FIX: No check warehouse is provided if module stock is not enabled.
-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: Not showing task extrafields when creating from left menu
-FIX: only active customer should be return into new invoice creation select list
-FIX: Payed invoices are showed as canceled FIX: Bad date filter on customer order
-FIX: WAP calculation
-FIX: Save of filters into export profiles failed.
-FIX: supplier rights for orderToInvoice
-FIX: Syntax error in Debian Apache configuration
-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: total amount in tpl linked object are not reset
-FIX: translate Jabberid on contact page with edit view
-FIX: translation for 1 word do not work if product/service module are disabled because the translation search in products.lang
-FIX: update2.php test res befre assign it
-FIX: When delete actioncomm also delete actioncomm_resources
-FIX: when fetch_optionnal_by_label in Extrafields with $this->db cannot work because this->db is never instanciated
-FIX: when mailing is deleted, the targets list was kept in database
-FIX: when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
-FIX: When we add an user on event in create mode, we lose linked object
-FIX: When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table.
-FIX: When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third.
-FIX: XSS security using the onerror and missing escapement on type of member page.
-
-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.7 compared to 3.6.6 *****
-FIX: #4291 Correctly filter external calendar GETPOSTs
-FIX: CVE CVE-2015-8685
-
-***** 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: #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.
- Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules
- Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database
- Fix: [ bug #1785 ] Start date is lost in Project > Linked objects
- Fix: [ bug #1804 ] SQL error when sending email without address
- Fix: [ bug #1803 ] AJAX company contact input is not aligned
- Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
- Fix: [ bug #1796 ] Unable to use numeration modules from an external module
- Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
- Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount
- Fix: [ bug #1784 ] MOTD doesn't show up in Amarok theme
- Fix: Tracking number not visible on shipment pdf
- Fix: [ bug #1812 ] SQL Error message while sending emailing with PostgreSQL database
- Fix: [ bug #1819 ] SQL error when searching for an invoice payment
- Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
- Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
- Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
- Fix: [ bug #1833 ] user permissions in contact/note.php not working
- Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
- Fix: [ bug #1830 ] Salaries payment only allows checking accounts
- Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
- Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key
- Fix: Bad SEPA xml file creation
- Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
- Fix: Showing system error if not enough stock of product into orders creation with lines
- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract
- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line
- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project
- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
- Fix: [ bug #2542 ] Contracts store localtax preferences
- Fix: Bad permission assignments for stock movements actions
- Fix: [ bug #2891 ] Category hooks do not work
- Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics
- Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
- Fix: Not showing product supplier reference when page break
- Fix: [ bug #3341 ] Missing translation in /compta/paiement_charge.php
- Fix: [ bug #3342 ] Taxes dictionary page does not accept localized decimals for localtax2 rate
-
-***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
- Fix: bug 1588 : relative discount.
- Fix: label of input method not translated.
- Fix: box of customer and prospects were not correctly disabled.
- Fix: [ bug #1618 ] PHP Error thrown when saving a barcode
- Fix: Civility & birthdate wasn't save into adherent module.
- Fix: webservice Thirdparty parameter lastname for individual creation is now lastname and not ref
- Fix: Chars - is no more allowed into value for code for extra fields.
- Fix: [ bug #1622 ] Requesting holiday than spans across two years cause high CPU usage by Apache
- Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
- 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
-
-***** ChangeLog for 3.6.1 compared to 3.6.* *****
-For users:
- Fix: Can upload files on services.
- Fix: sql errors on update fichinter.
- Fix: debian script syntax error.
- Fix: error "menu param is not inside list" into pos module.
- Fix: Salary payments are not reflected on the reporting sheets.
- Fix: Unsubscribe emailing not working.
- Fix: Trigger on create category call failed because user is not passed on card.
- Fix: list event view lost type event filter.
- Fix: Save also code event.
- Fix: VAT payment - Add control on field date value.
- Fix: Salaries payment - Field date value is now required and add control on it.
- Fix: Iban was used instead of Bic into SEPA file.
- Fix: Must unaccent strings into SEPA file.
- Fix: Extrafield feature select from table should try to translate multiple column when not needed 
- Fix: cents for indian ruppes are called paisa and paise.
- Fix: Invoices payments may be older than invoices.
- Fix: Withdrawal total amount is double
- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
- Fix: Web service categorie WDSL declaration is correct
- Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined
- Fix: Category creation failed and no message output
- Fix: Lang for Payment Type
- Fix: PHPCheckstyle 1.5.5
-
-***** ChangeLog for 3.6 compared to 3.5.* *****
-For users:
- New: Update ckeditor to version 4.
- New: Add form "search customer order" on commercial main page.
- New: Can create contract from an order.
- New: Add list of orders products in tab "consumption" on thirdparties.
- New: Add graph stats for suppliers orders in tab "stats" on products.
- New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs when you
-       use the "print" view on screen.
- New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES
-       to automatically add timestamp and user line into edition field when editing a note.
- New: Add button cancel into edition of notes.
- New: Improved Barcode module:
-       Can input barcode during product creation step.
-       Add autonumbering of barcode value for products.
-       Add a page/tool for mass barcode generation.
- New: Improved Opensurvey module:
-       Added options to disable comments and disable public votes.
-       Limit dates use calendar popup.
-       Description of survey use wysiwyg editor.
-       More information shown on result tab.
-       Renamed "survey" into "poll" (better translation).
- New: Add filter on text and status into survey list. Can also sort on id, text and date end.
- New: The box "balance of bank accounts" show all opened accounts.
- New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE to add sale representative into public
-       note of generated documents.
- New: Add warning if supplier payment is higher that due amount.
- New: Increase length of url into bookmark module.
- New: Automatic events sending mails add info about linked objects into email content. 
- New: Price management enhancement (multiprice level, price by customer, if MAIN_FEATURES_LEVEL=2 Price by qty).
- New: Add option MAIN_FAVICON_URL.
- New: Created {line_price_ht_locale}, {line_price_vat_locale} and {line_price_ttc_locale} ODT tags.
- New: Add filter on project status into task list. By default, only "opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
- New: Add barcode fields into user database.
- New: Add manager name (ceo, director, president...) into main company information page.
- New: Add field url as product properties.
- New: More options to create a credit note (can be filled automatically according to remain to pay).
- New: Can define custom fields for categories.
- New: Prepare generation of SEPA files into module withdrawal.
- New: [ task #1164 ] Add "Ref. supplier" search box in supplier orders
- New: [ task #1345 ] Can filter on status for supplier order.
- New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send invoice by email 
-       whatever is its status.
- New: Add filter date in bank writing list page.
- New: Extrafields can be used as substitution key %EXTRA_XXX% into emails texts for members.
- New: Add categories translation.
- New: Enable option "clone target emailing".
- New: Improved tax module: Add specific page for salaries payment	
- New: Add composer.json file so Dolibarr can be publish onto packagist.org.
- New: The combo list of juridical status is now sorted
- New: [ task #926 ] Add extrafield feature on order lines.
- New: [ task #927 ] Add extrafield feature on Proposal lines.
- New: [ task #928 ] Add extrafield feature on invoice lines.
- New: Paypal/paybox email sent after backcall of a payment is now a formatted and translated
-       HTML content. For member subscription renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment:
-       - the document (PDF) of invoice is also generated.
-       - the invoice is set to status paid.
- New: Can enter holiday for someone else if user has permission for.
- Fix: Project Task numbering customs rule works.
- 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
- Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE trigger.
- Fix: [ bug #1517 ] Packages sizes.
- Fix: [ bug #1521 ] The second order's page from a provider shows all orders
-
-For translators:
- Update language files.
-
-For developers:
- New: Add path file of trigger into admin trigger list page.
- New: More phpunit tests.
- New: Payments and supplier payment pages tabs can now be extended from modules.
- New: Add option 'aZ' into GETPOST function to check parameters contains 
-       only a to z or A to Z characters.
- New: Opensurvey polls tab cards can now be extended from external modules.
- New: Triggers OPENSURVEY_CREATE, OPENSURVEY_DELETE added.
- New: Add new hook function addMoreActionsButtons to allow a module to add/replace
-       action buttons into an element.
- New: Normalize code for barcode generation to match other modules.
- New: Uniformize code for contacts forms.
- New: Add some hooks for financial reports.
- New: A module can add its own ECM view.
- 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:
-
- 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".
- 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
-  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
@@ -661,7 +55,7 @@ Fix: Bad days and month reported by function.
 Fix: Bad margin calculation.

 ***** ChangeLog for 3.5.5 compared to 3.5.4 *****
-Fix: Holiday module was broken. Initialization of amount of holidays failed.
+Fix: Holiday module was broken. Initializaion of amount of holidays failed.
 Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
 Fix: Fusion PDF button on unpaid invoice is no more displayed.
 Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click).
@@ -676,7 +70,7 @@ Fix: Update impayees.php
 Fix: Link product, In list view and label product.
 Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
 Fix: When disabled, all fields to add time into task line must be disabled.
-Fix: Missing include files.lib.php in some pages that use dol_delete_recursive
+Fix: Missing include files.lib.php in some pages to use dol_delete_recursive.
 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
 Fix: [ bug #1553 ] Saving User displays setup removes menu.
 Fix: [ bug #1544 ] Can remove date from invoice.
@@ -696,7 +90,7 @@ Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to sender.
 Fix: Question about warehouse must not be done when module stock is disabled.
 Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
     (missing test at some places).
-Fix: Renaming a project with uploaded files failed.
+Fix: Renaming a project with uplaoded files failed.
 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there is a validation error.
 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top margin.
 Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order.
@@ -717,7 +111,7 @@ Fix: [ bug #1449 ] Trigger ORDER_CREATE, LINEORDER_DELETE, LINEORDER_UPDATE and
 Fix: [ bug #1450 ] Several Customer order's triggers do not report the error from the trigger handler.
 Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order.
 Fix: [ bug #1454 ] Mention de bas de page erroné
-Fix: Do not display dictionary for non activated module 
+Fix: Do not display dictionnay for non activated module 
 Fix: Link element from element project pages
 Fix: [ bug #1509 ] Expedition admin free text & watermark submit error
 Fix: [ bug #1349 ] AJAX contact selector does not work fine in Project card
@@ -830,7 +224,7 @@ Fix: Link to paypal was invalid into email text.
 Fix: ref and date of supplier invoice.
 Fix: Check on bank account.
 Fix: Problem with file upload and download.
-Fix: Page load not ending when large number of thirdparties. We 
+Fix: Page load not ending when large number of thirdparies. We 
     added option MAIN_DISABLE_AJAX_COMBOX to disable javascript
     combo feature that is root cause of problem.
 Fix: [ bug #1231 ] PDF always generated in interventions
@@ -992,6 +386,14 @@ parameter. All methods addline in this case were modified to remove this paramet

 ***** ChangeLog for 3.4.3 compared to 3.4.2 *****
 Fix: Bad get of localtaxes into contracts add lines
+
+***** ChangeLog for 3.4.3 compared to 3.4.2 *****
+Fix: Warning into bank conciliation feature.
+Fix: Bad get of localtaxes into contracts add lines.
+Fix: Add a limit into list to avoid browser to hang when database is too large.
+Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal vulnerability
+
+***** ChangeLog for 3.4.3 compared to 3.4.2 *****
 Fix: Warning into bank conciliation feature.
 Fix: Bad get of localtaxes into contracts add lines.
 Fix: Add a limit into list to avoid browser to hang when database is too large.
@@ -1610,7 +1012,7 @@ For developers:
 - New: Support a backtopage parameter on contact creation page.
 - New: Add id on div to show logo.
 - New: Install wizard can activate a module at end of install.
- New: Dictionary setup works with very large external dictionnaries (Add 
+- New: Dictionnary setup works with very large external dictionnaries (Add 
       page navigation).
 - New: Add api to draw graphics with javascript (using Jquery Flot).
 - New: Can add user login into menu urls added by modules.
@@ -2257,7 +1659,7 @@ For developers:
 - Add Dolibarr triggers support on payments.
 - Add Dolibarr triggers on supplier and customers orders.
 - Webcalendar triggers for actions on Member module.
- Support optional new javascript popup selector for date fields.
+- Support optionnal new javascript popup selector for date fields.
 - Support for several RSS boxes in external RSS module. Setup easier.
 - Can attach documents on Action, Orders, Invoices, Commercial proposals.
 - Can attach contacts on proposals, orders, contracts, invoices.
--- a/4
+++ b/4
@@ -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.
--- a/138
+++ b/138
@@ -0,0 +1,138 @@
+README (english)
+--------------------------------
+Starter documentation
+--------------------------------
+
+1) Install Dolibarr
+2) Upgrade Dolibarr from an older version
+3) What's new in this version
+4) What Dolibarr can do
+5) What Dolibarr can't do yet, todo list
+
+
+I - DOLIBARR INSTALL
+--------------------
+
+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, Mandriva, Opensue, Mageia).
+
+You can download this at:
+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:
+
+- Uncompress the downloaded archive.
+ 
+- Copy directory "dolibarr" and all its files inside your web server root,
+  or copy directory anywhere and set up your web server to use "dolibarr/htdocs"
+  as root for a new web server virtual host (second choice need to be web 
+  server administrator).
+  
+- Create an empty file "htdocs/conf/conf.php" and set permissions for your web
+  server user (write permissions will be removed once install is finished).
+  
+- From your browser, call the dolibarr "install/" page. Url depends on choice
+  made on first step:
+   http://localhost/dolibarr/htdocs/install/
+  or
+   http://yourdolibarrvirtualhost/install/
+   
+- Follow instructions provided by installer...
+
+
+
+II - DOLIBARR UPGRADE
+---------------------
+
+To upgrade Dolibarr from an old version to this one:
+
+- Overwrite all old files inside old 'dolibarr' directory by files
+  provided into new version package.
+  
+- If you came from version x.y.z to x.y.w (only third number differ),
+  there is no need to run any migrate process.
+  
+- If you came from a beta version or from any version x.y.z to any
+  other where x or y number differs, you must call the Dolibarr "install/"
+  page in your browser (this should be done automatically at first dolibarr
+  access).
+  This URL should looks like:
+   http://localhost/dolibarr/htdocs/install/
+  or
+   http://yourdolibarrhost/install/index.php
+
+  Then choose the "update" option according to your case.
+  Note: Migrate process can be ran safely several times.
+  
+
+III - WHAT'S NEW
+----------------
+
+See ChangeLog file found into package.
+
+
+
+IV - WHAT DOLIBARR CAN DO
+-------------------------
+
+Main modules/features:
+- Products and services catalog
+- Customers, Prospects or Suppliers directory
+- Address book
+- Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management with PDF export
+- Contracts management
+- Invoices management with PDF export
+- Payments management
+- Standing orders management
+- Shipping management
+- EDM (Electronic Document Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management
+
+Other modules:
+- Bookmarks management
+- Can reports Dolibarr events inside Webcalendar or Phenix
+- Data export tools
+- LDAP connectivity
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS
+
+Miscellaneous:
+- Multi-user, with several permissions levels for each feature.
+- Serveral menu managers (can be used by internal users, as a back-office,
+  with a particular menu, or by external users, as a front-office, with
+  another menu and permissions).
+- Very user friendly and easy to use.
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
+- Works with PHP 5.0 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run
+  PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM 
+  called "Non Perçue Récupérable").
+
+
+
+V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
+------------------------------------------
+This is features that Dolibarr does not support completely yet:
+- No accountancy (only bank management).
+- Dolibarr manage one currency at once (mono-currency).
+- Dolibarr manage one company/foundation (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
+- Dolibarr does not contains Payroll module.
+- Tasks on module project can't have dependencies between each other.
+- Dolibarr does not include any Webmail.
+- Dolibarr can't do coffee (not yet). 
--- a/128
+++ b/128
@@ -0,0 +1,128 @@
+README (french)
+--------------------------------
+Documentation démarrage rapide
+--------------------------------
+
+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)
+
+
+I - INSTALLER DOLIBARR
+----------------------
+
+Si vous n'avez pas de connaissances techniques, et que vous recherchez
+un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
+vous devez vous réorienter vers DoliWamp (la version tout-en-un
+de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
+Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
+OpenSuse, Mandriva ou Mageia).
+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:
+
+- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
+  web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
+  utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second 
+  choix requiert des compétences et habilitations en administration du serveur
+  web).
+  
+- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
+  en lecture et écriture pour le user du serveur web (les permissions en 
+  écriture seront supprimées une fois l'installation terminée).
+
+- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend 
+  du choix fait à la première etape:
+   http://localhost/dolibarr/htdocs/install/
+  ou
+   http://yourdolibarrvirtualhost/install/
+   
+- Suivez les instructions fournies par l'installeur...
+
+
+
+II - METTRE A JOUR DOLIBARR
+---------------------------
+
+Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
+- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
+  fournis dans ce nouveau package.
+  
+- Si vous venez d'une version x.y.z vers x.y.w (seul le 3eme chiffre varie),
+  il n'y a pas besoin de migration de données.
+  
+- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
+   http://localhost/dolibarr/htdocs/install/index.php
+  ou
+   http://yourdolibarrhost/install/index.php
+
+  Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
+  Note: Le processus de migration peut etre lance plusieurs fois sans risque.
+  
+
+III - CE QUI EST NOUVEAU
+------------------------
+
+Voir fichier ChangeLog.
+
+
+
+IV - CE QUE DOLIBARR PEUT FAIRE
+-------------------------------
+
+Modules principaux:
+- Annuaires des prospects et/ou client et/ou fournisseurs
+- Gestion de catalogue de produits et services
+- Gestion de stock
+- Gestion des comptes bancaires
+- Agenda partagé
+- Gestion des commandes
+- Gestion des devis, propositions commerciales
+- Gestion des factures clients et fournisseurs
+- Gestion de contrats de services
+- Gestion des paiements
+- Gestion des virements bancaires
+- Gestion des expéditions
+- GED (Gestion Electronique de Documents)
+- EMailings de masse
+- Réalisation de sondages
+- Point de vente/Caisse enregistreuse
+
+Autres modules:
+- Gestion de marque-pages
+- Gestion des promesses de dons
+- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
+- Rapports
+- Imports/Exports des données
+- Connectivité LDAP
+- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+
+Divers:
+- Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
+- Application simple à utiliser.
+- Plusieurs thèmes visuels.
+- Code simple et facilement personnalisable.
+- Fonctionne avec MySQL 4.1+ ou PostgreSql 8.1.4+.
+- Fonctionne avec PHP 5.0+.
+- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP. 
+
+
+V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
+------------------------------------------------------
+Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
+- Pas de compta analytique (uniquement gestion de trésorerie).
+- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
+- Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
+- Dolibarr ne contient pas de module de Gestion de la paie.
+- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Dolibarr ne contient pas de Webmail.
+- Dolibarr ne fait pas le café (pas encore). 
--- a/README-FR.md
+++ b/README-FR.md
@@ -1,138 +0,0 @@
-# DOLIBARR ERP & CRM
-
-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)
-
-
-
-## LICENCE
-
-Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
-
-
-
-## INSTALLER DOLIBARR
-
-Si vous n'avez pas de connaissances techniques, et que vous recherchez
-un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
-vous devez vous réorienter vers DoliWamp (la version tout-en-un
-de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
-Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
-OpenSuse, Mandriva ou Mageia).
-
-Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
-http://www.dolibarr.org/
-
-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:
-
- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
-  web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
-  utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second 
-  choix requiert des compétences et habilitations en administration du serveur
-  web).
-  
- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
-  en lecture et écriture pour le user du serveur web (les permissions en 
-  écriture seront supprimées une fois l'installation terminée).
-
- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend 
-  du choix fait à la première etape:
-   http://localhost/dolibarr/htdocs/install/
-  ou
-   http://yourdolibarrvirtualhost/install/
-   
- Suivez les instructions fournies par l'installeur...
-
-
-
-## METTRE A JOUR DOLIBARR
-
-Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
-  fournis dans ce nouveau package.
-  
- Si vous venez d'une version x.y.z vers x.y.w (seul le 3eme chiffre varie),
-  il n'y a pas besoin de migration de données.
-  
- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page "install/" de migration dans votre 
-  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
-  Ce sera une URL du genre:
-   http://localhost/dolibarr/htdocs/install/index.php
-  ou
-   http://yourdolibarrhost/install/index.php
-
-  Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
-  Note: Le processus de migration peut etre lance plusieurs fois sans risque.
-  
-
-## CE QUI EST NOUVEAU
-
-Voir fichier ChangeLog.
-
-
-
-## CE QUE DOLIBARR PEUT FAIRE
-
-Modules principaux:
- Annuaires des prospects et/ou client et/ou fournisseurs
- Gestion de catalogue de produits et services
- Gestion de stock
- Gestion des comptes bancaires
- Agenda partagé
- Gestion des commandes
- Gestion des devis, propositions commerciales
- Gestion des factures clients et fournisseurs
- Gestion de contrats de services
- Gestion des paiements
- Gestion des virements bancaires
- Gestion des expéditions
- GED (Gestion Electronique de Documents)
- EMailings de masse
- Réalisation de sondages
- Point de vente/Caisse enregistreuse
-
-Autres modules:
- Gestion de marque-pages
- Gestion des promesses de dons
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- Rapports
- Imports/Exports des données
- Connectivité LDAP
- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
-
-Divers:
- Application multi-utilisateurs avec différents niveaux de permissions par module.
- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
- Application simple à utiliser.
- Plusieurs thèmes visuels.
- Code simple et facilement personnalisable.
- Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
-
-
-## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
-
-Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
- Pas de compta analytique double-partie (uniquement gestion de trésorerie).
- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
- Dolibarr ne contient pas de module de Gestion de la paie.
- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
- Dolibarr ne contient pas de Webmail.
- Dolibarr ne fait pas le café (pas encore). 
-
-
-## RESEAUX SOCIAUX
-
-Suivez le projet Dolibarr project sur
-
-Facebook: <https://www.facebook.com/dolibarr.fr>
-
-Google+: <https://plus.google.com/+DolibarrFrance>
-
-Twitter: <http://www.twitter.com/dolibarr_france>
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.

-![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
+![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)


 ## LICENSE
@@ -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:

@@ -113,8 +113,7 @@ See ChangeLog file found into package.
 - Multi-user, with several permissions levels for each feature.
 - Very user friendly and easy to use.
 - Highly customizable: Enable only modules you need, user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one).
- Works with PHP 5.3+, MySql 4.1 or PostgreSQL 8.1.
- Require PHP and Mysql or Postgresql (See exatc versions on http://wiki.dolibarr.org/index.php/Prerequisite).
+- Works with PHP 5.2.1, MySql 4.1 or PostgreSQL 8.1.
 - Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
 - An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
 - Support countries specific features:
@@ -137,15 +136,3 @@ This is features that Dolibarr does not support completely yet:
 - Dolibarr does not contains Payroll module.
 - Dolibarr does not include any Webmail.
 - Dolibarr can't do coffee (not yet).
-
-
-## SOCIAL NETWORKS
-
-Follow Dolibarr project on
-
-Facebook: <https://www.facebook.com/dolibarr>
-
-Google+: <https://plus.google.com/+DolibarrOrg>
-
-Twitter: <http://www.twitter.com/dolibarr>
-
--- a/build.xml
+++ b/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/*" />
--- a/build/.gitignore
+++ b/build/.gitignore
--- a/build/README
+++ b/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

--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
--- a/build/aps/README
+++ b/build/aps/README
--- a/build/aps/configure.php
+++ b/build/aps/configure.php
@@ -149,3 +149,4 @@ function php_quote($val)
    return $res_val;
 }

+?>
--- a/build/aps/install.forced.php.install
+++ b/build/aps/install.forced.php.install
@@ -21,3 +21,4 @@ $force_install_databaserootpass='';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+?>
--- a/build/debian/README.Debian
+++ b/build/debian/README.Debian
@@ -1,13 +0,0 @@
-Information about Dolibarr in Debian
------------------------------------
-
-The Debian package provides integration with apache2 and lighttpd.
-If you have one of those servers installed, then Dolibarr is immediately
-accessible at http://localhost/dolibarr/
-
-But it won't be usable until you configure it via
-http://localhost/dolibarr/install/
-
-To complete the setup process you will need the MySQL root credentials
-because the Dolibarr installer will create the database and the dedicated user
-for you.
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -105,8 +105,8 @@ http://bugs.debian.org/package
 ##### Testing a package into unstable env

 Check you have a mysql server available from another interface than localhost
-Comment line in /etc/mysql/my.cnf if required and restart mysql
-#bind-address = 127.0.0.1
+Uncomment line if required and restart mysql
+bind-address = 127.0.0.1

 Create a chroot called "unstable-amd64-sbuild"
 > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
@@ -120,16 +120,11 @@ Puis pour se connecter et préparer l'environnement
 > apt-get install links mysql-client

 Pour tester un package
-> On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
-> cp ../build-area/* /srv/chroot/unstable/tmp
+> cp *.deb /srv/chroot/unstable/tmp
 > sudo schroot -c name_of_chroot
-> cd /tmp
-> lintian --pedantic -E -I dolibarr*.deb
-> lintian --pedantic -E -I dolibarr*.dsc
-> dpkg -i dolibarr*.deb  ou   pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
+> dpkg -i dolibarr*.deb
 > apt-get install -f

-Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote).



@@ -153,9 +148,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,27 +155,23 @@ 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-1 "My comment" will add entry.
+For example: dch -v x.y.z-1 "New upstream release." for a new version

 Warning: Date must have format reported by "date -R"
 Warning: Name and email must match value into debian/control file (Entry added here is used by next step).

 * We try to build package
-> rm -fr ../build-area; git-buildpackage -us -uc
+> rm -fr ../build-area
+> git-buildpackage -us -uc

-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
-Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
+Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
 Note: Package is built into directory ../build-area

 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git push --all ou git push origin --all
-
-* If ok, you can tag.
-> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
 > git-buildpackage --git-tag-only --git-retag
+> git push --all ou git push origin --all
 > git push --tags

 * Compilation is then done by a debian developer and sent
@@ -199,17 +187,7 @@ http://packages.qa.debian.org/t/tcpdf.html

 ##### Update but tracker system
 To set status of a bug to pending
-> bts tag 999999 +pending
-
-or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with: 
-Control: tag -1 +pending
-and then a text like:
-Thanks. Fixed into git.
-
-or replay to email control@bugs.debian.org
-With only message 
-tag 729538 +pending
+> bts tag 728235 +pending



@@ -231,49 +209,33 @@ 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)

 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
-and enter version when requested with format
-x.y.z+dfsgw
-(x.y.z = version, w start from 1 and is increased for each new import)
+> git-import-orig -vv ../dolibarr-3.3.4.tgz

 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".
-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).
+> dch -v x.y.z-1 "My comment" will add entry.
+For example: dch -v x.y.z-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).

 * We try to build package
-> rm -fr ../build-area; git-buildpackage -us -uc
+> rm -fr ../build-area
+> git-buildpackage -us -uc

-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
-Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
+Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
 Note: Package is built into directory ../build-area

 * Test package (see dedicated chapter to test it with debian unstable env)

 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git push --all ou git push origin --all
-
-* If ok, you can tag.
-> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
 > git-buildpackage --git-tag-only --git-retag
+> git push --all ou git push origin --all
 > git push --tags

 * Compilation is then done by a debian developer and sent
@@ -288,3 +250,4 @@ http://packages.qa.debian.org

 * Package will be into release when test will be moved as stable.

+
--- a/build/debian/README.source
+++ b/build/debian/README.source
@@ -0,0 +1,12 @@
+==================================================================
+Dolibarr - Web based software to manage a small company or foundation
+==================================================================
+
+
+Note for package maintainers
+----------------------------
+This file explains how to modify official sources (from http://www.dolibarr.org)
+to have ready to use source files to build a debian package.
+
+All changes are included into patch file
+build/debian/patches
--- a/build/debian/apache/.htaccess
+++ b/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>
--- a/build/debian/apache/dolibarr.conf
+++ b/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
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,6 +1,76 @@
-dolibarr (__VERSION__) UNRELEASED; urgency=low
+dolibarr (3.5.7-3) unstable; urgency=low

  [ Laurent Destailleur (eldy) ]
  * New upstream release.
    
 -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     
+
+dolibarr (3.5.6-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 2 Dec 2014 12:00:00 +0100     
+
+dolibarr (3.5.5-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
+
+dolibarr (3.5.4-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
+
+dolibarr (3.5.3-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 2 May 2014 12:00:00 +0100     
+
+dolibarr (3.5.2-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 14 March 2014 12:00:00 +0100     
+
+dolibarr (3.5.1-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 7 Feb 2014 12:00:00 +0100     
+
+dolibarr (3.5.0-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     
+
+dolibarr (3.4.2-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
+
+dolibarr (3.4.1-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     
+
+dolibarr (3.4.0-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -226,3 +226,5 @@ $dolibarr_main_prod='0';
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
+
+?>
--- a/build/debian/control
+++ b/build/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
 # Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
-Standards-Version: 3.9.6
+Standards-Version: 3.9.4
 Homepage: http://www.dolibarr.org
 Build-Depends: debhelper (>= 9), po-debconf
 # This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
@@ -16,21 +16,19 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
 # Required PHP libraries
    php-pear, php-mail-mime, 
-#    php-tcpdf, libfpdi-php,
-#    libfpdf-tpl-php, php-fpdf,
+#    php-tcpdf, libfpdi-php, libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
 #    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,
    mysql-server,
-    mysql-client,
    ${misc:Depends},
    ${perl:Depends}
-Recommends: apache2 | lighttpd | httpd
+Recommends: mysql-client, apache2 | lighttpd | httpd
 Suggests: www-browser
 Description: Web based software to manage a company or foundation
 Dolibarr ERP & CRM is an easy to use open source/free software for small 
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: http://www.dolibarr.org/files/stable/standard/
+Source: http://sourceforge.net/projects/dolibarr/files/

 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
--- a/build/debian/dolibarr.doc-base
+++ b/build/debian/dolibarr.doc-base
@@ -0,0 +1,10 @@
+Document: dolibarr
+Title: Dolibarr ERP & CRM documentation
+Author: Dolibarr team
+Abstract: This documentation covers the install, use and administration of
+ Dolibarr ERP & CRM software. 
+Section: Office
+
+Format: HTML
+Index: /usr/share/doc/dolibarr/index.html
+Files: /usr/share/doc/dolibarr/*.html
--- a/build/debian/dolibarr.docs
+++ b/build/debian/dolibarr.docs
@@ -1,2 +0,0 @@
-README.md
-README-FR.md
--- a/build/debian/dolibarr.install
+++ b/build/debian/dolibarr.install
@@ -6,6 +6,8 @@ debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/
 debian/install.forced.php.install etc/dolibarr/
 htdocs usr/share/dolibarr/
 scripts usr/share/dolibarr/
+changelog usr/share/doc/dolibarr/
+README usr/share/doc/dolibarr/
 doc/install usr/share/doc/dolibarr/
 doc/user usr/share/doc/dolibarr/
 doc/index.html usr/share/doc/dolibarr/
--- a/build/debian/dolibarr.lintian-overrides
+++ b/build/debian/dolibarr.lintian-overrides
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -129,7 +129,7 @@ case "$1" in
 		then
 			# Create an empty conf.php with permission to web server
 			setup_empty_conf
-		#else
+		else
 			# File already exist. We add params not found.
 			#echo Add new params to overwrite path to use shared libraries/fonts
 			#grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
--- a/build/debian/dolibarr.templates.futur
+++ b/build/debian/dolibarr.templates.futur
--- a/build/debian/get-orig-source.sh
+++ b/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
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -42,3 +42,5 @@ $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';
+
+?>
--- a/build/debian/po/POTFILES.in
+++ b/build/debian/po/POTFILES.in
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -9,12 +9,6 @@ export DH_OPTIONS=-v

 %:
 	dh $@
-
-override_dh_auto_clean:
-# Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
-
-override_dh_auto_build:
-# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
 	
 override_dh_install:
 	dh_install
@@ -29,6 +23,7 @@ override_dh_install:
 	rm -f  build.xml
 	rm -f  quickbuild.xml
 	rm -f  pom.xml
+	rm -f  README.md

 	rm -f  htdocs/install/mssql/README
 	rm -f  htdocs/install/mysql/README
@@ -118,4 +113,4 @@ override_dh_fixperms:
 	# Give rights to the webserver on the upload directory
 	chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
 	chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
-	
+	
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -14,3 +14,4 @@ $force_install_databaserootpass='root';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+?>
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -15,7 +15,7 @@ $CONFFILE="dolibarr-doxygen.doxyfile";

 use Cwd;
 my $dir = getcwd;
-
+    
 print "Current dir is: $dir\n";
 print "Running dir for doxygen must be: $DIR\n";

@@ -24,7 +24,7 @@ if (! -s $CONFFILE)
    print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
    print "\n";
 	print "Change your current directory then, to launch the script, run:\n";
-	print '> perl .\dolibarr-doxygen-build.pl  (on Windows)'."\n";
+	print '> perl ..\dolibarr-doxygen-build.pl  (on Windows)'."\n";
 	print '> perl ../dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
    sleep 4;
    exit 1;   
--- a/build/doxygen/doxygen_footer.html
+++ b/build/doxygen/doxygen_footer.html
--- a/build/doxygen/doxygen_header.html
+++ b/build/doxygen/doxygen_header.html
--- a/build/exe/doliwamp/.gitignore
+++ b/build/exe/doliwamp/.gitignore
@@ -1 +0,0 @@
-/doliwamp.tmp.iss
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/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'] = '';

--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -16,9 +16,9 @@
 [Setup]
 ; ----- Change this -----
 AppName=DoliWamp
-; Replace key with DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
 AppVerName=__FILENAMEEXEDOLIWAMP__
-; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
 OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
@@ -108,7 +108,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -758,15 +758,5 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #ExpiresByType application/javascript A2592000
    

-# To protect Dolibarr with HTTP Auth
-#<Location /dolibarr>
-#       Options +Indexes
-#       AuthUserFile /var/www/.htpasswd
-#       AuthName "Zone authent basic Dolibarr"
-#       AuthType Basic
-#       require user test
-#</Location>
-
-
 # Declare alias for Dolibarr, PHPMyAdmin and other softwares
 Include "WAMPROOT/alias/*.conf"
--- a/build/launchpad/README
+++ b/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

@@ -85,7 +81,7 @@ If you want to build/test package locally:
    bzr init
    bzr add
    bzr commit -m "Init control files"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name or just bzr push if into a known branch)
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
 - or download it from launchpad bazaar:
    cd bzr
    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -22,8 +22,7 @@ $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","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
+@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 %REQUIREMENTPUBLISH=(
 "SF"=>"git ssh rsync",
 "ASSO"=>"git ssh rsync"
@@ -65,13 +64,6 @@ $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";
@@ -345,38 +337,16 @@ foreach my $target (sort keys %CHOOSEDPUBLISH) {

 if ($nboftargetok) {

-	# Update GIT tag if required
-	#---------------------------
+	# Update CVS 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|existe déjà)/)
+		if ($ret =~ /already exists/)
 		{
 			print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
 			$QUESTIONOVERWRITETAG=<STDIN>; 
@@ -450,7 +420,6 @@ 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`;
@@ -459,7 +428,6 @@ 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`;
@@ -487,28 +455,23 @@ 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 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*`;
+		# Removed known external modules to avoir any error when packaging on test env 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/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/oblyon*`;
 		$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`;
@@ -522,29 +485,16 @@ if ($nboftargetok) {
        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
   	    
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
+	    $ret=`rm -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`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}

@@ -729,7 +679,7 @@ if ($nboftargetok) {
 			use Date::Language;
 			$lang=Date::Language->new('English');
 			$datestring = $lang->time2str("%a %b %e %Y", time);
-    		$changelogstring="* ".$datestring." Laurent Destailleur (eldy) $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
+    		$changelogstring="* ".$datestring." Laurent Destailleur $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";
@@ -761,7 +711,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;
 		}

@@ -851,17 +801,8 @@ 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"`;
@@ -1040,7 +981,7 @@ if ($nboftargetok) {
 			mkdir($DESTI.'/package_windows');
 			if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } 

-     		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
+     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
 
 			print "Check that in your Wine setup, you create a Z: drive that point to your / directory.\n";
--- a/build/makepack-dolibarrlang.pl
+++ b/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 "makepack-dolbarrlang.pl was not able to detect your OS.\n";
+	print "Can't continue.\n";
+	print "makepack-dolibarrlang.pl 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;
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -41,9 +41,9 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 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 "makepack-dolbarrtheme.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrtheme.pl aborted.\n";
    sleep 2;
 	exit 1;
 }
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -8,20 +8,19 @@ 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 of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in /ChangeLog
 - 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
+- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
 - 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).

- Post a news on dolibarr.org/dolibarr.fr + social networks
+- Post a news on dolibarr.org/dolibarr.fr
 - Send mail on mailings-list


@@ -30,22 +29,21 @@ 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 of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog
 - Update version number with x.y.z in htdocs/filefunc.inc.php
+- Update version number with x.y.z in build/debian/changelog
+- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
 - Commit all changes.
+- Add a Tag (x.y.z)

- Run makepack-dolibarr.pl to generate all packages.
-
+- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
 - Check content of built packages.
 - Move build files into www.dolibarr.org web site
  (/home/dolibarr/wwwroot/files/stable).
-
 - Run makepack-dolibarr.pl again with option to publish files on 
-  sourceforge. This will also add official tag.
+  sourceforge.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
  on server to point to new files (used by some web sites).

- Post a news on dolibarr.org/dolibarr.fr + social networks
 - Send mail on mailings-list
+- Send news on OpenSource web sites (if major beta or release)
--- a/build/obs/README
+++ b/build/obs/README
@@ -11,7 +11,6 @@ a package onto OBS
 #----------------------------------
 https://build.opensuse.org

-Packaging rules: http://en.opensuse.org/Portal:Packaging

 Add attributes:
 OBS:Screenshots         URL of screenshot
@@ -29,18 +28,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
--- a/build/pdf/README.txt
+++ b/build/pdf/README.txt
@@ -1,9 +0,0 @@
-To make htmldoc working from wiki.dolibarr.org, them must be modified to have
-
-$_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
-$_COOKIE["htmldoc"] may also be defined if set on command line.
-
-To disable part, add 
-class="htmldoc-ignore" with css
-.htmldoc-ignore { display: none; }
-
--- a/build/pdf/htmldoc_en.book
+++ b/build/pdf/htmldoc_en.book
@@ -1,4 +0,0 @@
-#HTMLDOC 1.8.27
-t pdf14 -f "../../doc/dolibarr_en.pdf" --webpage --no-title --logoimage "../../doc/images/dolibarr_256x256.png" --linkcolor #2200c0 --linkstyle plain --size Universal --left 0.30in --right 0.30in --top 0.40in --bottom 0.30in --header ... --header1 ... --footer c/d --nup 1 --tocheader ... --tocfooter ... --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=50 --fontsize 10.0 --fontspacing 1.0 --headingfont Helvetica --bodyfont Helvetica --headfootsize 9.0 --headfootfont Helvetica --charset iso-8859-1 --links --no-embedfonts --pagemode document --pagelayout single --firstpage p1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 680 --no-strict --no-overflow
-http://wiki.dolibarr.org/index.php/Main_Page
-http://wiki.dolibarr.org/index.php/What_Dolibarr_Do
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/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,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.7.2", "3.6.3", "3.5.6" );
+return ( "3.5.3", "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }

 sub script_dolibarr_category
@@ -56,26 +56,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 +77,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 +158,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 +200,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 +288,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 +308,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 +328,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'}) {
--- a/build/rpm/conf.php
+++ b/build/rpm/conf.php
@@ -5,3 +5,4 @@
 //
 // This file will be filled by installer
 //
+?>
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -160,8 +160,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_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
@@ -194,7 +194,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
@@ -332,4 +331,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-__CHANGELOGSTRING__
+__CHANGELOGSTRING__
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -240,8 +240,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_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
@@ -274,7 +274,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -157,8 +157,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_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
@@ -191,7 +191,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
@@ -337,4 +336,4 @@ fi

 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-__CHANGELOGSTRING__
+__CHANGELOGSTRING__
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -168,8 +168,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_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
@@ -202,7 +202,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
--- a/build/rpm/file_contexts.dolibarr
+++ b/build/rpm/file_contexts.dolibarr
--- a/build/rpm/install.forced.php.fedora
+++ b/build/rpm/install.forced.php.fedora
@@ -31,3 +31,5 @@ $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';
+
+?>
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -20,3 +20,4 @@ $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
+?>
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -31,3 +31,5 @@ $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';
+
+?>
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -31,3 +31,5 @@ $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';
+
+?>
--- a/build/travis-ci/apache.conf
+++ b/build/travis-ci/apache.conf
@@ -1,18 +0,0 @@
-<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>
--- a/composer.json
+++ b/composer.json
@@ -1,39 +0,0 @@
-{
-    "name": "dolibarr/dolibarr",
-    "type": "project",
-    "description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
-    "keywords": ["erp","crm","invoice","sme","proposal","order","stock"],
-    "homepage": "http://www.dolibarr.org",
-    "license": "GPL-3.0+",
-    "support": {
-        "issues": "https://github.com/Dolibarr/dolibarr/issues",
-        "forum": "http://www.dolibarr.org/forum",
-        "wiki": "http://wiki.dolibarr.org",
-        "irc": "irc://chat.freenode.net/dolibarr",
-        "source": "https://github.com/Dolibarr/dolibarr"
-    },
-    "require": {
-        "php": ">=5.3.0",
-        "ext-curl": "*"
-    },
-    "suggest": {
-        "ext-mysqlnd": "To use with MySQL or MariaDB",
-        "ext-mysqli": "To use with MySQL or MariaDB",
-        "ext-pgsql": "To use with PostgreSQL",
-        "ext-mssql": "To use with MSSQL (experimental)",
-        "ext-pdo_sqlite": "To use with SQLite (experimental)",
-        "ext-gd": "Image manipulation (Required but maybe built-in PHP)",
-        "ext-imagick": "Image manipulation (TCPDF)",
-        "ext-mcrypt": "(Required but maybe built-in PHP)",
-        "ext-openssl": "Secure connections (Emails, SOAP…)",
-        "ext-mbstring": "Handle non UTF-8 databases",
-        "ext-soap": "Native SOAP",
-        "ext-zip": "ODT and Excel support",
-        "ext-xml": "Excel support",
-        "firephp/firephp-core": "Logging to Firebug console support",
-        "raven/raven": "Sentry logging server support"
-    },
-    "config": {
-        "vendor-dir": "htdocs/includes"
-    }
-}
--- a/dev/codesniffer/README
+++ b/dev/codesniffer/README
--- a/dev/codesniffer/php.ini
+++ b/dev/codesniffer/php.ini
--- a/dev/codesniffer/ruleset.dtd
+++ b/dev/codesniffer/ruleset.dtd
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -10,18 +10,12 @@
 	<exclude-pattern>*/custom/*</exclude-pattern>
 	<exclude-pattern>*/nltechno*</exclude-pattern>

-		<!-- List of all tests -->
+	<!-- List of all tests -->

-	
-	<!-- Rules from Internal Standard -->
-	
 	<rule ref="Internal.NoCodeFound">
 		<severity>0</severity>
 	</rule>

-	
-	<!-- Rules from Generic Standard -->
-		
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />

 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
@@ -36,10 +30,7 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
 		<severity>0</severity>
 	</rule>
-	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
-		<severity>0</severity>
-	</rule>
-	
+
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>
@@ -164,6 +155,8 @@
        <severity>0</severity>
 	</rule>
    
+    <rule ref="Generic.VersionControl.SubversionProperties" />
+
 	<!-- Disallow usage of tab -->
 	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->

@@ -171,46 +164,84 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->

-
-
-    <!-- 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.ClassComment.MissingTag" />
-
-    <rule ref="PEAR.Commenting.ClassComment.MissingAuthorTag">
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
        <severity>0</severity>
    </rule>
-
-    <rule ref="PEAR.Commenting.ClassComment.MissingCategoryTag">
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
        <severity>0</severity>
    </rule>
-
-    <rule ref="PEAR.Commenting.ClassComment.MissingLicenseTag">
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
        <severity>0</severity>
    </rule>
-
-    <rule ref="PEAR.Commenting.ClassComment.MissingLinkTag">
+    <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.MissingPackageTag">
-        <severity>0</severity>
-    </rule>
-        
-
-   
    <!-- 
    <rule ref="PEAR.Commenting.FileComment" />
    <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -223,40 +254,15 @@
        <severity>0</severity>
    </rule>
    -->
-    
-    <rule ref="PEAR.Commenting.FunctionComment" />
-
-    <rule ref="PEAR.Commenting.FunctionComment.Empty">
-        <severity>5</severity>
-    </rule>
-    
-	<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <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.Empty">
+        <severity>5</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment" />
    <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
        <severity>0</severity>
    </rule>
@@ -289,15 +295,6 @@

 	<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>
@@ -313,6 +310,12 @@
    <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" />

@@ -344,20 +347,15 @@
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
        <severity>0</severity>
 	</rule>
-
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
        <severity>0</severity>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
        <severity>0</severity>
 	</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
@@ -373,10 +371,4 @@
    <!-- Already found as a Generic rule -->
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->

-
-	<!-- Rules from Zend Standard-->
-
-    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <rule ref="Zend.Files.ClosingTag"/>
-
 </ruleset>
--- a/dev/codetemplates/README
+++ b/dev/codetemplates/README
--- a/dev/codetemplates/codetemplates.dtd
+++ b/dev/codetemplates/codetemplates.dtd
--- a/dev/codetemplates/codetemplates.xml
+++ b/dev/codetemplates/codetemplates.xml
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/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;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ b/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);
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/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;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/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;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/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;
+
+
--- a/dev/detectnotabfiles.sh
+++ b/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
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -39,13 +39,6 @@ into
 	// initialize subsetchars
 	$subsetchars = array_fill(0, 256, true);

-* Made freemono the default monotype font because we removed courier
-In htdocs/includes/tcpdf/tcpdf.php
-       protected $default_monospaced_font = 'courier';
-+       protected $default_monospaced_font = 'freemono';
-
-* Renamed getmypid into dol_getmypid().
-

 JSGANTT:
 --------
--- a/dev/examples/README
+++ b/dev/examples/README
--- a/dev/examples/create_invoice.php
+++ b/dev/examples/create_invoice.php
@@ -115,3 +115,4 @@ else
 $db->close();

 return $error;
+?>
--- a/dev/examples/create_order.php
+++ b/dev/examples/create_order.php
@@ -113,3 +113,4 @@ else
 $db->close();

 return $error;
+?>
--- a/dev/examples/create_product.php
+++ b/dev/examples/create_product.php
@@ -105,3 +105,4 @@ else
 $db->close();

 return $error;
+?>
--- a/dev/examples/create_user.php
+++ b/dev/examples/create_user.php
@@ -107,3 +107,4 @@ else
 $db->close();

 return $error;
+?>
--- a/dev/examples/get_contracts.php
+++ b/dev/examples/get_contracts.php
@@ -81,3 +81,4 @@ print_r($listofcontractsforcompany);
 $db->close();

 return $error;
+?>
--- a/dev/fixaltlanguages.sh
+++ b/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
--- a/dev/fixdosfiles.sh
+++ b/dev/fixdosfiles.sh
@@ -10,21 +10,19 @@
 # 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

 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep CRLF
-#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
 fi

 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix $fic
--- a/dev/fixduplicatelangkey.sh
+++ b/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
--- a/dev/fixduplicatelines.sh
+++ b/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
--- a/dev/fixnotabfiles.sh
+++ b/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
--- a/dev/fixperms.sh
+++ b/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
--- a/dev/fixutf8bomfiles.sh
+++ b/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

--- a/dev/initdata/dolibarr-mysql2pgsql.pl
+++ b/dev/initdata/dolibarr-mysql2pgsql.pl
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -212,3 +212,4 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 	}
 }

+?>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Destailleur	122b33d87d	Try to fix travis for very old versions	2019-05-11 16:56:10 +02:00
Laurent Destailleur	9413f9ddfc	Fix compatibility php7	2019-05-08 00:09:01 +02:00