Prepare 3.6.5

FIX: Not deleting contracts on element_element table

.gitattributes

@@ -15,6 +15,11 @@
 *.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

.gitignore

@@ -16,4 +16,8 @@ doxygen_warnings.log
 .idea
 *.iml
 Thumbs.db
-
+# Vagrant generated files
+.vagrant
+/index.html
+/phpmyadmin
+/xhprof

.scrutinizer.yml

@@ -0,0 +1,190 @@
+# .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: {  }
+
+    # Coding-Style / Bug Detection
+    js_hint: false
+
+
+before_commands: {  }
+after_commands: {  }
+artifacts: {  }
+build_failure_conditions: {  }

.travis.yml

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

.tx/config

@@ -164,6 +164,12 @@ 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
@@ -248,6 +254,12 @@ source_file = htdocs/langs/en_US/propal.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

COPYRIGHT

@@ -7,41 +7,43 @@ 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 licences. This is compatibility summary:
+Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
-Composant             Version  License                     Compatible GPL   Usage
-----------------------------------------------------------------------------
+Component             Version       License                     GPL Compatible  Usage
+-------------------------------------------------------------------------------------
 PHP libraries:
-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
+AdoDb-Date            0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
+CKEditor              4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
+FPDI                  1.4.2         Apache Software License 2.0 Yes             PDF templates management
+FPDF_TPL              1.2           Apache Software License 2.0 Yes             PDF templates management
+GeoIP                 1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap                0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+odtPHP                1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+PHPExcel              1.7.6         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPPrintIPP           1.3           GPL-2+                      Yes             Library to send print IPP requests
+TCPDF                 6.0.093       LGPL-3+                     Yes             PDF generation
 
 JS libraries:
-jQuery                1.8.2		MIT 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)
+jQuery                1.8.2         MIT License                 Yes             JS library
+jQuery UI             1.9.1         GPL and MIT License         Yes             JS library plugin UI
+jQuery UI Multiselect ?             GPL and MIT License         Yes             JS library plugin for sexier multiselect
+jQuery blockUI        2.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery Colorpicker    1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
+jQuery DataTables     1.9.4         BSD                         Yes             JS library for tables output
+jQuery FileUpload     5.0.3         GPL and MIT License         Yes             JS library to upload files
+jQuery Flot           0.7           MIT License                 Yes             JS library to build graph
+jQuery JCrop          0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
+jQuery Jeditable      1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
+jQuery jNotify        1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
+jQuery jPicker        1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jqueryFileTree 1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jquerytreeview 1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery Layout         1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
+jQuery Mobile         1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
+jQuery TableDnD       0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker     1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
+jQuery Tiptip         1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGantt               1.2           BSD License                 Yes             JS library (to build Gantt reports)
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -50,6 +52,21 @@ 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>
@@ -57,10 +74,11 @@ 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>
@@ -70,14 +88,15 @@ 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>

ChangeLog

@@ -3,12 +3,453 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** 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: 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 #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 #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.
+
+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 has been renamed into "dictionaries".
+- Method form->select_currency() has been removed. Use instead print form->selectCurrency().
+- Method form->select_methodes_commande() has been renamed into english name selectInputMethod().
+- The following hooks are now 'addreplace' hooks: "formCreateThirdpartyOptions" 
+  So check that return value is 0 to keep default standard behaviour after hook or 1 to disable
+  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.7 compared to 3.5.6 *****
+Fix: Paypal link were broken due to SSL v3 closed.
+Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
+Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
+Fix: [ bug #1757 ] Sorting breaks product/service statistics
+Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
+Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
+Fix: [ bug #1846 ] Browser IE11 not detected
+Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
+Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
+Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
+Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
+Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
+Fix: [ bug #2758 ] Product::update sets product note to "null" when $prod->note is null
+Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" error
+Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selected by the UI
+Fix: [ bug #2861 ] Undefined variable $res when migrating
+Fix: [ bug #2837 ] Product list table column header does not match column body
+Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order
+Fix: [ bug #2814 ] JPEG photos are not displayed in Product photos page
+Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
+Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
+Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter
+Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
+Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled
+Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
+Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
+Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
+
+***** ChangeLog for 3.5.6 compared to 3.5.5 *****
+Fix: Avoid missing class error for fetch_thirdparty method #1973
+Fix: Can't update phone_pro from web service
+Fix: Some security holes.
+Fix: copy extrafields when creating order from proposal.
+Fix: report on action was not filtering by environment.
+Fix: Avoid missing class error.
+Fix: Add function dolEscapeXML.
+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: [ 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).
+Fix: Pb when showing log list of holiday module with some mysql versions.
+Fix: Error with bad timezone pushed by some browsers.
+Fix: shipping list SQL request was not filtering on shipping element
+Fix: debian package provided by dolibarr team must use embedded libraries.
+Fix: [ bug #1528 ] Leopard Services numeration module description is not translated.
+Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
+Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances.
+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: [ 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.
+Fix: list event view lost type event filter.
+Fix: Add code save on create event.
+Fix: SQL injection.
+Fix: [ bug #1589 ] Menu type in "Edit menu" page is not translated
+Fix: [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
+Fix: [ bug #1577 ] When creating new Private individual third, selected third type is ignored
+Fix: [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
+Fix: [ bug #1548 ] Supplier payment card shows type in French
+Fix: [ bug #1546 ] Incorrect page number when searching in the list of bank transactions
+
+***** ChangeLog for 3.5.4 compared to 3.5.3 *****
+Fix: Hide title of event when agenda module disabled.
+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: [ 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.
+Fix: The object deliverycompany was not used anymore and output of
+     details for delivery reports was lost during 3.5. Rewrite code to
+     restore feature.
+Fix: [ bug #1445 ] html fix : missing </tr>
+Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown
+     properly in module configuration
+Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the 
+     supplier order card
+Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or 
+     limit date for payment
+Fix: Filter on status was not visible when selected from url.
+Fix: Filtering on status was last when asking to sort.
+Fix: [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error.
+Fix: [ bug #1449 ] Trigger ORDER_CREATE, LINEORDER_DELETE, LINEORDER_UPDATE and LINEORDER_INSERT ignore interception on error.
+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: 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
+Fix: [ bug #1452 ] variable used but not defined
+Fix: If multiprice level is used the VAT on addline is not correct
+Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product (on supplier order part)
+Fix: [ bug #1462, 1468, 1480, 1483, 1490, 1497] $this instead of $object
+Fix: [ bug #1455 ] outstanding amount
+Fix: [ bug #1425 ] LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop
+Fix: [ bug #1460 ] Several supplier order triggers do not show error messages
+Fix: [ bug #1461 ] LINEORDER_SUPPLIER_CREATE does not intercept supplier order line insertion
+Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure under some circumstances
+Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages
+Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action
+Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty
+Fix: [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
+Fix: Import ProfId1 to siren and ProfId2 to siret
+
+***** ChangeLog for 3.5.3 compared to 3.5.2 *****
+Fix: Error on field accountancy code for export profile of invoices.
+Fix: [ bug #1351 ] VIES verification link broken.
+Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
+Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
+Fix: Can disable features with PHPEXCEL (no DLSF compatible).
+Fix: Can disable features with CKEDITOR. 
+Fix: Pb of records not correctly cleaned when module marge is
+     uninstalled (conflict between 'margin' and 'margins').
+Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing.
+Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents.
+Fix: Suppliers invoice mask fails using {tttt} in numbering.
+Fix: [ bug #1350 ] pdf template name for typhon was not correctly set when enabling module.
+Fix: Navigation on notes for shipments was not working.
+Fix: [ bug #1353 ] Email notifications, wrong URL.
+Fix: [ bug #1362 ] Note is not saved.
+Fix: tr/td balance.
+Fix: [ bug #1360 ] note indicator for member tab.
+Fix: Nb of notes and doc not visible onto tasks.
+Fix: [ bug #1372 ] Margin calculation does not work in proposals.
+Fix: [ bug #1381 ] PHP Warning when listing stock transactions page.
+Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
+Fix: TCPDF error file not found in member card generation.
+Fix: [ bug #1380 ] Customer invoices are not grouped in company results report.
+Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
+Fix: [ bug #1399 ] [pgsql] Silent warning when setting a propal as "facturée" in propal.php
+Fix: When number reach 9999 with default numbering module, next number
+     will be 10000 instead of 0000 and error.
+Fix: element page on project give wrong href link.
+Fix: [ bug #1397 ] Filter by supplier orders with status Draft does not filter.
+Fix: [ bug #1388 ] Wrong date when invoicing several orders.
+Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled.
+Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes.
+Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
+Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
+
+***** ChangeLog for 3.5.2 compared to 3.5.1 *****
+Fix: Can't add user for a task.
+Fix: Autoselect of warehouse if there is only one warehouse.
+Fix: Install of odt template for project and tasks.
+Fix: [ bug #1318 ] Problem with enter key when adding an existing
+     product to a customer invoice.
+Fix: [ bug #1307 ] Quotes get removed from several inputs.
+Fix: [ bug #1317 ] Removing a category does not remove all child categories
+Fix: [ bug #1312 ] Call to undefined function _()
+Fix: Restore build for obs and launchpad.
+Fix: deleting files into backup system tools.
+Fix: Dump using php not not include lock on tables that are deleted.
+Fix: Fixed a problem with bank accounts sharing across entities.
+Fix: fields into group by of sql requests for module margins must be
+     same than fields into select.
+Fix: When select_date is called with '' as preselected date,
+     automatic user date was not correctly et (We must set a date into PHP
+     server timezone area)
+Fix: First param of select_date must always be forged with a dolibarr
+     date function and not time().
+Fix: fix can't add line with product in supplier order
+Fix: [bug #1309]   
+Fix: Solve pb of too many embedded tables     
+Fix: [ bug #1306 ] Fatal error when adding an external calendar
+Fix: A fix to manage automatic creation of code for import.
+Fix: Try to add code to provide easy way to fix warning on timezone not
+     defined.
+Fix: Several fix into workflow/condition for invoice payments or convert
+     into discount.
+Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
+     making a pagebreak higher than 2 pages.     
+Fix: form to add images should not show link form.
+Fix: Correction when adding order line with price as '0'.
+Fix: [ bug #1283 ] ROUGET Shipment PDF.
+Fix: [ bug #1300 ]
+Fix: Miscellaneous problems on task tabs (withproject parameter lost and
+     download fails).
+Fix: Avoid home project page to hung when too many tasks opened.
+Fix: bug #1295: Error when creating an agenda extrafield with a number as reference
+Fix: Translation of number for pt_PT.
+Fix: Error on ajax_constantonoff function.
+Fix: [ bug #1323 ] problème pour générer un odt depuis les taches dans projet.
+Fix: Can not make withdrawals 
+
 ***** ChangeLog for 3.5.1 compared to 3.5.0 *****
 Fix: Do not report trigger errors twice.
 Fix: Error when creating event was not reported.
 Fix: Bug of import of agenda when using https link
 Fix: Field nature not saved correctly
-Fix: Substituion of extra field was ko for order
+Fix: Substitution of extra field was ko for order
 Fix: Bad translation of date format for pt_BR.
 Fix: priority field of agenda record is smallint.
 Fix: Missing loading of lang in some pages.
@@ -17,7 +458,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 thirdparies. We 
+Fix: Page load not ending when large number of thirdparties. 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
@@ -28,11 +469,11 @@ Fix: Enable extrafields for customer order, proposal and invoice lines. This fea
 Fix: user right on Holiday for month report nor working.
 Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work
 Fix: Bad space in predefined messages. 
-Fix: Signature was not added for email sent from thirdparty page.
+Fix: [ bug #1256 ] Signature was not added for email sent from thirdparty page.
 Fix: Action event SHIPPING_VALIDATE is not implemented
 Fix: The customer code was set to uppercase when using numbering module leopard. We
      must keep data safe of any change.
-Fix: Loading actions extrafields fails.
+Fix: [ bug #1291 ] Loading actions extrafields fails.
 Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid
 Fix: Corrected project contact types translation.
 Fix: [ bug #1206 ] PMP price is bad calculated.
@@ -40,6 +481,12 @@ Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
 Fix: [ bug #1240 ] traduction.
 Fix: [ bug #1238 ] When creating accompte with a %, free product are used for calculation.
 Fix: [ bug #1280 ] service with not end of date was tagged as expired.
+Fix: [ bug #1295 ] Error when creating an agenda extrafield with a number as reference.
+Fix: [ bug #1306 ] Fatal error when adding an external calendar.
+New: Added es_CL language
+Fix: Margin tabs bad data show
+Fix: [ bug #1318 ] Problem with enter key when adding an existing product to a customer invoice.
+Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:
@@ -173,18 +620,13 @@ 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.
 Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal vulnerability
+Fix: Agenda and Banks module were not working with multicompany module
+Fix: [ bug #1317 ] Removing a category does not remove all child categories
+Fix: [ bug #1380 ] Customer invoices are not grouped in company results report.
 
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
 Fix: field's problem into company's page (RIB).
@@ -796,7 +1238,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: Dictionnary setup works with very large external dictionnaries (Add 
+- New: Dictionary 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.
@@ -1443,7 +1885,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 optionnal new javascript popup selector for date fields.
+- Support optional 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.

README

@@ -1,138 +0,0 @@
-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). 

README-FR

@@ -1,128 +0,0 @@
-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). 

README-FR.md

@@ -0,0 +1,142 @@
+# DOLIBARR ERP & CRM
+
+## INTRODUCTION
+
+Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). 
+Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
+ 
+![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
+
+--------------------------------
+Documentation démarrage rapide
+--------------------------------
+
+1) Installer Dolibarr
+2) Mettre à jour Dolibarr depuis une ancienne version
+3) Ce qui est nouveau dans cette version
+4) Ce que peux faire Dolibarr
+5) Ce que ne peux pas faire Dolibarr (pas encore)
+
+
+## INSTALLER DOLIBARR
+
+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...
+
+
+
+## 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>

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_640x480.png)
+![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x400.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 at: [Official website] (http://www.dolibarr.org/downloads/)
+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,7 +113,8 @@ 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.2.1, MySql 4.1 or PostgreSQL 8.1.
+- Works with PHP 5.3+, MySql 4.1 or PostgreSQL 8.1.
+- Require PHP and Mysql or Postgresql (See exatc versions on http://wiki.dolibarr.org/index.php/Prerequisite).
 - Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
 - An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
 - Support countries specific features:
@@ -136,3 +137,15 @@ 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>
+

build/aps/configure.php

@@ -149,4 +149,3 @@ function php_quote($val)
     return $res_val;
 }
 
-?>

build/aps/install.forced.php.install

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

build/debian/README.Debian

@@ -0,0 +1,13 @@
+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.

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
-Uncomment line if required and restart mysql
-bind-address = 127.0.0.1
+Comment line in /etc/mysql/my.cnf if required and restart mysql
+#bind-address = 127.0.0.1
 
 Create a chroot called "unstable-amd64-sbuild"
 > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
@@ -120,11 +120,16 @@ Puis pour se connecter et préparer l'environnement
 > apt-get install links mysql-client
 
 Pour tester un package
-> cp *.deb /srv/chroot/unstable/tmp
+> 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
 > sudo schroot -c name_of_chroot
-> dpkg -i dolibarr*.deb
+> 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
 > apt-get install -f
 
+Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote).
 
 
 
@@ -155,23 +160,27 @@ from origin/upstream and origin/pristine.
 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-1 "My comment" will add entry.
-For example: dch -v x.y.z-1 "New upstream release." for a new version
+> dch -v x.y.z-dsfg-1 "My comment" will add entry.
+For example: dch -v x.y.z-dsfg-1 "New upstream release." for a new version
+Then modify changelog to replace "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
 Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
 
 * 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 --git-ignore-new  if you want to test build with uncommited file
+Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 
 * 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-buildpackage --git-tag-only --git-retag
 > 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 --tags
 
 * Compilation is then done by a debian developer and sent
@@ -187,7 +196,17 @@ http://packages.qa.debian.org/t/tcpdf.html
 
 ##### Update but tracker system
 To set status of a bug to pending
-> bts tag 728235 +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
 
 
 
@@ -210,32 +229,42 @@ from origin/upstream and origin/pristine.
 * If new upstream is available onto sourceforge, launch:
 > debian/get-orig-source.sh
 
+* Edit tgz file to remove ckeditor and phpexcel and rename file into 
+dolibarr-x.y.z+dsfgw.tgz
+(x.y.z = version, w start from 1 and is increased for each new import)
+
 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-3.3.4.tgz
+> git-import-orig -vv ../dolibarr-x.y.z+dsfgw.tgz
+and enter version when requested with format
+x.y.z+dsfgw
+(x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z-1 "My comment" will add entry.
-For example: dch -v x.y.z-1 "New upstream release." for a new version
+> dch -v x.y.z-w "My comment" will add entry.
+For example: dch -v x.y.z-w "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
 Then modify changelog to replace "unstable" with "UNRELEASED".
-
-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).
+Then check/modify also the user/date signature:
+- Date must have format reported by "date -R"
+- Name and email must match value into debian/control file (Entry added here is used by next step).
 
 * We try to build package
-> rm -fr ../build-area
-> git-buildpackage -us -uc
+> 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 --git-ignore-new  if you want to test build with uncommited file
+Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 
 * 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-buildpackage --git-tag-only --git-retag
 > 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 --tags
 
 * Compilation is then done by a debian developer and sent
@@ -250,4 +279,3 @@ http://packages.qa.debian.org
 
 * Package will be into release when test will be moved as stable.
 
-

build/debian/README.source

@@ -1,12 +0,0 @@
-==================================================================
-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

build/debian/changelog

@@ -1,34 +1,6 @@
-dolibarr (3.5.1-3) unstable; urgency=low
+dolibarr (__VERSION__) UNRELEASED; 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
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     

build/debian/conf.php.install

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

build/debian/control

@@ -2,11 +2,11 @@ Source: dolibarr
 Section: web
 Priority: optional
 Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-Standards-Version: 3.9.4
+# Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
+Standards-Version: 3.9.6
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 9), po-debconf, dpatch
-Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
+Build-Depends: debhelper (>= 9), po-debconf
+# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
  
 Package: dolibarr
 Architecture: all
@@ -16,7 +16,8 @@ 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, 
-#    libfpdi-php, libfpdf-tpl-php, php-fpdf,
+#    php-tcpdf, libfpdi-php,
+#    libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
 #    libnusoap-php,
 #    libphp-pclzip,
@@ -26,11 +27,12 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 #    fonts-dejavu-core | ttf-dejavu-core,
     xdg-utils,
     mysql-server,
+    mysql-client,
     ${misc:Depends},
     ${perl:Depends}
-Recommends: mysql-client, apache2 | lighttpd | httpd
+Recommends: apache2 | lighttpd | httpd
 Suggests: www-browser
-Description: Web based software to manage a small company or foundation
+Description: Web based software to manage a company or foundation
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
@@ -39,10 +41,10 @@ Description: Web based software to manage a small company or foundation
  It's a web software you can install as a standalone program or on any web
  hosting provider to use it from anywhere with any web browser.
  .
- Dolibarr was designed to be easy to use. Only the features that you need are 
- visible, depending on which modules were activated.
+ Dolibarr was designed to be easy to use. Only the features that you need
+ are visible, depending on which modules were activated.
  .
- Most common used modules are:
+ This is an example of most common used modules:
  .
  Customers, Suppliers or Prospects directory,
  Contacts directory,
@@ -66,6 +68,6 @@ Description: Web based software to manage a small company or foundation
  Wizards to export and import data,
  LDAP connectivity,
  PDF exports,
- And a lot of more modules...
+ And a lot more modules...
  .
- You can also add third parties external modules or develop yours.
+ You can also add external modules from third parties or develop yours.

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://sourceforge.net/projects/dolibarr/files/
+Source: http://www.dolibarr.org/files/stable/standard/
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
@@ -61,7 +61,7 @@ License: GPL-3+
 Files: htdocs/includes/adodbtime/*
 Copyright: 2003-2005, John Lim
            unknown, jackbbs
-License: BSD
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -272,7 +272,7 @@ Comment:
 
 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
-License: Public Domain
+License: Public-Domain
  This work is not subject to copyright in any jurisdiction
 Comment:
  Those files are not shipped in the binary package because we configure

build/debian/dolibarr.doc-base

@@ -1,10 +0,0 @@
-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

build/debian/dolibarr.docs

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

build/debian/dolibarr.install

@@ -6,8 +6,6 @@ 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/

build/debian/dolibarr.postinst

@@ -129,21 +129,21 @@ 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
-			grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-			#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-			grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-			grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-			#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-			#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-			grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-			grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+			#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
+			#grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+			##grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+			##grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+			#grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+			#grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+			#grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+			#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 		fi
 	
 		db_get dolibarr/reconfigure-webserver

build/debian/get-orig-source.sh

@@ -8,16 +8,20 @@ echo "tmpdir = $tmpdir"
 if [ -n "$1" ]; then
     uscan_opts="--download-version=$1"
 fi
-uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+#uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
 
 cd $tmpdir
 
+# Other method to download (comment uscan if you use this)
+wget http://www.dolibarr.org/files/stable/standard/dolibarr-3.5.4.tgz
+
+# Rename file to add +dfsg
 tgzfile=$(echo *.tgz)
 version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')
 
 cd - >/dev/null
 
 mv $tmpdir/dolibarr-${version}.tgz ../
-echo "File ../dolibarr-${version}.tgz is ready for git-import"
+echo "File ../dolibarr-${version}.tgz is ready for git-import-orig"
 
 rm -rf $tmpdir

build/debian/install.forced.php.install

@@ -36,11 +36,9 @@ $force_install_lockinstall='444';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-//$force_dolibarr_lib_PHPEXCEL_PATH='';
-//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
+//$force_dolibarr_lib_PHPEXCEL_PATH='';	// Use '' or 'disabled'
+//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';	// Use '/javascript/ckeditor' or 'disabled'
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
 //$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
-
-?>

build/debian/patches/00list

@@ -1 +0,0 @@
-install.dpatch

build/debian/patches/install.dpatch

@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install.patch by <eldy@users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Updates htdocs/filefunc.inc.php
-## DP: Updates htdocs/install/inc.php
-## DP: Updates htdocs/support/inc.php
-
-@DPATCH@
-
-
---- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
-+++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -63,8 +63,8 @@
- $conffile = "conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- // For debian/redhat like systems
--//$conffile = "/etc/dolibarr/conf.php";
--//$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- 
- // Include configuration
---- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
-+++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -71,8 +71,8 @@
- $conffile = "../conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- // For debian/redhat like systems
--//$conffile = "/etc/dolibarr/conf.php";
--//$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- 
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
---- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
-+++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -69,8 +69,8 @@
- $conffile = "../conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- // For debian/redhat like systems
--//$conffile = "/etc/dolibarr/conf.php";
--//$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- 
- if (! defined('DONOTLOADCONF') && file_exists($conffile))

build/debian/patches/series

@@ -0,0 +1 @@
+use-etc-dolibarr-conf.patch

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

@@ -0,0 +1,50 @@
+Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
+ Update some PHP include files to refer to /etc/dolibarr/conf.php
+ instead of the in-tree conf/conf.php.
+ .
+ /etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
+ instead of the embedded ones.
+Author: Laurent Destailleur <eldy@users.sourceforge.net>
+Forwarded: not-needed
+Last-Update: 2013-07-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/htdocs/filefunc.inc.php
++++ b/htdocs/filefunc.inc.php
+@@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Include configuration
+--- a/htdocs/install/inc.php
++++ b/htdocs/install/inc.php
+@@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))
+--- a/htdocs/support/inc.php
++++ b/htdocs/support/inc.php
+@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))

build/debian/rules

@@ -7,29 +7,17 @@ export DH_OPTIONS=-v
 #export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
 
 
-# use dpatch
-include /usr/share/dpatch/dpatch.make
-
-
-configure:
+%:
 	dh $@
 
-build: patch
-	dh $@
+override_dh_auto_clean:
+# Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
 
-build-arch: patch
-	dh $@
-
-build-indep: patch
-	dh $@
-
-binary:
-	dh $@
-
-binary-indep:
-	dh $@
+override_dh_auto_build:
+# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
 	
-clean:
+override_dh_install:
+	dh_install
 	# Delete files
 	rm -f  .buildpath
 	rm -fr .cache
@@ -41,7 +29,6 @@ clean:
 	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
@@ -119,7 +106,16 @@ clean:
 	rm -f  htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
 
-	dh $@
+	# Drop unwanted executable permissions
+	find debian/dolibarr/usr/share/dolibarr/htdocs -type f -print0 | \
+	     xargs -0 chmod 644
+	# Add missing executable permissions
+	find debian/dolibarr/usr/share/dolibarr/scripts -type f -name '*.php' -print0 | \
+	     xargs -0 chmod 755
 
-binary-arch:
+override_dh_fixperms:
+	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
 	

build/debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

build/dmg/dolimamp/install.forced.php

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

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,14 +24,31 @@ 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;   
 }
 
-print "Running doxygen, please wait...\n";
-$result=`doxygen $OPTIONS $CONFFILE 2>&1`;
+$SOURCE="../..";
+
+# Get version $MAJOR, $MINOR and $BUILD
+$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
+if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
+while (<IN>) {
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+}
+close IN;
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
+
+
+$version=$MAJOR.".".$MINOR.".".$BUILD;
+
+
+print "Running doxygen for version ".$version.", please wait...\n";
+print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
 
 print $result;
 

build/doxygen/dolibarr-doxygen.doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 3.5.1
+PROJECT_NUMBER = x.y.z
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

build/doxygen/doxygen_header.html

@@ -35,15 +35,15 @@ File added into doxygen generated documentation
 				<div class="bannergroupmybanner">
 
 				<div class="banneritemmybanner">
-<script type="text/javascript"><!--
-google_ad_client = "pub-1071905880519467";
-/* PUBBANDEAUDOLIBARR */
-google_ad_slot = "1421205532";
-google_ad_width = 468;
-google_ad_height = 60;
-//-->
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- BAN_728x90_DOXYGEN -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:728px;height:90px"
+     data-ad-client="ca-pub-1465985984238664"
+     data-ad-slot="4297390217"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 				<div class="clr"></div>
 				</div>
 

build/exe/doliwamp/.gitignore

@@ -0,0 +1 @@
+/doliwamp.tmp.iss

build/exe/doliwamp/doliwamp.iss

@@ -16,10 +16,10 @@
 [Setup]
 ; ----- Change this -----
 AppName=DoliWamp
-; 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=DoliWamp-3.5.1
-; 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=DoliWamp-3.5.1
+; 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
+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
+OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2013 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -108,8 +108,8 @@ 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: "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\*,xdebug\*"
+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"
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"

build/exe/doliwamp/httpd.conf.install

@@ -758,5 +758,15 @@ 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"

build/exe/doliwamp/php.ini.install

@@ -603,7 +603,7 @@ upload_max_filesize = 2M
 ;;;;;;;;;;;;;;;;;;
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = Off
+allow_url_fopen = On
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 allow_url_include = Off

build/launchpad/README

@@ -81,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)
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name or just bzr push if into a known branch)
 - or download it from launchpad bazaar:
     cd bzr
     bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]

build/makepack-dolibarrlang.pl

@@ -45,9 +45,9 @@ elsif ( "$^O" =~ /cygwin/i || "$^O" =~ /win32/i ) {
 	$CR = "\r";
 }
 if ( !$OS ) {
-	print "makepack-dolbarrlang.pl was not able to detect your OS.\n";
+	print "$PROG.$Extension was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "makepack-dolibarrlang.pl aborted.\n";
+	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
 }

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 "makepack-dolbarrtheme.pl was not able to detect your OS.\n";
+    print "$PROG.$Extension was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "makepack-dolibarrtheme.pl aborted.\n";
+	print "$PROG.$Extension aborted.\n";
     sleep 2;
 	exit 1;
 }

build/makepack-howto.txt

@@ -8,21 +8,20 @@ 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
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
-- Update version number with x.y.z-w in build/debian/changelog
-- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
-- Update version number with x.y.z-w in build/rpm/*.spec
-- Update version number with x.y.z   in build/doxygen/dolibarr-doxygen.doxyfile
-- Update version number with x.y.z   in build/perl/virtualmin/dolibarr.pl
 - 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.
-- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
 
-- Post a news on dolibarr.org/dolibarr.fr
+- 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
 - Send mail on mailings-list
 
 
@@ -31,22 +30,22 @@ 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
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z in htdocs/filefunc.inc.php
-- Update version number with x.y.z in build/debian/changelog
-- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
-- Update version number with x.y.z in build/rpm/*.spec
-- Update PAD files.
 - Commit all changes.
-- Add a Tag (x.y.z)
 
-- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
+- Run makepack-dolibarr.pl to generate all packages.
+
 - Check content of built packages.
-- Move build files (tgz+exe+deb+rpm...), ChangeLog and PAD files
-  into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
-- Edit symbolic links in directory "/home/dolibarr/wwwroot/files" on server to
-  point to new files (used by PAD descriptor).
-- Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge.
+- 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.
+- 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)

build/obs/README

@@ -11,6 +11,7 @@ a package onto OBS
 #----------------------------------
 https://build.opensuse.org
 
+Packaging rules: http://en.opensuse.org/Portal:Packaging
 
 Add attributes:
 OBS:Screenshots         URL of screenshot

build/pdf/README.txt

@@ -0,0 +1,9 @@
+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; }
+

build/pdf/htmldoc_en.book

@@ -0,0 +1,4 @@
+#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

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,8 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "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" );
+	# TODO Replace this with version of Dolibar we want to install 
+	return ( "x.y.z", "3.6.0");
 }
 
 sub script_dolibarr_category

build/rpm/conf.php

@@ -5,4 +5,3 @@
 //
 // This file will be filled by installer
 //
-?>

build/rpm/dolibarr_fedora.spec

@@ -103,6 +103,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
@@ -159,6 +160,7 @@ 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
@@ -193,6 +195,7 @@ 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
@@ -330,8 +333,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
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
+__CHANGELOGSTRING__

build/rpm/dolibarr_generic.spec

@@ -166,6 +166,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
@@ -239,6 +240,7 @@ 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
@@ -273,6 +275,7 @@ 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
@@ -305,6 +308,11 @@ done >>%{name}.lang
 %post
 
 echo Run post script of packager dolibarr_generic.spec
+echo Detected constant fedora=0%{?fedora}
+echo Detected constant rhel_version=0%{?rhel_version}
+echo Detected constant centos_version=0%{?centos_version}
+echo Detected constant mdkversion=0%{?mdkversion}
+echo Detected constant suse_version=0%{?suse_version}
 
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
@@ -465,9 +473,12 @@ echo Restart mysql server
 %else
 %if 0%{?suse_version}
 if [ -f /etc/init.d/mysqld ]; then
-  /etc/init.d/mysqld restart
-else
+  /sbin/service mysqld restart
+  #/etc/init.d/mysqld restart
+fi
+if [ -f /etc/init.d/mysql ]; then
   /sbin/service mysql restart
+  #/etc/init.d/mysql restart
 fi
 %else
 if [ -f /etc/init.d/mysqld ]; then
@@ -558,8 +569,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
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
+__CHANGELOGSTRING__

build/rpm/dolibarr_mandriva.spec

@@ -102,6 +102,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang
@@ -156,6 +157,7 @@ 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
@@ -190,6 +192,7 @@ 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
@@ -335,8 +338,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
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
+__CHANGELOGSTRING__

build/rpm/dolibarr_opensuse.spec

@@ -103,6 +103,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang
@@ -167,6 +168,7 @@ 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
@@ -201,6 +203,7 @@ 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
@@ -289,8 +292,9 @@ fi
 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /etc/init.d/mysqld restart
-else
+  /sbin/service mysqld restart
+fi
+if [ -f /etc/init.d/mysql ]; then
   /sbin/service mysql restart
 fi
 
@@ -345,8 +349,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
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
+__CHANGELOGSTRING__

build/rpm/install.forced.php.fedora

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

build/rpm/install.forced.php.generic

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

build/rpm/install.forced.php.mandriva

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

build/rpm/install.forced.php.opensuse

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

build/tgz/tar_exclude.txt

@@ -1,3 +1,6 @@
+*~
+.#*
+Thumbs.db
 build/exe
 build/html
 dev/dbmodel
@@ -7,58 +10,10 @@ dev/initdata
 dev/iso-normes
 dev/licence
 dev/load
-dev/skeletons/*socpeople*
-dev/spec
-dev/test
-dev/uml
-dev/xdebug
-doc/dev/dolibarr-phpdoc
-doc/dev/barcode
-doc/dev/compta
-doc/dev/dbmodel
-doc/dev/normes
-doc/dev/html
-doc/dev/iso-normes
-doc/flyer
-doc/font
-doc/rollup
-doc/tshirts
-doc/wiki
-document
-documents
 htdocs/conf/conf.php
 htdocs/conf/conf.php.mysql
 htdocs/conf/conf.php.old
 htdocs/conf/conf.php.postgres
-htdocs/avoir
-htdocs/custom
-htdocs/custom2
-htdocs/customleave
-htdocs/customgoogle
-htdocs/document
-htdocs/documents
-htdocs/includes/fckeditor/_samples
-htdocs/includes/fckeditor/_testcases
-htdocs/includes/nusoap/samples
-htdocs/includes/tcpdf/fonts/utils
-htdocs/includes/tcpdf/fonts/free*.ctg.z
-htdocs/includes/tcpdf/fonts/free*.z
-mssql
-test
-CVS
-*~
-.#*
-.buildpath
-.cache
-.cvsignore
-.gitignore
-.externalToolBuilders
-.htaccess
-.settings
-.project
-.travis.yml
-Thumbs.db
-data_dev.sql
 doli*.tar.gz
 doli*.tgz
 doli*.exe
@@ -66,5 +21,4 @@ doli*.rpm
 doli*.deb
 doli*.zip
 cvschangelogbuilder_dolibarr*
-doxygen_warnings.log
-dolibarr_install.log
+dolibarr_install.log

build/travis-ci/apache.conf

@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+  DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
+
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
+    Options FollowSymLinks MultiViews ExecCGI
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+  </Directory>
+
+  # Wire up Apache to use Travis CI's php-fpm.
+  <IfModule mod_fastcgi.c>
+    AddHandler php5-fcgi .php
+    Action php5-fcgi /php5-fcgi
+    Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+  </IfModule>
+</VirtualHost>

build/zip/zip_exclude.txt

@@ -1,65 +1,19 @@
-*/build
+*~
+*.#*
+Thumbs.db
+*/build/exe
+*/build/html
 */dev/dbmodel/*
 */dev/fpdf/*
 */dev/initdemo/*
+*/dev/initdata/*
 */dev/iso-normes/*
 */dev/licence/*
 */dev/load/*
-*/dev/test/*
-*/dev/uml/*
-*/dev/xdebug/*
-*/doc/dev/dolibarr-phpdoc/*
-*/doc/dev/barcode/*
-*/doc/dev/compta/*
-*/doc/dev/dbmodel/*
-*/doc/dev/normes/*
-*/doc/dev/html/*
-*/doc/dev/iso-normes/*
-*/doc/flyer/*
-*/doc/font/*
-*/doc/rollup/*
-*/doc/tshirt/*
-*/doc/wiki/*
-*/document/*
-*/documents/*
-*/htdocs/avoir/*
 */htdocs/conf/conf.php
 */htdocs/conf/conf.php.mysql
 */htdocs/conf/conf.php.old
 */htdocs/conf/conf.php.postgres
-*/htdocs/custom/*
-*/htdocs/custom2/*
-*/htdocs/document/*
-*/htdocs/documents/*
-*/htdocs/includes/ckeditor/_source
-*/htdocs/includes/ckeditor/*_source.js
-*/htdocs/includes/fckeditor/_samples/*
-*/htdocs/includes/fckeditor/_testcases/*
-*/htdocs/includes/nusoap/samples/*
-*/htdocs/includes/phplot5/doc/*
-*/htdocs/includes/phplot5/examples/*
-*/htdocs/includes/scriptaculous/test/*
-*/htdocs/includes/treemenu/docs/*
-*/htdocs/includes/treemenu/images/*
-*/htdocs/includes/treemenu/imagesAlt/*
-*/htdocs/includes/treemenu/imagesAlt2/*
-*/htdocs/includes/tcpdf/fonts/utils/*
-*/htdocs/includes/tcpdf/fonts/free*.ctg.z
-*/htdocs/includes/tcpdf/fonts/free*.z
-*/test
-*/CVS/*
-*~
-*.#*
-*.buildpath*
-*.cache*
-*.cvsignore*
-*.gitignore*
-*.htaccess*
-*.settings*
-*.project*
-*.travis.yml*
-Thumbs.db
-data_dev.sql
 dolibarr*.tar.gz
 dolibarr*.tgz
 dolibarr*.exe
@@ -67,5 +21,4 @@ dolibarr*.rpm
 dolibarr*.deb
 dolibarr*.zip
 cvschangelogbuilder_dolibarr*
-doxygen_warnings.log
-dolibarr_install.log
+dolibarr_install.log

composer.json

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

dev/codesniffer/ruleset.dtd

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT ruleset (description,rule+)>
+<!ELEMENT ruleset (description,exclude-pattern*,rule+)>
 <!ATTLIST ruleset name CDATA "">
 <!ELEMENT description (#PCDATA)>
+<!ELEMENT exclude-pattern (#PCDATA)>
 <!ELEMENT rule (properties*,severity*)>
 <!ATTLIST rule ref CDATA "">
 <!ELEMENT properties (property+)>

dev/codesniffer/ruleset.xml

@@ -3,14 +3,43 @@
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>
 
-	<!-- List of all tests -->
+	<exclude-pattern>*/conf.php</exclude-pattern>
+	<exclude-pattern>*/includes/*</exclude-pattern>
+	<exclude-pattern>*/documents/*</exclude-pattern>
+	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
+	<exclude-pattern>*/custom/*</exclude-pattern>
+	<exclude-pattern>*/nltechno*</exclude-pattern>
 
+		<!-- 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">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedFOREACH">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>
@@ -46,6 +75,9 @@
 		</rule>
 	-->
 
+    <!-- PHP code MUST use only UTF-8 without BOM. -->
+    <rule ref="Generic.Files.ByteOrderMark"/>
+
 	<!-- Lines can be 85 chars long, but never show errors -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
@@ -93,7 +125,7 @@
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="complexity" value="80" />
-            <property name="absoluteComplexity" value="200" />
+            <property name="absoluteComplexity" value="250" />
         </properties>
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
@@ -132,8 +164,6 @@
         <severity>0</severity>
 	</rule>
     
-    <rule ref="Generic.VersionControl.SubversionProperties" />
-
 	<!-- Disallow usage of tab -->
 	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
 
@@ -141,16 +171,46 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
-	<rule ref="PEAR.Classes.ClassDeclaration" />
+
+
+    <!-- Rules from PEAR Standard -->
+
+    <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">
+
+    <!-- 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">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.ClassComment.MissingCategoryTag">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.ClassComment.MissingLicenseTag">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.ClassComment.MissingLinkTag">
+        <severity>0</severity>
+    </rule>
+        
+    <rule ref="PEAR.Commenting.ClassComment.MissingPackageTag">
+        <severity>0</severity>
+    </rule>
+        
+
+   
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -163,15 +223,40 @@
         <severity>0</severity>
     </rule>
     -->
-    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
-        <severity>0</severity>
-    </rule>
     
+    <rule ref="PEAR.Commenting.FunctionComment" />
+
     <rule ref="PEAR.Commenting.FunctionComment.Empty">
         <severity>5</severity>
     </rule>
     
-    <rule ref="PEAR.Commenting.FunctionComment" />
+	<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    
     <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
         <severity>0</severity>
     </rule>
@@ -204,9 +289,30 @@
 
 	<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>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
+        <severity>0</severity>
+    </rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
+        <severity>0</severity>
+    </rule>
 	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -224,6 +330,10 @@
 	</rule>
 	
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
+        <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>
 	</rule>
@@ -234,15 +344,20 @@
 	<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
@@ -258,4 +373,10 @@
     <!-- 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>

dev/deduplicatefilelinesrecursively.sh

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

dev/detectduplicatelangkey.sh

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

dev/dolibarr_changes.txt

@@ -39,6 +39,11 @@ 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';
+
 
 JSGANTT:
 --------

dev/examples/create_invoice.php

@@ -115,4 +115,3 @@ else
 $db->close();
 
 return $error;
-?>

dev/examples/create_order.php

@@ -113,4 +113,3 @@ else
 $db->close();
 
 return $error;
-?>

dev/examples/create_product.php

@@ -105,4 +105,3 @@ else
 $db->close();
 
 return $error;
-?>

dev/examples/create_user.php

@@ -107,4 +107,3 @@ else
 $db->close();
 
 return $error;
-?>

dev/examples/get_contracts.php

@@ -81,4 +81,3 @@ print_r($listofcontractsforcompany);
 $db->close();
 
 return $error;
-?>

dev/fixdosfiles.sh

@@ -16,13 +16,14 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	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
+	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
 fi
 
 # To convert
 if [ "x$1" = "xfix" ]
 then
-	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 }' `
+	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 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix $fic

dev/initdata/generate-commande.php

@@ -212,4 +212,3 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 	}
 }
 
-?>

dev/initdata/generate-facture.php

@@ -135,4 +135,3 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 }
 
 
-?>

dev/initdata/generate-produit.php

@@ -98,4 +98,3 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
 }
 
 
-?>