Fix: 3.2 was ok with PHP 5.3 only, not 5.4

Backport travis script into 3.2
Update ignore files
2026-02-08 09:01:40 +01:00 · 2013-12-09 02:11:39 +01:00 · 2013-12-09 02:05:52 +01:00 · 2013-12-09 01:44:00 +01:00 · 2013-06-13 15:25:28 -07:00 · 2013-06-13 15:03:20 +02:00
5352 changed files with 297148 additions and 671196 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,28 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# More info: https://help.github.com/articles/dealing-with-line-endings
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.pl text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
-*.frm binary
-*.MYD binary
-*.MYI binary
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ htdocs/conf/conf.php.old
 documents/
 custom/
 custom2/
-test/report/
 nbproject
 default.properties
 .settings/
@@ -13,7 +12,3 @@ dolibarr_install.log
 doxygen_warnings.log
 /.project
 .DS_Store
-.idea
-*.iml
-Thumbs.db
-
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,21 +3,13 @@
 # Command run is phpunit
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/

-notifications:
-  email:
-    on_success: never # [always|never|change] default: change
-    on_failure: change # [always|never|change] default: always
-    
 services:
 - memcached # will start memcached

 # 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" 

 env:
 - DB=mysql
@@ -27,14 +19,8 @@ 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
+ - 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;
@@ -44,19 +30,17 @@ before_script:
 - 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 = apc.so" >> ~/.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"
+ - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 - 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"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.2.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"
@@ -72,7 +56,7 @@ before_script:
 - echo Show conf.php content
 - cat htdocs/conf/conf.php
 - echo Install apache server
- - sudo apt-get update
+ - sudo apt-get update > /dev/null
 - 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
@@ -83,19 +67,13 @@ before_script:
 


+# Omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/AllTests.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php
 script: 
- - cd htdocs/install
- - date
- - php upgrade.php 3.4.0 3.5.0 > upgrade.log
- - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log
-# - cat upgrade.log
-# - cat upgrade2.log
- - cd ../..
- - date
-# - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1
- - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
- - date
-# - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+# - phpcs -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

 after_script:
--- a/.tx/config
+++ b/.tx/config
@@ -1,304 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = uz: uz_UZ
-
-[dolibarr.admin]
-file_filter = htdocs/langs/<lang>/admin.lang
-source_file = htdocs/langs/en_US/admin.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.agenda]
-file_filter = htdocs/langs/<lang>/agenda.lang
-source_file = htdocs/langs/en_US/agenda.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.banks]
-file_filter = htdocs/langs/<lang>/banks.lang
-source_file = htdocs/langs/en_US/banks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bills]
-file_filter = htdocs/langs/<lang>/bills.lang
-source_file = htdocs/langs/en_US/bills.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bookmarks]
-file_filter = htdocs/langs/<lang>/bookmarks.lang
-source_file = htdocs/langs/en_US/bookmarks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.boxes]
-file_filter = htdocs/langs/<lang>/boxes.lang
-source_file = htdocs/langs/en_US/boxes.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cashdesk]
-file_filter = htdocs/langs/<lang>/cashdesk.lang
-source_file = htdocs/langs/en_US/cashdesk.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.categories]
-file_filter = htdocs/langs/<lang>/categories.lang
-source_file = htdocs/langs/en_US/categories.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.commercial]
-file_filter = htdocs/langs/<lang>/commercial.lang
-source_file = htdocs/langs/en_US/commercial.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.companies]
-file_filter = htdocs/langs/<lang>/companies.lang
-source_file = htdocs/langs/en_US/companies.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.compta]
-file_filter = htdocs/langs/<lang>/compta.lang
-source_file = htdocs/langs/en_US/compta.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.contracts]
-file_filter = htdocs/langs/<lang>/contracts.lang
-source_file = htdocs/langs/en_US/contracts.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cron]
-file_filter = htdocs/langs/<lang>/cron.lang
-source_file = htdocs/langs/en_US/cron.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.deliveries]
-file_filter = htdocs/langs/<lang>/deliveries.lang
-source_file = htdocs/langs/en_US/deliveries.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.dict]
-file_filter = htdocs/langs/<lang>/dict.lang
-source_file = htdocs/langs/en_US/dict.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.donations]
-file_filter = htdocs/langs/<lang>/donations.lang
-source_file = htdocs/langs/en_US/donations.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ecm]
-file_filter = htdocs/langs/<lang>/ecm.lang
-source_file = htdocs/langs/en_US/ecm.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.errors]
-file_filter = htdocs/langs/<lang>/errors.lang
-source_file = htdocs/langs/en_US/errors.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.exports]
-file_filter = htdocs/langs/<lang>/exports.lang
-source_file = htdocs/langs/en_US/exports.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.externalsite]
-file_filter = htdocs/langs/<lang>/externalsite.lang
-source_file = htdocs/langs/en_US/externalsite.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ftp]
-file_filter = htdocs/langs/<lang>/ftp.lang
-source_file = htdocs/langs/en_US/ftp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.help]
-file_filter = htdocs/langs/<lang>/help.lang
-source_file = htdocs/langs/en_US/help.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.holiday]
-file_filter = htdocs/langs/<lang>/holiday.lang
-source_file = htdocs/langs/en_US/holiday.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.install]
-file_filter = htdocs/langs/<lang>/install.lang
-source_file = htdocs/langs/en_US/install.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.interventions]
-file_filter = htdocs/langs/<lang>/interventions.lang
-source_file = htdocs/langs/en_US/interventions.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.languages]
-file_filter = htdocs/langs/<lang>/languages.lang
-source_file = htdocs/langs/en_US/languages.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ldap]
-file_filter = htdocs/langs/<lang>/ldap.lang
-source_file = htdocs/langs/en_US/ldap.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mailmanspip]
-file_filter = htdocs/langs/<lang>/mailmanspip.lang
-source_file = htdocs/langs/en_US/mailmanspip.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mails]
-file_filter = htdocs/langs/<lang>/mails.lang
-source_file = htdocs/langs/en_US/mails.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.main]
-file_filter = htdocs/langs/<lang>/main.lang
-source_file = htdocs/langs/en_US/main.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.margins]
-file_filter = htdocs/langs/<lang>/margins.lang
-source_file = htdocs/langs/en_US/margins.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.members]
-file_filter = htdocs/langs/<lang>/members.lang
-source_file = htdocs/langs/en_US/members.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.opensurvey]
-file_filter = htdocs/langs/<lang>/opensurvey.lang
-source_file = htdocs/langs/en_US/opensurvey.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.orders]
-file_filter = htdocs/langs/<lang>/orders.lang
-source_file = htdocs/langs/en_US/orders.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.oscommerce]
-file_filter = htdocs/langs/<lang>/oscommerce.lang
-source_file = htdocs/langs/en_US/oscommerce.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.other]
-file_filter = htdocs/langs/<lang>/other.lang
-source_file = htdocs/langs/en_US/other.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paybox]
-file_filter = htdocs/langs/<lang>/paybox.lang
-source_file = htdocs/langs/en_US/paybox.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paypal]
-file_filter = htdocs/langs/<lang>/paypal.lang
-source_file = htdocs/langs/en_US/paypal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.products]
-file_filter = htdocs/langs/<lang>/products.lang
-source_file = htdocs/langs/en_US/products.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.projects]
-file_filter = htdocs/langs/<lang>/projects.lang
-source_file = htdocs/langs/en_US/projects.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.propal]
-file_filter = htdocs/langs/<lang>/propal.lang
-source_file = htdocs/langs/en_US/propal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sendings]
-file_filter = htdocs/langs/<lang>/sendings.lang
-source_file = htdocs/langs/en_US/sendings.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.shop]
-file_filter = htdocs/langs/<lang>/shop.lang
-source_file = htdocs/langs/en_US/shop.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sms]
-file_filter = htdocs/langs/<lang>/sms.lang
-source_file = htdocs/langs/en_US/sms.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.stocks]
-file_filter = htdocs/langs/<lang>/stocks.lang
-source_file = htdocs/langs/en_US/stocks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.suppliers]
-file_filter = htdocs/langs/<lang>/suppliers.lang
-source_file = htdocs/langs/en_US/suppliers.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.trips]
-file_filter = htdocs/langs/<lang>/trips.lang
-source_file = htdocs/langs/en_US/trips.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.users]
-file_filter = htdocs/langs/<lang>/users.lang
-source_file = htdocs/langs/en_US/users.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.withdrawals]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.workflow]
-file_filter = htdocs/langs/<lang>/workflow.lang
-source_file = htdocs/langs/en_US/workflow.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
--- a/1057
+++ b/1057
--- a/105
+++ b/105
@@ -3,45 +3,40 @@ License
 -------

 Dolibarr is released under the terms of the GNU General Public License as 
-published by the Free Software Foundation; either version 3 of the License,
-or (at your option) any later version (GPL-3+).
-More information: http://www.gnu.org/licenses/gpl-3.0.txt
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version

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

-Composant             Version  License                     Compatible GPL   Usage
+Composant         Version  License                     Compatible GPL   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.21		Modified BSD License		Yes				Date convertion (not into rpm package)
+CKEditor		  3.6.2		GPL or LGPL 2.1 or MPL 1.1	Yes				Editor WYSIWYG
+FPDI              1.4.1		Apache Software License 2.0	?				PDF templates management
+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.0						Yes				Library to build/edit ODT files
+PHPExcel		  1.7.6		LGPL 2.1					Yes				Read/Write XLS files, read ODS files
+TCPDF             5.9.098	LGPL 3.0					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.7.2		GPL and MIT Licence			Yes				JS library
+jQuery UI         1.8.20	GPL and MIT Licence			Yes				JS library plugin UI
+jQuery Colorpicker 1.1	    MIT Licence					Yes				JS library for color picker for a defined list of colors
+jQuery DataTable  1.8.1     BSD							Yes				JS library for tables output
+jQuery Flot       0.7		MIT Licence					Yes				JS library to build graph
+jQuery FileUpload 5.0.3		GPL and MIT Licence			Yes				JS library to upload files
+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	?				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 Layout     1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
+jQuery TableDnD   0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+jQuery Mobile	  1.0rc2	GPL and MIT Licence			Yes				JS library for smartphone (not used)
+jQuery Tiptip     1.3		GPL and MIT Licence			Yes				JS library for tooltips
+JSGantt           1.2		BSD Licence					Yes				JS library (to build Gantt reports)
+

 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -50,70 +45,51 @@ http://www.fsf.org/licensing/licenses/index_html
 Copyright
 ---------

-Copyright (C) 2013
- Christophe Battarel <christophe.battarel@altairis.fr>
- Laurent Destailleur <eldy@users.sourceforge.net>
- 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>
- Adolfo Segura <adolfo.segura@gmail.com>
-
 Copyright (C) 2012
- Christophe Battarel <christophe.battarel@altairis.fr>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Jean-François Ferry <jfefe@aternatik.fr>
- Marcos García <marcosgdf@gmail.com>
+- Regis Houssin	<regis@dolibarr.fr>
+- Juanjo Menent <jmenent@2byte.es>
 - 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>
- Maxime Kohlhaas <mko@atm-consulting.fr>
- Juanjo Menent <jmenent@2byte.es>
- Nicolas Péré <nicolas@amarok2.net>
+- Marcos García <marcosgdf@gmail.com>

 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin	<regis.houssin@capnetworks.com>
+- Regis Houssin	<regis@dolibarr.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>

 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>
 - Juanjo Menent <jmenent@2byte.es>
 - r2gnl
 - meos

 Copyright (C) 2009
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>
 - Juanjo Menent <jmenent@2byte.es>

 Copyright (C) 2008
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2007
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>
 - Auguria SARL <info@auguria.org>
 - Jean Heimburger <jean@tiaris.info>
- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2006
 - Auguria SARL <info@auguria.org>
 - Marc Barilley/Ocebo <marc@ocebo.com>
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>
 - Andre Cianfarani <acianfa@free.fr>
 - Yannick Warnier <ywarnier@beeznest.org>
 - Jean Heimburger <jean@tiaris.info>
@@ -125,15 +101,14 @@ Copyright (C) 2005
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Eric Seigne <erics@rycks.com>
 - Matthieu Valleton <mv@seeschloss.org>
- Regis Houssin <regis.houssin@capnetworks.com>
+- Regis Houssin <regis@dolibarr.fr>

 Copyright (C) 2004
- Laurent Destailleur <eldy@users.sourceforge.net>
+- Laurent Destailleur  <eldy@users.sourceforge.net>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Eric Seigne <erics@rycks.com>
 - Benoit Mortier <benoit.mortier@opensides.be>
- Christophe Combelles <ccomb@free.fr>
- Sebastien Di Cintio <sdicintio@ressource-toi.org>
+- Christophe Combelles  <ccomb@free.fr>

 Copyright (C) 2003
 - Jean-Louis Bergamo <jlb@j1b.org>
--- a/749
+++ b/749
@@ -2,709 +2,9 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------

-***** ChangeLog for 3.5.7 compared to 3.5.6 *****
-Fix: Paypal link were broken dur 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
-
-***** 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. Initializaion of amount of holidays failed.
-Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
-Fix: Fusion PDF button on unpaid invoice is no more displayed.
-Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click).
-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 to use dol_delete_recursive.
-Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
-Fix: [ bug #1553 ] Saving User displays setup removes menu.
-Fix: [ bug #1544 ] Can remove date from invoice.
-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 uplaoded files failed.
-Fix: [ bug #1476 ] Invoice creation form loses invoice date when there is a validation error.
-Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top margin.
-Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order.
-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 dictionnay for non activated module 
-Fix: Link element from element project pages
-Fix: [ bug #1509 ] Expedition admin free text & watermark submit error
-Fix: [ bug #1349 ] AJAX contact selector does not work fine in Project card
-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: 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.
-Fix: Write note in invoice when using pos module.
-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 
-     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
-Fix: Be sure there is no duplicate default rib.
-Fix: Enable extrafields for customer order, proposal and invoice lines. This feature
-     was developed for 3.5 but was disabled (hidden) because of a bug not possible to
-     fix enough quickly for 3.5.0 release. 
-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: [ 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: [ 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.
-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:
- New: Add hidden option BANK_DISABLE_DIRECT_INPUT.
- New: More options to select status of users into select user list.
- New: [ task #862 ] Add ODT on shipments.
- New: [ task #149 ] Add # of notes and attachments in tabs.
- New: Can edit customer ref at any time.
- New: [ task #877 ] Reorganize menus.
- New: [ task #858 ] Holiday module: note on manual holiday assignation.
- New: [ task #892 ] Add hidden option in thirdparty customer/supplier module to hide non active
-  companies in select_company method.
- New: [ task #531 ] Add a workload field on tasks.
- New: Add graph of bank account input/output into input-output report page.
- New: Add script export-bank-receipts.php
- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that
-  has one payment on a specific bank account.*
- New: [ task #901 ] Add Extrafield on Fiche Inter.
- New: Show process id in all command line scripts.
- New: Module mailman can subscribe/unsubscribe to ML according to categories or type of member.
- New: Add object_hour and object_date_rfc as substitution tag for open document generation.
- New: Add options to send an email when paypal or paybox payment is done.
- New: Clone product/service composition.
- New: Add option ADHERENT_LOGIN_NOT_REQUIRED.
- New: Add a cron module to define scheduled jobs.
- New: Add new graphical boxes (customer and supplier invoices and orders per month).
- New: [ task #286 ] Enhance rounding function of prices to allow round of sum instead of sum of rounding.
- New: Can add an event automatically when a project is create. 
- New: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE.
- New: Add option excludethirdparties and onlythirdparties into merge pdf scripts.
- New: [ task #925 ] Add ODT document generation for Tasks in project module.
- New: [ task #924 ] Add numbering rule on task.
- New: [ task #165 ] Add import/export of multiprices.
- New: Add Maghreb regions and departments.
- New: A more responsive design for statistic box of home page.
- New: [ task #1005 ] Adapting to Spanish legislation bill numbering
- New: [ task #1011 ] Now supplier order and invoice deal with payment terms and mode.
- New: [ task #1014 ] Add option to recursively add parent category.
- New: [ task #1016 ] Can define a specific numbering for deposits.
- New: [ task #918 ] Stock replenishment.
- New : Add pdf link into supplier invoice list and supplier order list.
- New : Genrate auto the PDF for supplier invoice.
- New : Add category into filter webservice thirdparty method getListOfThirdParties.
- New : Allow to define margin or mark rate during quoting, ordering, invoicing.
- New : User permissions on margin module.
- New : Add ref supplier into muscadet model/
- New : Add ability to copy contact address to clipboard.
- New: Can use tag {mm} before {yy} even when there is a reset into numbering masks.
- New: [ task #1060 ] Register fields localtax(1|2)_type into details tables.
- New: [ task #923 ] Localtax support for ODT templates. 
- New: [ task #90 ] Barcode search.
- New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS.
- New: Can send an email from thirdparty card.
- New: Can cancel holidays that were previously validated.
- New: Can choose contact on event (action com) creation, and filtered by thirdparty.
- New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID.
- New: Add page to make mass stock movement.
- New: Add field oustanding limit into thirdparty properties.
- New: Can enter a vat payment of zero.
- New: Add path to installed dir of external modules + Name and web of module provider.
- New: Add option to use a specific mask for uploaded filename.
- New: Can attach external links to objects as we can attach files.
- Qual: Implement same rule for return value of all command line scripts (0 when success, <>0 if error).
- Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count.
- Fix: [ bug #1022 ] correct margin calculation for credit notes.
- Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
- Fix: Lost stats filters into year selection.
- Fix: Some config data are shared between suppliers orders and suppliers invoices
-
-New experimental module:
- New: [ task #157 ] Add a Skype button (adherents / third parties / contacts)
-
-For translators:
- Qual: Normalized sort order of all languages files with English reference files.
- New: Add language code files for South Africa, France new Caledonia, Vietnam.
- New: Translate string for email to change password.
-
-For developers:
- New: DolGraph can build graph with three lines.
- New: DolGraph accept a parameter to cache data of graph getNbByMonthWithPrevYear.
- New: Can enable tuning info with option MAIN_SHOW_TUNING_INFO.
- New: Show version of client lib used by mysql drivers.
- New: Add function to get content of an url (using all dolibarr setup like timeout, proxies...)
- New: Upgrade lib of TCPDF to 6.0
- New: Upgrade jquery flot library to 0.8.1
- New: Add property "hidden" into module descriptors to allow to hide a module according to
-  some dynamic conditions.
- New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. Also content for
-  MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME now accept "|langfile" into translation
-  key to use a specific language file.
- New: Make some changes to allow usage of several alternative $dolibarr_main_url_root variables.
- Qual: All nowrap properties are now using CSS class nowrap.
- Qual: Move hard coded code of module mailmanspip into trigger.
- New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with a value that is list name,
-  separated by a coma, of other POST parameters, Dolibarr will automatically save this parameters
-  into user cookies.
- New: Add hook addHomeSetup.
- New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK.
- New: A trigger can return an array of error strings instead of one error string.
- New: Add method to use a dictionary as a combo box.
- New: Add update method for web service product.
- Fix also several bugs with old code. 
-
-WARNING: Following change may create regression for some external modules, but was necessary to make
-Dolibarr better:
-
-1) We started to clean hooks code. 
-If your hook want to modify value of $actions, it's role of your hook to modify it. Dolibarr 
-hook code will no more decide this for your module. If your action class for hook was returning
-a string or an array, instead your module must set $actionclassinstance->results (to return array) 
-or $actionclassinstance->resprints (to return string) to return same thing. The return value must 
-be replaced by a "return 0";
-Goal is to fix old compatibility code that does not match hook specifications: 
- http://wiki.dolibarr.org/index.php/Hooks_system   
-
-2) If you implemented hook printTopRightMenu, check that output does not include '<td>' tags any more.
-All content added must be tagged by a '<div>' with css class="login_block_elem"
-
-3) Some methods object->addline used a first parameter that was object->id, some not. Of course
-this was not a good practice, since object->id is already known, there is no need to provide id as 
-parameter. All methods addline in this case were modified to remove this parameter. 
-
-4) Method ->classer_facturee() is deprecated. It must be replace with ->classifyBilled().
-
-5) Property ->tel on objects is now ->phone
-
-6) Trigger LINEPROPAL_MODIFY is renamed into LINEPROPAL_UPDATE and
-   Trigger CONTRACT_LINE_DELETE rnamed into LINECONTRACT_DELETE to match naming rules.
-
-
-
-***** 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).
-Fix: Document cerfa doesn't contained firstname & lastname from donator.
-Fix: Bad rounding on margin calculations and display.
-Fix: Option drop table into backup was broken.
-Fix: [ bug #1105 ] Searching Boxes other search option.
-Fix: wrong buy price update.
-Fix: [ bug #1142 ] Set paiement on invoice (PGSql).
-Fix: [ bug #1145 ] Agenda button list type do not display.
-Fix: [ bug #1148 ] Product consomation : supplier order bad status.
-Fix: [ bug #1159 ] Commercial search "other" give p.note do not exists.
-Fix: [ bug #1174 ] Product translated description not good into PDF.
-Fix: [ bug #1163 ] SQL Error when searching for supplier orders.
-Fix: [ bug #1162 ] Translaction for morning and afternoon.
-Fix: [ bug #1161 ] Search on product label.
-Fix: [ bug #1075 ] POS module doesn't decrement stock of products in delayed payment mode.
-Fix: [ bug #1171 ] Documents lost in interventions after validating.
-Fix: fix unsubscribe URL into mailing when sending manually (not by script).
-Fix: [ bug #1182 ] ODT company_country tag is htmlencoded.
-Fix: [ bug #1196 ] Product barcode search does not expect 13th digit on EAN13 type.
-Fix: [ bug #1202 ] Wrong amount in deposit % invoice from proposal.
-Fix: Removed analytics tags into doc page.
-Fix: Call Image on this instead of pdf.
-Fix: Missing parameter for photo.
-Fix: Bad SQL request for turnover report.
-
-***** ChangeLog for 3.4.1 compared to 3.4.0 *****
-Fix: Display buying price on line edit when no supplier price is defined.
-Fix: Retrieving of margin info when invoice created automatically from order.
-Fix: Reordering supplier products in list by supplier or supplier ref was crashing.
-Fix: [ bug #1029 ] Tulip numbering mask.
-Fix: Supplier invoice and supplier order are not displayed into object link into agenda event card.
-Fix: [ bug #1033 ] SUPPLIER REF disappeared.
-Fix: update extrafield do not display immediatly after update.
-Fix: Fix bug with canvas thirdparty.
-Fix: [ bug #1037 ] Consumption> Supplier invoices related.
-Fix: User group name do not display in card (view or edit mode).
-Fix: Link "Show all supplier invoice" on suplier card not working. 
-Fix: [ bug #1039 ] Pre-defined invoices conversion.
-Fix: If only service module is activated, it's impossible to delete service.
-Fix: [ bug #1043 ] Bad interventions ref numbering.
-Fix: Mailing module : if an email is already in destinaires list all other email from selector was not inserted.
-Fix: Localtaxes balance not showing.
-Fix: Intervention box links to contracts id.
-Fix: Compatiblity with multicompany module.
-Fix: Edit propal line was losing product supplier price id.
-Fix: Delete linked element to supplier invoice when deleted.
-Fix: [ bug #1061 ] Bad info shipped products.
-Fix: [ bug #1062 ] Documents lost in propals and contracts validating.
-Fix: Supplier price displayed on document lines and margin infos didnt take discount.
-Fix: sorting on qty did not work in supplier product list.
-Fix: there was no escaping on filter fields in supplier product list.
-Fix: bugs on margin reports and better margin calculation on credit notes.
-Qual: Add travis-ci integration.
-
-***** ChangeLog for 3.4 compared to 3.3.* *****
-For users:
- New: Can use ODS templates as document templates.
- New: Add link to autofill/reset with quantity to ship when creating a
-  delivery receipt.
- New: Event into calendar use different colors for different users.
- New: Support revenue stamp onto invoices.
- New: Add a tab "consumption" on thirdparties to list products bought/sells.
- New: Some performance enhancements.
- New: Can attach files onto trip and expenses modules.
- New: Add hidden option MAIN_PDF_TITLE_BACKGROUND_COLOR.
- New: Merge tab customer and prospect.
- New: Add ES formated address country rule.
- New: Can define a hierarchical responsible on user and add a tree view to 
-  see hierarchy of users.
- New: Can expand/collapse menus, categories and users list.
- New: extra parameters are supported into ODT/ODS templates.
- New: total per vat rate are available as tags for ODT/ODS templates.
- New: Some part of interface use more CSS3 (ie: agenda)
- New: [ task #707 ] Create option "ProfIdx is mandatory to validate a invoice".
- New: Can define if we want to use VAT or not for subscriptions (foundation module).
- New: Can define a default choice for "More action when recording a
-  subscription" (foundation module).
- New: Add link to check professional id for India.
- New: [ task #731 ] Uniformize ref generation
- New: [ task #748 ] Add a link "Dolibarr" into left menu
- New: Script email_unpaid_invoices_to_representative accepts now a parameter "test"
-  and a "late delay".
- New: Can define different clicktodial setups for each user.
- New: Add hidden option INVOICE_CAN_NEVER_BE_REMOVED.
- New: Enhance agenda module to reach RFC2445 ("type" not enabled by default and add
-  "busy" information).
- New: Add module Opensurvey.
- New: Default approver for holidays is set by default to hierchical parent.
- First change to prepare feature "click to print" (IPP) for PDF.
- New: [ task #350 ] Merge tab customer and prospect.
- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid).
- New: [ task #711 ] Add combobox for contact, as done for product/thirdparty.
- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECEIPT.
- New: [ task #743 ] GED : Add aministration option to disable autotree display.
- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address.
- New: [ task #768 ] WYSIWYG for all mails.
- New: [ task #773 ] Add Project document in GED(ECM) modules.
- New: [ task #783 ] Add more types for extra parameters (lists, phone, emails, checkbox,
-  prices, radio).
- New: [ task #798 ] Add range limit date on product/services as it is done on order 
-  and invoice.
- New: [ task #814 ] Add extrafield feature for projects ands tasks.
- New: [ task #770 ] Add ODT document generation for Projects module.
- New: [ task #741 ] Add intervention box.
- New: [ task #826 ] Optionnal increase stock when deleting an invoice already validated.
- New: [ task #823 ] Shipping_validate email notification.
- New: [ task #900 ] Review code of ficheinter.class.php
- Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
- Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
- Fix: Expedition creation, can retreive product from other expedition
-
-For translators:
- Update language files.
-
-For developers:
- System of menu managers has been rewritten to reduce code to do same things. 
- An external module can force its theme.
- Add function dol_set_focus('#xxx').
- A mymodule can bring its own core/modules/mymodule/modules_mymodule.php file.
- Removed not used libraries.
- More web services. 
- Renamed some database fields, code variables and parameters from french to english.
- First change to manage margins on contracts.
- Add hook getFormMail.
- Function plimit of databases drivers accept -1 as value (it means default value set
-  into conf->liste_limit).
- New: Add option dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen,
-  dol_no_mouse_hover and dol_use_jmobile onto login page (to support different terminal).
- New: dol_syslog method accept a suffix to use different log files for log. 
- New: Type of fields are received by export format handlers.
- New: when adding an action, we can define a free code to tag it for a specific need.
- New: Enhance Dolibarr migration process to include migration script of external 
-  modules.
- New: [ task #811 ] Uniformanize note field.
-  
-
-WARNING: If you used external modules, some of them may need to be upgraded due to:
- Fields of classes were renamed to be normalized (nom, prenom, cp, ville, adresse, tel
-  were renamed into lastname, firstname, zip, town, address, phone).
-  This may also be true for some fields into web services.
- If module use hook pdf_writelinedesc, module may have to add return 1 at end of 
-  function to keep same behaviour.
-
-TODO:
-backport commit 53672dff75f4fdaeeed037ff9d15f860968022ca to fix confirm with jmobile
-backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contract
- 
-
-
-***** ChangeLog for 3.3.5 compared to 3.3.4 *****
- Fix: Change to make debian package ok despite removal of ckeditor.
- Fix: jcrop file to match debian rules
- Fix: Add missing country UK.
- Fix: Minor fix into package.
- Fix: Add missing label on project field.
-
-***** ChangeLog for 3.3.4 compared to 3.3.3 *****
- Fix: [ bug #1001 ] Social Contribution : State not correct
- Fix: Better management of pdf generation when tcpdf is not available.
- Fix: Change to be more debian compliant natively.
-
-***** ChangeLog for 3.3.3 compared to 3.3.2 *****
- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql)
- Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
-
-***** ChangeLog for 3.3.2 compared to 3.3.1 *****
- Fix: Dutch (nl_NL) translation
- Generalize fix: file with a specific mask not found, again
- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger
- Fix: Can't reset payment due date
- Fix: Orderstoinvoice didn't act as expected when no order was checked
- Fix: Bad link to all proposals into Third party card if customer is prospect
- Fix: Some bugs on withdrawal rejects
- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed
- Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment
- Fix: [ bug #789 ] VAT not being calculated in POS
- Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
- Fix: [ bug #794 ] Lost filter on zipcode in prospect list 
- Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price
- Fix: [ bug #810 ] Cannot update ODT template path
- Fix: [ bug #816 ] Sales journal does not reflect localtaxes
- Fix: [ bug #817 ] Purchases journal does not reflect localtaxes
- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
- Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
- Fix: [ bug #855 ] Holiday approval email in French
- Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
- Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
- Fix: [ bug #861 ] Impossible to create a new event in agenda
- Fix: [ bug #827 ] AJAX search does not respect multiprice level
- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work
- Fix: [ bug #866 ] Standing order from an invoice suggests invoice total amount instead of remaining to pay
- Fix: [ bug #788 ] Date of linked interventions are not shown
- Fix: external users should not see costprice and margin infos
- Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order
-
-***** ChangeLog for 3.3.1 compared to 3.3 *****
- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
- Fix: Package for launchpad
- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
- Fix: Localtax2 for Spain must be based into buyer
- Fix: [ bug #762 ] Bad profit calculation in Reporting
- Fix: bug dictionnary with wrong prefix table
-
-***** ChangeLog for 3.3 compared to 3.2.* *****
-For users:
- New: Add holiday module, to declare and follow holidays of your employees.
- New: Add margin management module.
- New: Add new theme Amarok.
- New: [ task #289 ] Can reorder tasks.
- New: Add field "signature" into user card. If filled, text is added 
-       at end of predefined email texts. If option MAIN_MAIL_DO_NOT_USE_SIGN is on, this
-       feature is disabled.
- New: Can input a payment back onto an credit note.
- New: Add link "Back to list" on all cards.
- New: After first install, warning are visible onto mandatory setup not
-       configured. Show also total number of activated modules.
- New: Can filter list of proposal, order or invoice on sales representative.
- New: Add supplier ref on supplier orders.
- New: Can export supplier orders and customers shipments.
- New: First change to install external plugins from gui (experimental). 
- New: Monaco is like France for default vat calculation
- New: Can list elements (invoices, orders or proposals) on a particular
-  user contact). This allow to view a "basket" of its elements.
- New: Show bank account on payment list of invoice card.
- New: Cloning project allow to clones task, notes, projects files, tasks files, contacts. 
- New: Enhance default style.
- New: Can edit and resiliate member status from list.
- New: Can insert URL links into elements lines. Also reported into PDF.
- New: When a member is validated, we can subscribe to mailing-lists
-       according to its type.
- New: Add a tab into members statistics to count members by nature.
- New: Add link to third party into sells and purchase journal.
- New: Suggest a method to generate a backup file for user with no access
-       to mysqldump binary.
- New: Can also use extrafields on contacts/addresses and users.
- New: Support unique field for extrafields.
- New: Extra fields supports more types (int, string, double, date, datetime).
- New: Can correct stock of a warehouse from warehouse card.
- New: [ task #185 ] Can input amount when correcting stock to recalculate PMP.
- New: [ task #454 ] Add "No category" into filters on category.
- New: Auto check box on page to edit interface options of user.
- New: More surface control on stock correction page.
- New: Add great britain provinces.
- New: [ task #494 ] Send an email to foundation when a new member has auto-subscribed.
- New: [ task #326 ] Add a numbering module to suggest automatically a product ref.
- New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates.
- New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
- New: Can select thirdparties into emailing targets, even if module category is not enabled.
- New: [ task #498 ] Improvement of the block to add products/services lines.
- New: ECM autodir works also for files joined to products and services.
- New: Add a selection module for emailing to enter a recipient from gui.
- New: Allow to search thirds and products from barcodes directly from the permanent mini search left box.
- New: Allow to search product from barcodes directly from invoices, proposals... through AJAX.
- New: Can make one invoice for several orders.
- New: POS module can works with only one payment method (cach, chq, credit card).
- New: Add possibility to defined position/job of a user.
- New: Add hidden option to add slashes between lines into PDF.
- New: [ task #210 ] Can choose cash account during POS login.
- New: [ task #104 ] Can create an invoice from several orders.
- New: Update libs/tools/logo for DoliWamp (now use PHP 5.3).
- New: Added ODT Template tag {object_total_discount_ht}
- New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices
- New: English bank account need a bank code (called sort code) to identify an account. 
- New: Can choose menu entry to show with external site module.
- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of generated PDF.
- New: [ task #314 ] Can define if prof id are mandatory or not.
- New: Add button on order card to create intervention from services.
- New: Add search box to find products by supplier reference.
- New: Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. 
- New: [ task #608 ] Can clone a supplier order with prices updates
- New: [ task #559 ] Can define a discount % regarding quantity in supplier prices and price by quantity in customer prices
- New: [ task #527 ] After cloning a suplier invoice, go onto invoice ref into edit mode
-
-New experimental module:
- New: Add commissions management module.
-
- Fix: [ bug #499 ] Supplier order input method not translated
- Fix: No images into product description lines as PDF generation does not work with this.
- Fix: Errors weren't being shown in customer's & supplier's orders
- Fix: Lastname wasn't being recorded in xinputuser emailing module.
- Fix: [ bug #653 ] Error while creating agenda additional attributes
- Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
- Fix: [ bug #658 ] Search on bank do not work for description
- Fix: [ bug #659 ] Comment in recurrent invoices is not stored
- Fix: [ bug #622 ] Attaching wrong file when sending the invoice via e-mail
-
-For developers:
- New: Add webservice for thirdparty creation and list.
- New: A module can overwrite templates parts.
- New: Can add a link on title field of added dictionnary.
- New: Uniformize code.
- New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and 
-       WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER.
- New: A module can add several css and js.
- New: removed deprecated methods
-       ldap::connect, formadmin::select_lang,
-       html::select_tva
- New: Add custom substitution function for ODT product lines: mymodule_completesubstitutionarray_lines()
- New: Basic implementation of hooks and triggers for a lot (most) of core modules: 
-  action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines, 
-  expedition, order supplier and order invoice (lines included), intervention card, project, tasks.
- New: Add ChromePHP output into syslog module.
- New: Add PRODUCT_PRICE_MODIFY trigger.
- New: Created function to retrieve total amount of discount of an invoice/proposal...
- New: We can use a dynamic value ($conf->global->XXX for example) into titles of menus.
- New: Use PHP classes DateTime* for some data functions instead of adodb 
- Qual: Renamed SUPPLIER_INVOICE_BUILDDOC trigger to BILL_SUPPLIER_BUILDDOC
- Qual: Renamed INVOICE_SUPPLIER_DELETE trigger to BILL_SUPPLIER_DELETE
- Qual: Renamed SUPLIER_ORDER_BUILDDOC trigger to ORDER_SUPPLIER_BUILDDOC
- Qual: Renamed CONTRACTLINE_DELETE trigger to CONTRACT_LINE_DELETE
- Qual: Renamed all ficheinter.class.php triggers so that they start with 'FICHINTER_'
- Fix: [ bug #655 ] ORDER_REOPEN trigger incorrectly named
- Fix: [ bug #656 ] Contracts trigger CONTRACT_MODIFY incorrectly named
- Fix: [ bug #657 ] Usergroup class' GROUP_DELETE trigger incorrectly named
-
-For translators:
- New: Update language files (de, tr, pt, ca, es, en, fr).
- New: Added bg_BG autotranslated language.
- New: Translate the donation receipt.
-
-Dolibarr license has also been updated from GPLv2+ to GPLv3+.
-
-

 ***** ChangeLog for 3.2.3 compared to 3.2.2 *****
+
 - Fix: Some permission into agenda module.
 - Fix: Generation of PDF was not using correct font for some languages.
 - Fix some translations.
@@ -722,6 +22,7 @@ Dolibarr license has also been updated from GPLv2+ to GPLv3+.


 ***** ChangeLog for 3.2.2 compared to 3.2.1 *****
+
 - Fix: Modify spanish VAT to new rates.
 - Fix: Add error message when creating already existing product.
 - Fix: Edition of percentage of an event.
@@ -733,6 +34,7 @@ Dolibarr license has also been updated from GPLv2+ to GPLv3+.


 ***** ChangeLog for 3.2.1 compared to 3.2.0 *****
+
 - Fix: Edit of projects.
 - Fix: Activation of modules does not fails if directory install was removed.
 - Fix: [ bug #444 ] Regression on auto-closing for proposals and orders.
@@ -760,7 +62,8 @@ Dolibarr license has also been updated from GPLv2+ to GPLv3+.



-***** ChangeLog for 3.2.0 compared to 3.1.* *****
+***** ChangeLog for 3.2.0 compared to 3.1.3 *****
+
 WARNING: PHP lower than 5.x are no more supported.
 WARNING: Because of a major datastructure change onto supplier prices tables, be aware
 to make a backup of your database before making upgrade.
@@ -768,7 +71,7 @@ to make a backup of your database before making upgrade.
 For users:
 - New: Each user can remove/add its own boxes.
 - New: Add signature at end of predefined email text.
- New: Can use personalized fields on products/services.
+- New: Can use personalized fields of products/services.
 - New: Can attach files on social contributions.
 - New: Show payments terms and conditions onto muscadet template.
 - New: Can open back a closed commercial proposal.
@@ -786,7 +89,7 @@ For users:
 - New: task #10606 : more comprehensive message error.
 - New: task #11278 : Option into point of sale module to add services in list.
 - New: task #11261 : Add an entry into menu called "New shipment".
- New: [ task #187 ] Gerer les evenement recurrents dans les imports ical.
+- New: [ task #187 ] Gerer les evenement recurrents dans les imports ical
 - New: Make option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT available by default.
 - New: Can build PDF in USLetter format or canada format (change paper size).
 - New: Can export into Excel 2007 format.
@@ -801,7 +104,7 @@ For users:
 - New: Reduce seriously size of packages.
 - New: Can define country code for import.
 - New: When invoice was generated from order, order date is visible on PDF, after order ref.
- New: [ task #181 ] Hide password of click2dial in user card.
+- New: [ task #181 ] Hide password of click2dial in user card
 - New: Chart are faster to build
 - New: Value of data into charts are visible on mouse hover.
 - New: Import wizard can import contacts.
@@ -858,6 +161,7 @@ WARNING: To reduce technic debt, all functions dolibarr_xxx were renamed int dol


 ***** ChangeLog for 3.1.3 compared to 3.1.2 *****
+
 Fix: PgSQL - property must be set if success
 Fix: Provide a solution for backup when mysqldump is not available
 Fix: Bug #460 - Wrong entity assignment when creating a warehouse
@@ -866,6 +170,7 @@ Fix: bug #405 - Late icon always displayed on comm/propal.php


 ***** ChangeLog for 3.1.2 compared to 3.1.1 *****
+
 - Fix: Can clone a proposal
 - Fix: Add member ID in substitution method
 - Fix: Duplicate end tag and missing form parts
@@ -878,6 +183,7 @@ Fix: bug #405 - Late icon always displayed on comm/propal.php


 ***** ChangeLog for 3.1.1 compared to 3.1.0 *****
+
 - New: Add option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS. With this option added, 
       credit notes are not removed from total amount of invoice but are just 
       payments used to reducs remain to pay.
@@ -896,6 +202,7 @@ Fix: bug #405 - Late icon always displayed on comm/propal.php


 ***** ChangeLog for 3.1 compared to 3.0 *****
+
 WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
@@ -998,7 +305,8 @@ For translators:



-***** ChangeLog for 3.0 compared to 2.9.* *****
+***** ChangeLog for 3.0 compared to 2.9 *****
+
 For users:
 - New: Can edit date of cheque receipts.
 - New: Add Sales journal and Purchase journal report.
@@ -1093,7 +401,8 @@ For developers:
 - Qual: Removed deprecated code.


-***** ChangeLog for 2.9 compared to 2.8.* *****
+***** ChangeLog for 2.9 compared to 2.8 *****
+
 For users:
 - New: POS module allow to choose which warehouse to use.
 - New: Support "Department/State" field on company setup, contact, 
@@ -1210,7 +519,8 @@ For users:
 - Fix: bug #29526 : Numérotation Proposition Incorrecte après duplication


-***** ChangeLog for 2.8 compared to 2.7.* *****
+***** ChangeLog for 2.8 compared to 2.7 *****
+
 For users:
 - New: Support note on trips module
 - New: Can link contacts to projects
@@ -1261,6 +571,7 @@ For developers:


 ***** ChangeLog for 2.7.1 compared to 2.7 *****
+
 For users:
 - Fix: Bad decimal management for it_IT and fr_BE languages.
 - Fix: A third party created from a member is created as a 
@@ -1272,7 +583,8 @@ For users:
 - Fix: Update member photo.


-***** ChangeLog for 2.7 compared to 2.6.* *****
+***** ChangeLog for 2.7 compared to 2.6 *****
+
 For users:
 - New: Add a print icon to show a page to print without menus.
 - New: Can add a free text on bank cheque receipts.
@@ -1370,7 +682,8 @@ For developers:
 - All install files are now in same directory /install.


-***** ChangeLog for 2.6 compared to 2.5.* *****
+***** ChangeLog for 2.6 compared to 2.5 *****
+
 For users:
 - New: Add filter on status in emailing selector for Dolibarr users.
 - New: Can add bookmarks on all pages.
@@ -1452,7 +765,8 @@ For developers:
 - First change for future geoip module.


-***** ChangeLog for 2.5 compared to 2.4.* *****
+***** ChangeLog for 2.5 compared to 2.4 *****
+
 For users:
 - Sessions timeout can be configured to overwrite PHP setup.
 - Can filter on date in services list.
@@ -1515,7 +829,8 @@ For developers:

   

-***** ChangeLog for 2.4 compared to 2.2.* *****
+***** ChangeLog for 2.4 compared to 2.2 *****
+
 For users:
 - Add a calendar module (module agenda) with ical/vcal/rss export.
 - Look enhancement in graphics (thanks artichow).
@@ -1569,7 +884,8 @@ For developers:
  Windows with Apache and Mysql included.


-***** ChangeLog for 2.2 compared to 2.1.* *****
+***** ChangeLog for 2.2 compared to 2.1 *****
+
 - Add more statistics on main page.
 - Add option to add message on login page.
 - Management of categories for third parties.
@@ -1602,7 +918,8 @@ For developers:
 - Can drag and drop boxes on main page.


-***** ChangeLog for 2.1 compared to 2.0.* *****
+***** ChangeLog for 2.1 compared to 2.0.1 *****
+
 - Added a better installer.
 - Support user and groups permissions.
 - Translation in english and support for several languages.
@@ -1667,10 +984,12 @@ For developers:


 ***** ChangeLog for 2.0.1 compared to 2.0 *****
+
 Minor bug fixes



-***** ChangeLog for 2.0 compared to 1.0.* *****
+***** ChangeLog for 2.0 compared to 1.0 *****
+
 ChangeLog file size is so important, that it is not included inside Dolibarr
 package. You can find it at www.dolibarr.org
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 INSTALL
 -------

-English:     See README file.
+English:     See file README.

 French:      Voir fichier README-FR.
--- a/7
+++ b/7
@@ -92,7 +92,7 @@ Main modules/features:
 - Payments management
 - Standing orders management
 - Shipping management
- EDM (Electronic Document Management)
+- ECM (Electronic Content Management)
 - EMailings
 - Agenda with ical,vcal export for third tools integration
 - Management of foundation members
@@ -107,8 +107,8 @@ Other modules:
 - ClickToDial phone numbers
 - RSS

-Miscellaneous:
- Multi-user, with several permissions levels for each feature.
+Miscellanous:
+- Mutli-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).
@@ -132,6 +132,7 @@ 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).
+- Does not support double VAT (Federal / provincial) for Canada.
 - Dolibarr does not contains Payroll module.
 - Tasks on module project can't have dependencies between each other.
 - Dolibarr does not include any Webmail.
--- a/30
+++ b/30
@@ -78,34 +78,35 @@ 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é
+- Annuaires des prospects et/ou client et/ou fournisseurs
+- Annuaires des contacts
+- Gestion des actions/taches avec un agenda intégré (ou lien avec webcalendar)
 - Gestion des commandes
- Gestion des devis, propositions commerciales
- Gestion des factures clients et fournisseurs
+- Gestion des propositions commerciales
 - Gestion de contrats de services
+- Gestion des factures clients et fournisseurs
 - 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)
+- Gestion des adhérents d'association
+- Gestion des dons
+- Gestion de marque-pages
+- Agenda
+- Point de vente/Caisse enregistreuse
+- Fonctions d'EMailing de masses vers les clients, prospect ou utilisateurs Dolibarr
 - Rapports
- Imports/Exports des données
+- Fonctions d'exports
 - 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:
+Miscellanous:
 - 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.
@@ -121,8 +122,9 @@ 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 gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
+- Ne gère pas la double tva (Fédérale / provinciale) du canada.
 - 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.
+- Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
--- a/README.md
+++ b/README.md
@@ -2,18 +2,10 @@

 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)
-
-
-## LICENSE
-
-Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
-
-

 ## 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, Opensuse, Mandriva or Mageia).
+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, Opensue, Mandriva or Mageia).

 You can download this at: [Official website] (http://www.dolibarr.org/downloads/)

@@ -76,63 +68,59 @@ See ChangeLog file found into package.

 ### Main modules/features:

- Customers, Prospects or Suppliers directory.
- Products and services catalog.
- Bank accounts management.
- Orders management.
- Commercial proposals management.
- Contracts management.
- Invoices management.
- Payments management.
- Standing orders management.
- Stock management.
- Shipping management.
- PDF or ODT generation for invoice, proposals, orders...
- Agenda with ical,vcal export for third tools integration.
- EDM (Electronic Document Management).
- Foundations members management.
- Employee's holidays management.
- Mass Emailing.
- Realize surveys.
- Point of Sale.
+- 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
+- ECM (Electronic Content Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management

 ### Other modules:

- Bookmarks management.
- Donations management.
- Reporting.
- Data export/import.
- Third parties or products categories. 
- LDAP connectivity.
- ClickToDial integration.
- RSS integration.
- Can be extended with a lot of other external modules available onto DoliStore.com.
+- 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:
+### Miscellanous:

- Multi-user, with several permissions levels for each feature.
+- Mutli-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.
- 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.
- Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
- An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
- Support countries specific features:
-   Spanish Tax RE and ISPF.
-   French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM).
-   Canadian double taxes (federal/province) and other countries using cumulative VAT.
-   Tunisian tax stamp.  
-   Compatible with European directives (2006/112/CE ... 2010/45/UE) (http://europa.eu/legislation_summaries/taxation/l31057_en.htm)
-   ...
+- 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").
+


 ## WHAT DOLIBARR CAN'T DO YET (TODO LIST)

 This is features that Dolibarr does not support completely yet:

- No double party accountancy (only bank and treasury management).
+- No accountancy (only bank management).
 - Dolibarr manage one currency at once (mono-currency).
- Dolibarr manage one master activity (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
- Tasks on module project can't have dependencies between each other.
+- Dolibarr 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).
+- Does not support double VAT (Federal / provincial) for Canada.
 - 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).
+- Dolibarr can't do coffee (not yet).
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@

 <!-- Exclude/ignore paths -->
 <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
- <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
+ <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
 
 <target name="clean">
  <!-- Clean up -->
@@ -21,7 +21,7 @@
  <parallel>
   <!-- <antcall target="phpmd"/> -->
   <antcall target="phpcpd"/>
-   <!-- <antcall target="phpcs"/> -->
+   <antcall target="phpcs"/>
   <antcall target="doxygen"/>
   <antcall target="phploc"/>
  </parallel>
@@ -46,7 +46,7 @@
   				--exclude '${basedir}/htdocs/conf'
   				--exclude '${basedir}/htdocs/core/filemanagerdol'
   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
   				--min-tokens 70
   				--min-lines 20 
   				htdocs
@@ -61,7 +61,7 @@
   				--exclude '${basedir}/htdocs/conf'
   				--exclude '${basedir}/htdocs/core/filemanagerdol'
   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
   				htdocs
   				" />
  </exec>
@@ -69,27 +69,14 @@
   
 <!-- Generate checkstyle.xml -->
 <target name="phpcs">
-  <exec executable="phpcs" dir="${basedir}">
+  <exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
    			--report=checkstyle
-    			--report-file=${basedir}/hudson/logs/checkstyle.xml
                --ignore=${ignorepaths},${ignoreregexp}
                htdocs
                "/>
  </exec>
 </target>
- 
- <!-- Run unit tests and generate junit.xml and clover.xml -->
- <target name="phpunit">
-  <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
-				--log-junit ${basedir}/hudson/logs/junit.xml
-				--coverage-clover ${basedir}/hudson/coverage/clover.xml
-  				--coverage-html ${basedir}/hudson/coverage/
-  				test/phpunit/AllTests.php
-  				"/>
-  </exec>
- </target>

 <!-- Generate Doxygen documentation -->
 <target name="doxygen" description="Dolibarr documentation" >
@@ -97,6 +84,18 @@
   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
  </exec>
 </target>
+ 
+ <!-- Run unit tests and generate junit.xml and clover.xml -->
+ <target name="phpunit">
+  <exec executable="phpunit" dir="${basedir}" failonerror="true">
+   <arg line="	--configuration ${basedir}/test/phpunit/jenkins_phpunittest.xml
+				--log-junit ${basedir}/hudson/logs/junit.xml
+				--coverage-clover ${basedir}/hudson/coverage/clover.xml
+  				--coverage-html ${basedir}/hudson/coverage/
+  				test/phpunit/AllTests.php
+  				"/>
+  </exec>
+ </target>

- <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
+ <target name="hudson" depends="clean,phpunit,parallelTasks"/>
 </project>
--- a/build/README
+++ b/build/README
@@ -7,27 +7,10 @@ All sub-directories of "build" directory contains files required to build
 automatically Dolibarr packages.
 There are several tools:

-
-
 - To build full Dolibarr packages, launch the script
+> Edit version in makepack-dolibarr.pl file.
 > Launch command perl makepack-dolibarr.pl

-Note: Prerequisites to build tgz, debian, rpm package
-> apt-get install tar dpkg dpatch p7zip-full rpm zip
-
-Note: Prerequisites to build autoexe DoliWamp package:
-> Install InnoSetup
-   For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
-> Install WampServer into "C:\Program Files\Wamp"
-   For example by running wampserver2.2e-php5.4.3-httpd-2.4.2-mysql5.5.24-x64.exe (http://www.wampserver.com)
-> Install WampServer addon to have versions: Apache2.2.11, Mysql5.0.45, Php5.3.0
-   For example by running WampServer2-APACHE2211.exe (http://www.wampserver.com)
-   For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
-   For example by running WampServer2-PHP530.exe (http://www.wampserver.com)
-> To build from Windows (running from makepack-dolibarr.pl script is however
-  recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
-
 - To build a translaction package, launch the script
 > perl makepack-dolibarrlang.pl

@@ -37,6 +20,17 @@ Note: Prerequisites to build autoexe DoliWamp package:
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl

+- To build an autoexe DoliWamp package:
+> Install InnoSetup (http://www.jrsoftware.org)
+> Install WampServer into "C:\Program Files\Wamp" (http://www.wampserver.com)
+> Install WampServer addon to have versions:
+   Apache2.2.6, Mysql5.0.45, Php5.2.5
+> Modify file build/exe/doliwamp.iss to change variable SourceDir
+  with value of Dolibarr repository.
+> Modify AppVerName and OutputBaseFilename.
+> Launch innosetup, open file build/exe/doliwamp.iss and click on
+  button "Compile". The .exe file will be build into directory build.
+
 - To build developper documentation, launch the script
 > perl dolybarr-doxygen-build.pl

@@ -49,33 +43,24 @@ generated packages will not contains this "build" directory.

 We can find in "build", following sub-directories:

-* aps:
-To build APS package.
-
-* debian:
+* deb:
 To build Debian package.

-* dmg:
-To build Mac OS package (not ready yet).
+* rpm:
+To build Redhat or Mandrake package.

-* doap:
-To build Doap descriptor to promote/describe Dolibarr releases.
-
-* doxygen:
-Dir with config file to build doxygen documentation.
+* tgz:
+To build a tgz package.

 * exe:
 To build exe package for Windows that distribute Dolibarr sources or
 to build the complete DoliWamp package.

-* launchpad:
-Doc file to explain how to use launchpad.
+* tgz:
+To build a zip package.

-* live:
-Doc file to explain how to create a demo live CD.
-
-* obs:
-Doc file to explain how to push release onto OBS.
+* doap:
+To build Doap descriptor to promote/describe Dolibarr releases.

 * pad:
 To build a PAD file descriptor to promote/describe Dolibarr releases.
@@ -83,14 +68,5 @@ To build a PAD file descriptor to promote/describe Dolibarr releases.
 * patch:
 Script file to generate a patch file to distribute a Dolibarr mod.

-* perl:
-Tool to install dolibarr when using virtualmin pro
-
-* rpm:
-To build Redhat, Opensuse or Mandriva package.
-
-* tgz:
-To build a tgz package.
-
-* zip:
-To build a zip package.
+* dmg:
+To build dmg DoliMamp package for Mac OS X
--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
@@ -56,7 +56,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text>
-				<name>GPL-3.0+</name>
+				<name>GPLv2</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
@@ -57,7 +57,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text xml:lang="">
-				<name>GPL-3.0+</name>
+				<name>GPLv2</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/Panel_fichiers/highlight.js
+++ b/Panel_fichiers/highlight.js
@@ -1,64 +1,64 @@
-function last(href)
-{
-  var ret = href.split("/");
-  return ret[ret.length-1];
-}
-
-function StopProcess()
-{
-LeftFrame = parent.TOC.document.location.href;
-LeftFrame = last(LeftFrame);
-if (LeftFrame == "dhtml_search.htm") return 1
-else return 0;
-}
-
-
-
-function highlightTOC(str) {
-    
-	
-		
-		 
-	
-    if (StopProcess()) return;
-    try {
-		
-    str = str || parent.BODY.document.location.href;
-    uri = last(str);
-    list = parent.TOC.document.getElementsByTagName("a");
-    for(i=0; i<list.length; i++)
-    {
-      if (last(list[i].href) == uri)
-	{
-        list[i].style.backgroundColor = "#6697cc";
-        list[i].style.padding = "2px";
-        list[i].style.color = "#ffffff";
-		
-	} else {
-		list[i].style.backgroundColor = "#ffffff";
-        list[i].style.color = "#003380";
-	  }
-    }
-    } catch (e) {}
-}
-
-function FindCorrectTOCPage()
-{
-if (StopProcess()) return;
-//Updated on 30.04.2008
-list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
-    for(i=0; i<list.length; i++)
-    {
-      if (list[i].target == "TOC")
-	{
-
-		if (last(list[i].href) != last(parent.TOC.document.location.href))
-			{
-				parent.TOC.document.location.href = list[i].href;
-				return;
-			}
-	}
-    }
-
-
-}
+function last(href)
+{
+  var ret = href.split("/");
+  return ret[ret.length-1];
+}
+
+function StopProcess()
+{
+LeftFrame = parent.TOC.document.location.href;
+LeftFrame = last(LeftFrame);
+if (LeftFrame == "dhtml_search.htm") return 1
+else return 0;
+}
+
+
+
+function highlightTOC(str) {
+    
+	
+		
+		 
+	
+    if (StopProcess()) return;
+    try {
+		
+    str = str || parent.BODY.document.location.href;
+    uri = last(str);
+    list = parent.TOC.document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (last(list[i].href) == uri)
+	{
+        list[i].style.backgroundColor = "#6697cc";
+        list[i].style.padding = "2px";
+        list[i].style.color = "#ffffff";
+		
+	} else {
+		list[i].style.backgroundColor = "#ffffff";
+        list[i].style.color = "#003380";
+	  }
+    }
+    } catch (e) {}
+}
+
+function FindCorrectTOCPage()
+{
+if (StopProcess()) return;
+//Updated on 30.04.2008
+list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (list[i].target == "TOC")
+	{
+
+		if (last(list[i].href) != last(parent.TOC.document.location.href))
+			{
+				parent.TOC.document.location.href = list[i].href;
+				return;
+			}
+	}
+    }
+
+
+}
--- a/Panel_fichiers/prettify.js
+++ b/Panel_fichiers/prettify.js
@@ -1026,7 +1026,7 @@ window['_pr_isIE6'] = function () {
    fallthroughStylePatterns.push(
        // TODO(mikesamuel): recognize non-latin letters and numerals in idents
        [PR_COMMENT,     /^.*?\*.*/],
-		[PR_VAR, /^\$[a-z]{1}[a-z_]+/i, null],
+		[PR_VAR, /^\$[a-z]{1}[a-z_]+/i, null],
 		[PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
        [PR_TYPE,        /^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/, null],
        [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
@@ -1254,7 +1254,7 @@ window['_pr_isIE6'] = function () {
          [
 		   [PR_PLAIN,       /^[^<?]+/],
           [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
-           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
+           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
           // Unescaped content in an unknown language
           ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
           ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -7,62 +7,23 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).

-
-
-##### Prepare linux env to work
-
 # To build a debian package, you need first
-# With Ubuntu 12.04
-# apt-get install debhelper dpkg-source gpg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
-# With Debian 7
-# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
+# apt-get -i debhelper 
+# apt-get -i dpkg-source 
+# apt-get -i gpg


-# To generate gpg key for email used into changelog
-* Check your existing keys/emails
-> gpg --list-key
-* Generate a new one, if none exists for email you use as author
-> gpg --gen-key							Generate a GPG key (-> pubring.gpg + secring.gpg)
-Files are saved int .gnupg directory
-* Create a file ~/.gpb.conf by
-> cat >~/.gbp.conf <<END
-[DEFAULT]
-pristine-tar = True
-
-[git-buildpackage]
-sign-tags = True
-export-dir = ../build-area/
-
-[git-import-orig]
-filter-pristine-tar = True
-END
-
-
-# To use Alioth.debian.org
-* Create an account login
-* Update your ~/.ssh/config file to add:
-Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
-	User eldy-guest
-	IdentityFile ~/.ssh/id_rsa
-* Check login on page https://alioth.debian.org/users/login
-Ex: https://alioth.debian.org/users/eldy-guest
-* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
-* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
-
-
-
-##### Some interesting command to know
-
-# To translate .po files
+# This is standard command to work on Debian packaging:
+#
+# gpg --gen-key                          Generate a GPG key
+#
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
 # Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
-# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX
- 
-# To check package integrity
+# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX 
+#
 # lintian --pedantic -E -I package.deb   To test a package   
-
-# To manipulate packages
+#
 # dpkg -l                                List all packages
 # dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
@@ -71,27 +32,22 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # dpkg-reconfigure -plow package		 Reconfigure package
 # dpkg -L packagename                    List content of installed package 
 # dpkg -r packagename                    Remove config files and interactive saved answers
-# dpkg -s packagename                    Give status of installed package
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
-#
-# gdebi package.deb						 Install a package + dependencies


-
-##### Global view of submit new package to Debian:
+To submit a package to Debian:

 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
 See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.

 - Wait until you received bug number.
-  For first ITP submission of Dolibarr, bug id was 634783.
+For first ITP submission of Dolibarr, bug id was 634783.

- Check bug is into database by searching with id on 
-  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
-  
+- Check bug is into database by searching with id on http://www.debian.org/Bugs/
+ 
 - Add a line for upstream into file changelog with bug number

 - Call for a mentor on ML debian-mentors to upload packages
@@ -99,155 +55,3 @@ See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests conten
 - Once package is uploaded, following URL are available:
 http://packages.qa.debian.org/package.html
 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
-
-Create a chroot called "unstable-amd64-sbuild"
-> sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
-
-Pour lister les env chroot
-> schroot -l
-
-Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot
-> vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
-> apt-get install links mysql-client
-
-Pour tester un package
-> cp *.deb /srv/chroot/unstable/tmp
-> sudo schroot -c name_of_chroot
-> dpkg -i dolibarr*.deb
-> apt-get install -f
-
-
-
-
-
-##### Create/Maintain TCPDF package
-
-To update tcpdf package:
-
-* You can git clone tcpdf
-> git clone git.debian.org:/git/collab-maint/tcpdf.git [tcpdf-debian]
-or better
-> mkdir gitdebian
-> cd gitdebian
-> gbp-clone git.debian.org:/git/collab-maint/tcpdf.git
-
-* You can then create a PHP project from Eclipse called tcpdf-debian
-from git clone dir and make link to git.
- 
-* If local branch upstream and pristine-tar does not exists, create it
-from origin/upstream and origin/pristine.
-
-* Into root dir, launch:
-> debian/get-orig-source.sh
-
-* Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
-
-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
-
-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
-
-Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
-Note: Package is built into directory ../build-area
-
-* If package .deb is ok:
-Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git-buildpackage --git-tag-only --git-retag
-> git push --all ou git push origin --all
-> git push --tags
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Go into page. You should see new package into unstable.
-http://packages.qa.debian.org/t/tcpdf.html
-
-* Package will be into release when test will be moved as stable.
-
-
-
-##### Update but tracker system
-To set status of a bug to pending
-> bts tag 728235 +pending
-
-
-
-##### Create/Maintain dolibarr package
-
-To update dolibarr debian package
-
-* You can git clone debian git repo
-> git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
-or better
-> cd ~; mkdir git-debian; cd git-debian
-> gbp-clone git.debian.org:/git/collab-maint/dolibarr.git
-
-* You can then create a PHP project from Eclipse called dolibarr-debian
-from git clone dir and make link to git.
-
-* If local branch upstream and pristine-tar does not exists, create it
-from origin/upstream and origin/pristine.
-
-* If new upstream is available onto sourceforge, launch:
-> debian/get-orig-source.sh
-
-* Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-3.3.4.tgz
-
-Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
-
-* Add an entry into debian/changelog
-> dch -v x.y.z-1 "My comment" will add entry.
-For example: dch -v x.y.z-1 "New upstream release." for a new version
-Then modify changelog to replace "unstable" with "UNRELEASED".
-
-Warning: Date must have format reported by "date -R"
-Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
-
-* We try to build package
-> rm -fr ../build-area
-> git-buildpackage -us -uc
-
-Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
-Note: Package is built into directory ../build-area
-
-* Test package (see dedicated chapter to test it with debian unstable env)
-
-* If package .deb is ok:
-Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git-buildpackage --git-tag-only --git-retag
-> git push --all ou git push origin --all
-> git push --tags
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
-http://ftp-master.debian.org/new/
- 
-* Once package is validated, you should see it into area unstable at:
-http://packages.qa.debian.org
-
-* Package will be into release when test will be moved as stable.
-
-
--- a/build/debian/apache.conf
+++ b/build/debian/apache.conf
@@ -0,0 +1,85 @@
+# Apache config file for Dolibarr
+
+<IfModule mod_alias.c>
+Alias /dolibarr /usr/share/dolibarr/htdocs
+</IfModule>
+
+# You can also use dolibarr as a VirtualHost
+# <VirtualHost *:*>
+#     ServerName mydolibarrhostname.com
+#     ServerAdmin root@example.com
+#     DocumentRoot /usr/share/dolibarr/
+#     ErrorLog logs/ldap.example.com-error.log
+#     CustomLog logs/ldap.example.com-access.log common
+# </VirtualHost>
+
+# Directory for web pages
+<DirectoryMatch /usr/share/dolibarr>
+  Order deny,allow
+  Allow from all
+  DirectoryIndex index.php
+  Options +FollowSymLinks +Indexes
+
+  ErrorDocument 401 /public/error-401.php
+  ErrorDocument 404 /public/error-404.php
+
+  <IfModule mod_php4.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+  <IfModule mod_php5.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+
+    # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
+    # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
+    #AddType text/javascript .jgz
+    #AddEncoding gzip .jgz
+    
+    # OPTIMIZE: To use gzip compression (on the fly).
+    # Note that you must also enable the module mod_deflate.
+    # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
+    #TODO
+    
+    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+    # Note that you must also enable the module mod_expires.
+    #ExpiresActive On
+    #ExpiresByType image/x-icon A2592000
+    #ExpiresByType image/gif A2592000
+    #ExpiresByType image/png A2592000
+    #ExpiresByType image/jpeg A2592000
+    #ExpiresByType text/css A2592000
+    #ExpiresByType text/javascript A2592000
+    #ExpiresByType application/x-javascript A2592000
+    #ExpiresByType application/javascript A2592000
+
+</DirectoryMatch>
+
+# Directory for public pages
+<DirectoryMatch /usr/share/dolibarr/htdocs/public>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Config files
+<DirectoryMatch /etc/dolibarr>
+	AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Directory for data files
+<DirectoryMatch /usr/share/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+<DirectoryMatch /var/lib/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -1,7 +0,0 @@
-<IfVersion >= 2.3>
-Require all denied
-</IfVersion>
-<IfVersion < 2.3>
-Order deny,allow
-Deny from all
-</IfVersion>
--- a/build/debian/apache/dolibarr.conf
+++ b/build/debian/apache/dolibarr.conf
@@ -1,42 +0,0 @@
-# Apache config file for Dolibarr
-<IfModule mod_alias.c>
-Alias /dolibarr /usr/share/dolibarr/htdocs
-</IfModule>
-
-# You can also use dolibarr as a VirtualHost
-# <VirtualHost *:*>
-#     ServerName mydolibarrhostname.com
-#     ServerAdmin root@example.com
-#     DocumentRoot /usr/share/dolibarr/
-#     ErrorLog logs/ldap.example.com-error.log
-#     CustomLog logs/ldap.example.com-access.log common
-# </VirtualHost>
-
-# Directory for web pages
-<Directory /usr/share/dolibarr/htdocs>
-    Order deny,allow
-    Allow from all
-
-    DirectoryIndex index.php
-    Options +FollowSymLinks +Indexes
-
-    ErrorDocument 401 /dolibarr/public/error-401.php
-    ErrorDocument 404 /dolibarr/public/error-404.php
-
-    <IfModule mod_php5.c>
-      php_flag magic_quotes_gpc Off
-      php_flag register_globals Off
-    </IfModule>
-
-    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
-    # Note that you must also enable the module mod_expires.
-    #ExpiresActive On
-    #ExpiresByType image/x-icon A2592000
-    #ExpiresByType image/gif A2592000
-    #ExpiresByType image/png A2592000
-    #ExpiresByType image/jpeg A2592000
-    #ExpiresByType text/css A2592000
-    #ExpiresByType text/javascript A2592000
-    #ExpiresByType application/x-javascript A2592000
-    #ExpiresByType application/javascript A2592000
-</Directory>
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,76 +1,9 @@
-dolibarr (3.5.7-3) unstable; urgency=low
+dolibarr (3.2.3+nmu1) unstable; urgency=low

-  [ Laurent Destailleur (eldy) ]
+  * Non-maintainer upload.
  * New upstream release.
+    closes: bug#634783
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 18 Jun 2012 12:00:00 +0100     

-dolibarr (3.5.6-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 2 Dec 2014 12:00:00 +0100     
-
-dolibarr (3.5.5-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.4-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.3-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 2 May 2014 12:00:00 +0100     
-
-dolibarr (3.5.2-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 14 March 2014 12:00:00 +0100     
-
-dolibarr (3.5.1-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 7 Feb 2014 12:00:00 +0100     
-
-dolibarr (3.5.0-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     
-
-dolibarr (3.4.2-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
-
-dolibarr (3.4.1-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     
-
-dolibarr (3.4.0-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -161,11 +161,12 @@ $dolibarr_main_authentication='dolibarr';
 # $dolibarr_main_auth_ldap_filter = '';                        # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
 # $dolibarr_main_auth_ldap_admin_login='';					# Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
 # $dolibarr_main_auth_ldap_admin_pass='';					# Required only if anonymous bind disabled. Ex: secret
+
 # $dolibarr_main_auth_ldap_debug='false';


 # dolibarr_main_demo
-# Login and pass to use in a demo mode.
+# Login and pass to use in a demo mode
 # Default value: ''
 # Examples:
 # $dolibarr_main_demo='autologin,autopass'
--- a/build/debian/control
+++ b/build/debian/control
@@ -1,48 +1,39 @@
 Source: dolibarr
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Standards-Version: 3.9.2
 Section: web
 Priority: optional
-Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-# Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
-Standards-Version: 3.9.4
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 9), po-debconf
-# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
- 
+Build-Depends: debhelper (>= 7), po-debconf, dpatch
+
 Package: dolibarr
-Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-cli, 
-# Required PHP extensions
-    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
-# Required PHP libraries
-    php-pear, php-mail-mime, 
-#    php-tcpdf, libfpdi-php, libfpdf-tpl-php, php-fpdf,
-#    libphp-adodb,
-#    libnusoap-php,
-#    libphp-pclzip,
-# Required javascript libraries
-#    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
-# Misc dependencies
-#    fonts-dejavu-core | ttf-dejavu-core,
+    php5-mysql | php5-mysqli, 
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
+ 	php-fpdf,
+ 	libphp-adodb,
+    libnusoap-php,
+    libphp-pclzip,
+    libjs-jquery, libjs-jquery-ui, ckeditor,
+    ttf-dejavu-core,
    xdg-utils,
    mysql-server,
    ${misc:Depends},
    ${perl:Depends}
-Recommends: mysql-client, apache2 | lighttpd | httpd
+Recommends: apache2 | lighttpd | httpd, mysql-client
 Suggests: www-browser
-Description: Web based software to manage a company or foundation
+Architecture: all
+Description: Web based software to manage a small 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
 Management (CRM) but also for different other activities.
- .
 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.
- .
- This is an example of most common used modules:
+ Dolibarr was designed to be easy to use. Only features you need are 
+ visible, depending on which module were activated.
+ Most common used modules are:
 .
 Customers, Suppliers or Prospects directory,
 Contacts directory,
@@ -66,6 +57,6 @@ Description: Web based software to manage a company or foundation
 Wizards to export and import data,
 LDAP connectivity,
 PDF exports,
- And a lot more modules...
+ And a lot of more modules...
 .
- You can also add external modules from third parties or develop yours.
+ You can also add third parties external modules or develop yours.
--- a/build/debian/control.debianbin
+++ b/build/debian/control.debianbin
@@ -0,0 +1,54 @@
+Package: dolibarr
+Version: __VERSION__
+Architecture: all
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Installed-Size: 61200
+Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
+    php5-mysql | php5-mysqli, 
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
+	libphp-adodb,
+    libnusoap-php,
+    libphp-pclzip,
+    libjs-jquery, libjs-jquery-ui, ckeditor,
+    ttf-dejavu-core,
+    xdg-utils,
+    mysql-server
+Section: web
+Priority: optional
+Homepage: http://www.dolibarr.org
+Description: Web based software to manage a small 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
+ Management (CRM) but also for different other activities.
+ 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 features you need are 
+ visible, depending on which module were activated.
+ .
+ Customers, Suppliers or Prospects directory,
+ Contacts directory,
+ Orders management,
+ Commercial proposals management,
+ Invoices management,
+ Products and services catalog,
+ Stock management,
+ Foundations members management,
+ Bank accounts management,
+ Point of Sale,
+ Payments management,
+ Commercial actions management,
+ Contracts management,
+ Standing orders management,
+ Shipping management,
+ Donations management,
+ Bookmarks management,
+ Mass Emailings,
+ Reports,
+ Wizards to export and import data,
+ LDAP connectivity,
+ PDF exports,
+ And a lot of more modules...
+ .
+ You can also add third parties external modules or develop yours.
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -1,14 +1,14 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: http://sourceforge.net/projects/dolibarr/files/
+Source: git@github.com:Dolibarr/dolibarr.git

 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
-           2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
+           2003-2012, Laurent Destailleur    <eldy@users.sourceforge.net>
           2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
+           2004-2012, Regis Houssin          <regis@dolibarr.fr>
           2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
           2004, Benoit Mortier              <benoit.mortier@opensides.be>
           2004, Christophe Combelles        <ccomb@free.fr>
@@ -31,153 +31,13 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2008, Matteli                     <unknown@unknown.com>
           2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
           2010, Francois Legastelois        <flegastelois@teclib.com>
-           2010-2013, Juanjo Menent          <jmenent@2byte.es>
-           2010-2013, Philippe Grand         <philippe.grand@atoo-net.com>
+           2010-2012, Juanjo Menent          <jmenent@2byte.es>
+           2010-2012, Philippe Grand         <philippe.grand@atoo-net.com>
           2010, Pierre Morin                <pierre.morin@auguria.net>
           2010, Servitux Servicios Informaticos <info@servitux.es>
           2011, Herve Prot                  <herve.prot@symeos.com>
           2011, Remy Younes                 <ryounes@gmail.com>
-           2012-2013, Christophe Battarel         <christophe.battarel@altairis.fr>
-License: GPL-3+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
-Files: htdocs/includes/adodbtime/*
-Copyright: 2003-2005, John Lim
-           unknown, jackbbs
-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:
- .
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- Neither the name of the John Lim nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
-Comment:
- Those files are not shipped in the binary package since we use
- the library as packaged in "libphp-adodb".
-
-Files: htdocs/includes/ckeditor/*
-Copyright: 2003-2012 CKSource - Frederico Knabben
-License: GPL-2+
- The ckeditor is tripple licensed under the GNU General Public License (GPL),
- GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL).
- In Debian, it is distributed under the GNU General Public License (GPL).
- .
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-Comment:
- Sources for all minified javascript libraries are available in same directory
- than minified version (.min.js), except for ckeditor whose sources are files
- ckeditor_basic_source.js, ckeditor_source.js and files into directory _source.
- Those files are not shipped in the binary package since we use the
- library as packaged in "ckeditor".
-
-Files: htdocs/includes/fonts/*
-Copyright: 2003, Bitstream Inc
-	   unknown, Gavin Graham
-License: other
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use,
- copy, merge, publish, distribute, and/or sell copies of the Font
- Software, and to permit persons to whom the Font Software is furnished
- to do so, subject to the following conditions:
- .
- The above copyright and trademark notices and this permission notice
- shall be included in all copies of one or more of the Font Software
- typefaces.
- .
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the
- Fonts, only if the fonts are renamed to names not containing either
- the words "Bitstream" or the word "Vera".
- .
- This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
- .
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
- .
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
- OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
- SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
- .
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising or
- otherwise to promote the sale, use or other dealings in this Font
- Software without prior written authorization from the Gnome Foundation
- or Bitstream Inc., respectively. For further information, contact:
- fonts at gnome dot org.
-Comments:
- Those files are not shipped in the binary package as we
- configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
-  
-Files: docs/images/*
-Copyright: Laurent Destailleur 
-License: CC-BY-SA-3.0
- You are free:
- to Share (to copy, distribute and transmit the work) and
- to Remix (to adapt the work) under the following conditions:
- .
- Attribution - You must attribute the work in the manner specified by the
- author or licensor (but not in any way that suggests that they endorse you
- or your use of the work).
- .
- Share Alike - If you alter, transform, or build upon this work, you may
- distribute the resulting work only under the same, similar or a compatible
- license.
- .
- For more information, see http://creativecommons.org/licenses/by-sa/3.0/
-
-Files: htdocs/includes/fpdi/*
-Copyright: 2004-2011 Setasign - Jan Slabon
+           2012, Christophe Battarel         <christophe.battarel@altairis.fr>
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public
@@ -197,35 +57,34 @@ License: GPL-2+
 On Debian systems, the full text of the GNU General Public
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.
-Comment:
- Those files are not shipped in the binary package as we
- configure Dolibarr to use the library packaged in "libfpdi-php".

-Files: htdocs/includes/geoip/*
-Copyright: 2007 MaxMind LLC
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+
+Files: htdocs/includes/fpdi/*
+Copyright: FPDFI team
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later
+ version.
 .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
 .
- You should have received a copy of the GNU Lesser General Public License
+ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+

 Files: htdocs/includes/jquery/*
 Copyright: JQuery team
-License: GPL-2+ or MIT
- === GPL-2+ LICENSE NOTICE ===
- .
+License: MIT or GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
@@ -245,8 +104,6 @@ License: GPL-2+ or MIT
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.
 .
- === MIT LICENSE ===
- .
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -264,19 +121,13 @@ License: GPL-2+ or MIT
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-Comment:
- JQuery itself is not shipped in the binary package, instead Dolibarr is
- configured to use the packaged version from "libjs-jquery" and
- "libjs-jquery-ui". Most of the plugins are shipped though.


 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
- Dolibarr to use the files provided by "libjs-flot".
+

 Files: htdocs/includes/jsgantt/*
 Copyright: JSGantt team
@@ -300,28 +151,12 @@ License: GPL-2+
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.

-Files: htdocs/includes/nusoap/*
-Copyright: 2002-2010 NuSphere Corporation
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
-Comment:
- Those files are not shipped in the binary package since we
- configure Dolibarr to use the library provided in "libnusoap-php".
+
+Files: htdocs/includes/phpexcel/*
+Copyright: PHPExcel team
+License: LGPL 2.1
+ See http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html
+

 Files: htdocs/includes/odtphp/*
 Copyright: 2008, Julien Pauli
@@ -347,44 +182,8 @@ License: GPL-2+
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.

-Files: htdocs/includes/phpexcel/*
-Copyright: 2006-2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.

 Files: htdocs/includes/tcpdf/*
-Copyright: 2002-2013 Nicola Asuni - Tecnick.com LTD
-License: LGPL-3.0+
- TCPDF is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
- .
- TCPDF is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
-Comment:
- Those files are not shipped in the binary package since we configure
- Dolibarr to use the library provided by "php-tcpdf".
+Copyright: TCPDF team
+License: LGPL 3.0
+  See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
--- a/build/debian/dolibarr.install
+++ b/build/debian/dolibarr.install
@@ -1,13 +1,13 @@
-debian/dolibarr.desktop usr/share/applications/
-debian/dolibarr.xpm usr/share/pixmaps/
-debian/apache/.htaccess var/lib/dolibarr/documents/
-debian/apache/dolibarr.conf etc/apache2/conf-available/
-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/
+debian/dolibarr.desktop usr/share/applications
+debian/dolibarr.xpm usr/share/pixmaps
+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/apache.conf etc/dolibarr
+build/debian/lighttpd.conf etc/dolibarr
+build usr/share/dolibarr
+dev usr/share/dolibarr
+htdocs usr/share/dolibarr
+scripts usr/share/dolibarr
--- a/build/debian/dolibarr.lintian-overrides
+++ b/build/debian/dolibarr.lintian-overrides
@@ -1,7 +1 @@
-# We want a www-data group-writable /var/lib/dolibarr/documents/
-dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755
-# We depend on xdg-utils providing xdg-open and we use that to open an URL
-dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open
-# We use <IfVersion> to include the correct configuration for each apache version
-dolibarr: apache2-deprecated-auth-config Order
-dolibarr: apache2-deprecated-auth-config Allow
+# No overrided lintian rules is this version.
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -13,52 +13,27 @@ set -e
 #          <conflicting-package> <version>
 # for details, see /usr/share/doc/packaging-manual/

-if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-	# Needs to be run outside of functions to have access to parameters
-	. /usr/share/apache2/apache2-maintscript-helper
-fi

-setup_empty_conf() {
-	echo Create empty file $config		
-    mkdir -p /etc/dolibarr
-    touch /etc/dolibarr/conf.php
-    chown root:www-data /etc/dolibarr/conf.php
-    chmod 664 /etc/dolibarr/conf.php
-}

-is_new_upstream_version() {
-    # $1 can be empty (not installed) and will result in a true value
-    # for the check
-    old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
-		  sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    test "$old_version" != "$new_version"
-}

-enable_install_upgrade_wizard() {
-	echo Enable install wizard by removing install.lock file if present
-    rm -f /var/lib/dolibarr/documents/install.lock
-}
-
-apache_install() {
-	webserver=$1
-	if which a2enconf >/dev/null 2>&1 ;then
-		# a2enconf exists for ubuntu only
-		a2enconf dolibarr
-	else 
-		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
-			echo "Add link for Apache config file"
-			ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
+lighttpd_install() {
+	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
+		if which lighty-enable-mod >/dev/null 2>&1 ; then
+			echo "Add link for Lighttpd config file"
+			ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
+			# We enabled it
+			lighty-enable-mod dolibarr fastcgi-php
+		else
+			echo "Lighttpd not installed, skipping"
 		fi
 	fi
 }

-lighttpd_install() {
-	if which lighty-enable-mod >/dev/null 2>&1 ; then
-		echo "Enable lighttpd link for dolibarr config file"
-		lighty-enable-mod dolibarr fastcgi-php
-	else
-		echo "Lighttpd not installed, skipping"
+apache_install() {
+	webserver=$1
+	if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
+		echo "Add link for Apache config file"
+		ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
 	fi
 }

@@ -74,40 +49,24 @@ echo Run the dolibarr postinst script

 # Define vars
 docdir='/var/lib/dolibarr/documents'
-installfileorig="/etc/dolibarr/install.forced.php.install"
+installfileorig="/usr/share/dolibarr/build/debian/install.forced.php.install"
 installconfig="/etc/dolibarr/install.forced.php"
 config="/etc/dolibarr/conf.php"


 case "$1" in
 	configure)
-		if [ -z "$2" ]; then
-			echo First install
-		    #setup_empty_conf
-		else
-			echo This is not a first install
-		fi
-
-		# Apache 2 setup
-		if which a2enmod >/dev/null 2>&1 ;then
-			a2enmod alias
-		fi
-		
-		apache_install
-		lighttpd_install
-		
+	
 		# Remove lock file
-		if is_new_upstream_version "$2"; then
-		    enable_install_upgrade_wizard
-		fi
-				
+		rm -f $docdir/install.lock
+
        # Create document directory for uploaded data files
        mkdir -p $docdir
        chown -R www-data:www-data $docdir
        chmod -R 775 $docdir
        chmod -R g+s $docdir

-		# Copy install config file (with matching Debian values) into target directory
+		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -128,22 +87,25 @@ case "$1" in
 		if [ ! -s $config ] || ! grep -q "File generated by" $config
 		then
 			# Create an empty conf.php with permission to web server
-			setup_empty_conf
+			echo Create empty file $config		
+			touch $config
+	    	chmod -R 660 $config
+			chown -R root:www-data $config
 		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
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@@ -177,19 +177,18 @@ case "$1" in
 			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
-			mysqlcmdnopass="mysql $hostopt -u $dbadmin"
-			
+
 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi

--- a/build/debian/dolibarr.xpm
+++ b/build/debian/dolibarr.xpm
@@ -1,196 +1,292 @@
 /* XPM */
 static char * dolibarr_xpm[] = {
-"32 32 161 2",
+"32 32 257 2",
 "  	c None",
-". 	c #4378AA",
-"+ 	c #4277A8",
-"@ 	c #4175A7",
-"# 	c #3F74A5",
-"$ 	c #3E72A3",
-"% 	c #3D71A2",
-"& 	c #487AA8",
-"* 	c #5A87B0",
-"= 	c #5987B0",
-"- 	c #5986B0",
-"; 	c #5583AE",
-"> 	c #4678A6",
-", 	c #326A9D",
-"' 	c #356C9F",
-") 	c #3B70A1",
-"! 	c #3B6FA0",
-"~ 	c #90ADC9",
+". 	c #000000",
+"+ 	c #800080",
+"@ 	c #000080",
+"# 	c #008080",
+"$ 	c #008000",
+"% 	c #808000",
+"& 	c #800000",
+"* 	c #C0C0C0",
+"= 	c #C0DCC0",
+"- 	c #A6CAF0",
+"; 	c #808080",
+"> 	c #FF00FF",
+", 	c #0000FF",
+"' 	c #00FFFF",
+") 	c #00FF00",
+"! 	c #FFFF00",
+"~ 	c #FF0000",
 "{ 	c #FFFFFF",
-"] 	c #DFE7EF",
-"^ 	c #A6BED4",
-"/ 	c #5683AD",
-"( 	c #346A9D",
-"_ 	c #3A6E9F",
-": 	c #8CAAC7",
-"< 	c #CFDCE8",
-"[ 	c #4B7AA6",
-"} 	c #3A6E9E",
-"| 	c #396D9D",
-"1 	c #8BA9C6",
-"2 	c #FEFEFE",
-"3 	c #6C92B6",
-"4 	c #376B9C",
-"5 	c #386B9B",
-"6 	c #8AA8C5",
-"7 	c #648CB1",
-"8 	c #366A9A",
-"9 	c #89A8C4",
-"0 	c #FCFCFD",
-"a 	c #356898",
-"b 	c #89A7C3",
-"c 	c #F1F4F8",
-"d 	c #C2D1E0",
-"e 	c #C4D2E0",
-"f 	c #C8D6E3",
-"g 	c #E1E8EF",
-"h 	c #A4BBD1",
-"i 	c #336797",
-"j 	c #346797",
-"k 	c #88A6C2",
-"l 	c #D0DBE6",
-"m 	c #285F91",
-"n 	c #2F6494",
-"o 	c #2E6394",
-"p 	c #2B6192",
-"q 	c #366898",
-"r 	c #A1B9CE",
-"s 	c #2A6091",
-"t 	c #336595",
-"u 	c #88A5C1",
-"v 	c #D0DCE7",
-"w 	c #2C6092",
-"x 	c #2E6193",
-"y 	c #9CB4CB",
-"z 	c #557FA7",
-"A 	c #316493",
-"B 	c #86A4C0",
-"C 	c #D0DCE6",
-"D 	c #2B5F90",
-"E 	c #799AB9",
-"F 	c #306392",
-"G 	c #86A4BF",
-"H 	c #2A5E8E",
-"I 	c #265B8C",
-"J 	c #F2F5F8",
-"K 	c #89A5C0",
-"L 	c #2F6190",
-"M 	c #85A3BE",
-"N 	c #285C8D",
-"O 	c #23588A",
-"P 	c #F7F9FB",
-"Q 	c #86A3BF",
-"R 	c #2E608E",
-"S 	c #85A2BD",
-"T 	c #CFDBE5",
-"U 	c #275B8A",
-"V 	c #3A6995",
-"W 	c #7092B2",
-"X 	c #2C5E8D",
-"Y 	c #84A1BC",
-"Z 	c #CFDAE5",
-"` 	c #26598A",
-" .	c #245889",
-"..	c #B1C3D4",
-"+.	c #46729B",
-"@.	c #2B5D8B",
-"#.	c #83A0BB",
-"$.	c #CEDAE5",
-"%.	c #235787",
-"&.	c #265988",
-"*.	c #255988",
-"=.	c #215686",
-"-.	c #376692",
-";.	c #B3C5D6",
-">.	c #F3F5F8",
-",.	c #205585",
-"'.	c #2A5C8A",
-").	c #82A0BA",
-"!.	c #CEDAE4",
-"~.	c #467199",
-"{.	c #C8D5E0",
-"].	c #C9D6E1",
-"^.	c #E7EDF2",
-"/.	c #94ADC4",
-"(.	c #285B89",
-"_.	c #285A88",
-":.	c #819FB9",
-"<.	c #527A9F",
-"[.	c #F9FAFB",
-"}.	c #275987",
-"|.	c #275986",
-"1.	c #819DB8",
-"2.	c #CED9E3",
-"3.	c #51799E",
-"4.	c #567DA0",
-"5.	c #265785",
-"6.	c #809DB8",
-"7.	c #51789D",
-"8.	c #698AAA",
-"9.	c #245584",
-"0.	c #255683",
-"a.	c #809CB7",
-"b.	c #CDD8E3",
-"c.	c #4F779B",
-"d.	c #EDF1F5",
-"e.	c #4B7399",
-"f.	c #235582",
-"g.	c #235482",
-"h.	c #819DB7",
-"i.	c #D2DCE5",
-"j.	c #4F769B",
-"k.	c #D7E0E8",
-"l.	c #7896B2",
-"m.	c #1B4E7D",
-"n.	c #225380",
-"o.	c #36628B",
-"p.	c #53799C",
-"q.	c #52789C",
-"r.	c #477095",
-"s.	c #2F5D87",
-"t.	c #6A8BA9",
-"u.	c #6F8FAD",
-"v.	c #688AA8",
-"w.	c #4F769A",
-"x.	c #235380",
-"y.	c #1A4D7B",
-"z.	c #21527E",
-"A.	c #20507D",
-"B.	c #1E4F7B",
-"C.	c #1D4D7A",
-"D.	c #1B4C78",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
-"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
-"# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ",
-"$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ ",
-"% % % % % % & * = = = = = = - ; > , ' ) % % % % % % % % % % % % ",
-"! ! ! ! ! ! ~ { { { { { { { { { { { ] ^ / ( ! ! ! ! ! ! ! ! ! ! ",
-"_ _ _ _ _ _ : { { { { { { { { { { { { { { < [ } _ _ _ _ _ _ _ _ ",
-"| | | | | | 1 { { { { { { { { { { { { { { 2 { 3 4 | | | | | | | ",
-"5 5 5 5 5 5 6 { { { { { { { { { { { { { { { 2 { 7 5 5 5 5 5 5 5 ",
-"8 8 8 8 8 8 9 { { { { { { { { { { { { { { { { 2 0 5 8 8 8 8 8 8 ",
-"a a a a a a b { { { { { c d e f g { { { { { { { { h i a a a a a ",
-"j j j j j j k { { { { { l m n o p q r { { { { { { 0 s j j j j j ",
-"t t t t t t u { { { { { v w t t t t x y { { { { { { z t t t t t ",
-"A A A A A A B { { { { { C D A A A A A A { { { { { { E A A A A A ",
-"F F F F F F G { { { { { l H F F F F F I J { { { { { K F F F F F ",
-"L L L L L L M { { { { { l N L L L L L O P { { { { { Q L L L L L ",
-"R R R R R R S { { { { { T U R R R R R V { { { { { { W R R R R R ",
-"X X X X X X Y { { { { { Z ` X X X X  ...{ { { { { { +.X X X X X ",
-"@.@.@.@.@.@.#.{ { { { { $.%.&.*.=.-.;.{ { { { { { >.,.@.@.@.@.@.",
-"'.'.'.'.'.'.).{ { { { { !.~.{.].^.{ { { { { { { { /.(.'.'.'.'.'.",
-"_._._._._._.:.{ { { { { !.<.{ { { { { { { { { 2 [.}._._._._._._.",
-"|.|.|.|.|.|.1.{ { { { { 2.3.{ { { { { { { { 2 { 4.|.|.|.|.|.|.|.",
-"5.5.5.5.5.5.6.{ { { { { 2.7.{ { { { { { { 2 { 8.9.5.5.5.5.5.5.5.",
-"0.0.0.0.0.0.a.{ { { { { b.c.{ { { { { 2 { d.e.f.0.0.0.0.0.0.0.0.",
-"g.g.g.g.g.g.h.{ { { { { i.j.{ { { { { k.l.m.g.g.g.g.g.g.g.g.g.g.",
-"n.n.n.n.n.n.o.p.q.q.q.q.r.s.t.u.v.w.x.y.n.n.n.n.n.n.n.n.n.n.n.n.",
-"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
-"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.",
-"B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D."};
+"] 	c #FFFBF0",
+"^ 	c #A0A0A4",
+"/ 	c #402000",
+"( 	c #602000",
+"_ 	c #802000",
+": 	c #A02000",
+"< 	c #C02000",
+"[ 	c #E02000",
+"} 	c #004000",
+"| 	c #204000",
+"1 	c #404000",
+"2 	c #604000",
+"3 	c #804000",
+"4 	c #A04000",
+"5 	c #C04000",
+"6 	c #E04000",
+"7 	c #006000",
+"8 	c #206000",
+"9 	c #406000",
+"0 	c #606000",
+"a 	c #806000",
+"b 	c #A06000",
+"c 	c #C06000",
+"d 	c #E06000",
+"e 	c #008000",
+"f 	c #208000",
+"g 	c #408000",
+"h 	c #608000",
+"i 	c #808000",
+"j 	c #A08000",
+"k 	c #C08000",
+"l 	c #E08000",
+"m 	c #00A000",
+"n 	c #20A000",
+"o 	c #40A000",
+"p 	c #60A000",
+"q 	c #80A000",
+"r 	c #A0A000",
+"s 	c #C0A000",
+"t 	c #E0A000",
+"u 	c #00C000",
+"v 	c #20C000",
+"w 	c #40C000",
+"x 	c #60C000",
+"y 	c #80C000",
+"z 	c #A0C000",
+"A 	c #C0C000",
+"B 	c #E0C000",
+"C 	c #00E000",
+"D 	c #20E000",
+"E 	c #40E000",
+"F 	c #60E000",
+"G 	c #80E000",
+"H 	c #A0E000",
+"I 	c #C0E000",
+"J 	c #E0E000",
+"K 	c #000040",
+"L 	c #200040",
+"M 	c #400040",
+"N 	c #600040",
+"O 	c #800040",
+"P 	c #A00040",
+"Q 	c #C00040",
+"R 	c #E00040",
+"S 	c #002040",
+"T 	c #202040",
+"U 	c #402040",
+"V 	c #602040",
+"W 	c #802040",
+"X 	c #A02040",
+"Y 	c #C02040",
+"Z 	c #E02040",
+"` 	c #004040",
+" .	c #204040",
+"..	c #404040",
+"+.	c #604040",
+"@.	c #804040",
+"#.	c #A04040",
+"$.	c #C04040",
+"%.	c #E04040",
+"&.	c #006040",
+"*.	c #206040",
+"=.	c #406040",
+"-.	c #606040",
+";.	c #806040",
+">.	c #A06040",
+",.	c #C06040",
+"'.	c #E06040",
+").	c #008040",
+"!.	c #208040",
+"~.	c #408040",
+"{.	c #608040",
+"].	c #808040",
+"^.	c #A08040",
+"/.	c #C08040",
+"(.	c #E08040",
+"_.	c #00A040",
+":.	c #20A040",
+"<.	c #40A040",
+"[.	c #60A040",
+"}.	c #80A040",
+"|.	c #A0A040",
+"1.	c #C0A040",
+"2.	c #E0A040",
+"3.	c #00C040",
+"4.	c #20C040",
+"5.	c #40C040",
+"6.	c #60C040",
+"7.	c #80C040",
+"8.	c #A0C040",
+"9.	c #C0C040",
+"0.	c #E0C040",
+"a.	c #00E040",
+"b.	c #20E040",
+"c.	c #40E040",
+"d.	c #60E040",
+"e.	c #80E040",
+"f.	c #A0E040",
+"g.	c #C0E040",
+"h.	c #E0E040",
+"i.	c #000080",
+"j.	c #200080",
+"k.	c #400080",
+"l.	c #600080",
+"m.	c #800080",
+"n.	c #A00080",
+"o.	c #C00080",
+"p.	c #E00080",
+"q.	c #002080",
+"r.	c #202080",
+"s.	c #402080",
+"t.	c #602080",
+"u.	c #802080",
+"v.	c #A02080",
+"w.	c #C02080",
+"x.	c #E02080",
+"y.	c #004080",
+"z.	c #204080",
+"A.	c #404080",
+"B.	c #604080",
+"C.	c #804080",
+"D.	c #A04080",
+"E.	c #C04080",
+"F.	c #E04080",
+"G.	c #006080",
+"H.	c #206080",
+"I.	c #406080",
+"J.	c #606080",
+"K.	c #806080",
+"L.	c #A06080",
+"M.	c #C06080",
+"N.	c #E06080",
+"O.	c #008080",
+"P.	c #208080",
+"Q.	c #408080",
+"R.	c #608080",
+"S.	c #808080",
+"T.	c #A08080",
+"U.	c #C08080",
+"V.	c #E08080",
+"W.	c #00A080",
+"X.	c #20A080",
+"Y.	c #40A080",
+"Z.	c #60A080",
+"`.	c #80A080",
+" +	c #A0A080",
+".+	c #C0A080",
+"++	c #E0A080",
+"@+	c #00C080",
+"#+	c #20C080",
+"$+	c #40C080",
+"%+	c #60C080",
+"&+	c #80C080",
+"*+	c #A0C080",
+"=+	c #C0C080",
+"-+	c #E0C080",
+";+	c #00E080",
+">+	c #20E080",
+",+	c #40E080",
+"'+	c #60E080",
+")+	c #80E080",
+"!+	c #A0E080",
+"~+	c #C0E080",
+"{+	c #E0E080",
+"]+	c #0000C0",
+"^+	c #2000C0",
+"/+	c #4000C0",
+"(+	c #6000C0",
+"_+	c #8000C0",
+":+	c #A000C0",
+"<+	c #C000C0",
+"[+	c #E000C0",
+"}+	c #0020C0",
+"|+	c #2020C0",
+"1+	c #4020C0",
+"2+	c #6020C0",
+"3+	c #8020C0",
+"4+	c #A020C0",
+"5+	c #C020C0",
+"6+	c #E020C0",
+"7+	c #0040C0",
+"8+	c #2040C0",
+"9+	c #4040C0",
+"0+	c #6040C0",
+"a+	c #8040C0",
+"b+	c #A040C0",
+"c+	c #C040C0",
+"d+	c #E040C0",
+"e+	c #0060C0",
+"f+	c #2060C0",
+"g+	c #4060C0",
+"h+	c #6060C0",
+"i+	c #8060C0",
+"j+	c #A060C0",
+"k+	c #C060C0",
+"l+	c #E060C0",
+"m+	c #0080C0",
+"n+	c #2080C0",
+"o+	c #4080C0",
+"p+	c #6080C0",
+"q+	c #8080C0",
+"r+	c #A080C0",
+"s+	c #C080C0",
+"t+	c #E080C0",
+"u+	c #00A0C0",
+"v+	c #20A0C0",
+"w+	c #40A0C0",
+"x+	c #60A0C0",
+"y+	c #80A0C0",
+"z+	c #A0A0C0",
+"A+	c #C0A0C0",
+"B+	c #E0A0C0",
+"C+	c #00C0C0",
+"D+	c #20C0C0",
+"E+	c #40C0C0",
+"F+	c #60C0C0",
+"G+	c #80C0C0",
+"H+	c #A0C0C0",
+"  J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.....-.S.^ * =                   ",
+"S.y+H+y+y+y+y+y+y+y+y+y+y+y+y+y+y+y+R.R.J.J.S.* =               ",
+"S.R.x+o+Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.o+p+x+x+x+R.R.^ *             ",
+"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.o+o+R.S.*           ",
+"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.Q.`.*         ",
+"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H.^ *       ",
+"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H+      ",
+"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.G.I.=     ",
+"S.R.Q.H.G.G.G.G.G.y.` ` ` ` ` ` y.y.G.G.G.G.G.G.G.G.H.H.G.y+    ",
+"S.R.Q.H.G.G.G.G.G.`  .=.=.=.=...S S ` y.G.G.G.G.G.G.G.H.G.H.    ",
+"S.R.o+H.H.H.H.H.G.` ^             * R.` y.H.H.H.H.H.H.H.H.y.H+  ",
+"S.R.o+H.H.H.H.H.H.` ^                 = H.H.H.H.H.H.H.H.H.G.R.  ",
+"S.R.o+P.H.H.H.H.H.` ^                   * H.H.H.H.H.H.H.H.H.z.  ",
+"S.p+o+P.H.H.H.H.H.` ^                   * o+P.P.H.H.H.H.P.H.`   ",
+"S.p+o+n+P.P.P.P.H.z.^                   * R.o+n+P.P.P.P.P.H.`   ",
+"S.p+w+n+n+n+n+n+H.z.^                   * S.w+n+n+n+n+n+n+H. .* ",
+"S.x+w+n+n+n+n+n+P.z.^                   ^ R.x+o+n+n+n+n+n+H. .* ",
+"S.x+w+n+n+n+n+n+P.H.^                   ^ R.x+w+n+n+n+n+n+H. .  ",
+"S.x+w+n+n+n+n+n+n+H.^                 * S.R.x+w+n+n+n+n+n+H. .  ",
+"S.x+x+w+n+n+n+n+n+H.^               = S...G+F+w+n+n+n+n+n+H. .  ",
+"S.x+x+w+v+v+v+v+n+H.z+          = * S...S.G+x+w+v+v+v+v+n+H.R.  ",
+"S.x+x+w+w+w+w+w+n+H.z+  = * ^ ^ S.....`.- G+w+w+w+w+w+w+P. .^   ",
+"S.x+F+w+w+w+w+w+w+H.H+= -.....=.J.`.- - G+w+w+w+w+w+w+w+H.T     ",
+"S.x+F+w+w+w+w+w+w+H.H+* - - - - - - G+F+w+w+w+w+w+w+w+P. .R.    ",
+"S.x+F+w+w+w+w+w+w+H.H+* - G+F+F+F+F+E+w+w+w+w+w+w+w+w+H. .      ",
+"S.y+F+E+w+w+w+w+w+H.H+* F+F+w+w+w+w+w+w+w+w+w+w+w+w+H. .^       ",
+"S.G+F+E+E+E+E+E+w+P.H+* F+F+E+E+E+E+E+E+E+E+E+E+w+H. .S.        ",
+"S.G+F+F+E+E+E+E+w+P.H+* G+F+E+E+E+E+E+E+E+E+E+w+H.T S.          ",
+"S.G+F+F+E+E+E+E+w+Q.H+* G+F+E+E+E+E+E+E+E+w+Q.H.T `.            ",
+"S.G+G+F+F+F+F+F+E+Q.H+* - F+F+F+E+E+w+w+Q.H. ...*               ",
+"^ G+F+x+x+x+x+x+Q.I.H+  - F+x+x+Q.Q.I. . .=.z+                  ",
+"  H+I. . . . . . . .^   R... . . .J.S.^ =                       "};
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Scan for new official sources and download file
-# run with debian/get-orig-source.sh [x.y.z]
-
-tmpdir=$(mktemp -d)
-echo "tmpdir = $tmpdir"
-
-if [ -n "$1" ]; then
-    uscan_opts="--download-version=$1"
-fi
-#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-orig"
-
-rm -rf $tmpdir
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -1,7 +1,7 @@
 <?php
 // File to force Dolibarr wizard installer choices.
 //
-// This file must be present into htdocs/install or /etc/dolibarr directory
+// This file must be present into htdocs/install directory
 // during install process to be used.
 //
 //
@@ -25,22 +25,18 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';

-// Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If we enable/disable libraries declaration during install, we must also check they are 
-// - not removed from package (see rm in rules file),
-// - declared into dependencies (see Depends in control file)
-//$force_dolibarr_lib_TCPDF_PATH='';
-//$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
+// Value to overwrite path to use shared libraries/fonts instead of embedded one
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
-//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
-//$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='';	// 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_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_lib_TCPDF_PATH='';
+$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
+$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';
+$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';

 ?>
--- a/build/debian/lighttpd/50-dolibarr.conf
+++ b/build/debian/lighttpd/50-dolibarr.conf
--- a/build/debian/patches/00list
+++ b/build/debian/patches/00list
@@ -0,0 +1 @@
+install.dpatch
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -1,17 +1,17 @@
-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";
+#! /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
+@@ -64,8 +64,8 @@
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -22,9 +22,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 
 
 // Include configuration
--- a/htdocs/install/inc.php
-+++ b/htdocs/install/inc.php
-@@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
+--- 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
+@@ -84,8 +84,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -35,9 +35,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 
 
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- a/htdocs/support/inc.php
-+++ b/htdocs/support/inc.php
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+--- 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
+@@ -79,8 +79,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -46,5 +46,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
- 
+ $charset="UTF-8";	// If not output format found in any conf file
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- a/build/debian/patches/series
+++ b/build/debian/patches/series
@@ -1 +0,0 @@
-use-etc-dolibarr-conf.patch
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -14,11 +14,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
-"POT-Creation-Date: 2013-04-23 12:16+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
-"Last-Translator: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
-"Language-Team: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
+"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -27,13 +27,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../dolibarr.templates:1001
+#: ../templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr "Seveur web à reconfigurer automatiquement:"

 #. Type: multiselect
 #. Description
-#: ../dolibarr.templates:1001
+#: ../templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
 #
 #. Type: boolean
 #. Description
-#: ../dolibarr.templates:2001
+#: ../templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"

 #
 #. Type: boolean
 #. Description
-#: ../dolibarr.templates:2001
+#: ../templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/po/templates.pot
+++ b/build/debian/po/templates.pot
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dolibarr\n"
-"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
-"POT-Creation-Date: 2013-04-23 12:16+0200\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,13 +18,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../dolibarr.templates:1001
+#: ../templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr ""

 #. Type: multiselect
 #. Description
-#: ../dolibarr.templates:1001
+#: ../templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -33,13 +32,13 @@ msgstr ""

 #. Type: boolean
 #. Description
-#: ../dolibarr.templates:2001
+#: ../templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr ""

 #. Type: boolean
 #. Description
-#: ../dolibarr.templates:2001
+#: ../templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -7,11 +7,29 @@ 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 $@
+
+build-arch: patch
+	dh $@
+
+build-indep: patch
+	dh $@
+
+binary:
+	dh $@
+
+binary-indep:
 	dh $@
 	
-override_dh_install:
-	dh_install
+clean:
 	# Delete files
 	rm -f  .buildpath
 	rm -fr .cache
@@ -72,45 +90,32 @@ override_dh_install:
 	rm -fr build/rpm
 	rm -fr build/zip
 	
-	# clean from all PHP embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/adodbtime
+	# clean from all embedded libraries (we use package dependencies instead)
+	rm -fr htdocs/includes/adodbtime
+	rm -fr htdocs/includes/ckeditor
 #	rm -fr htdocs/includes/fpdfi
-#	rm -fr htdocs/includes/geoip
-#	rm -fr htdocs/includes/nusoap
-#	rm -fr htdocs/includes/odtphp/zip/pclzip
-	# clean from all JS-CSS embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/ckeditor
-#	rm -fr htdocs/includes/jquery/js
-#	rm -fr htdocs/includes/jquery/css
+	rm -fr htdocs/includes/fonts
+	rm -fr htdocs/includes/geoip
+	rm -fr htdocs/includes/nusoap
+	rm -fr htdocs/includes/odtphp/zip/pclzip
+	rm -fr htdocs/includes/jquery/css
+	rm -fr htdocs/includes/jquery/js
 #	rm -fr htdocs/includes/jquery/plugins/flot
-	# clean from all embedded fonts (we use package dependencies instead)
-#	rm -fr htdocs/includes/fonts
-
-	# clean from useless files
+	rm -fr htdocs/includes/jquery/plugins/jstree
+	rm -fr htdocs/includes/jquery/plugins/lightbox
+	rm -fr htdocs/includes/jquery/plugins/mobile
 	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
-	# clean from files to avoid warning of missing dependencies
-	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py

-	# Licence files are already included into copyright file.
-	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
-	rm -f  htdocs/includes/phpexcel/license.txt
+	# Licence files are included into copyright file.
+	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT

-	# 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
+	dh $@

-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
+binary-arch:
 	
--- a/build/debian/source/format
+++ b/build/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
--- a/build/debian/wash
+++ b/build/debian/wash
@@ -0,0 +1,3 @@
+# watch control file for uscan
+#version=3
+#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate
--- a/build/debian/watch
+++ b/build/debian/watch
@@ -1,5 +0,0 @@
-# watch control file for uscan
-version=3
-
-#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
-http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -30,25 +30,8 @@ if (! -s $CONFFILE)
    exit 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 "Running doxygen, please wait...\n";
+$result=`doxygen $OPTIONS $CONFFILE 2>&1`;

 print $result;

--- a/build/doxygen/dolibarr-doxygen-filter.pl
+++ b/build/doxygen/dolibarr-doxygen-filter.pl
--- a/build/doxygen/dolibarr-doxygen-getversion.pl
+++ b/build/doxygen/dolibarr-doxygen-getversion.pl
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/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 = x.y.z
+PROJECT_NUMBER = 3.2.3

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -611,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.

-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
+EXCLUDE = ../../build ../../dev ../../doc ../../documents ../../htdocs/conf/conf.php ../../htdocs/includes ../../htdocs/document ../../htdocs/documents

 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
--- a/build/doxygen/doxygen_footer.html
+++ b/build/doxygen/doxygen_footer.html
@@ -22,7 +22,7 @@ File added into doxygen generated documentation

 <hr class="footer" />
 <address class="footer"><small>Generated on $datetime
-for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen </a> $doxygenversion </small></address>


 <!--  Google AdSense -->
@@ -40,6 +40,5 @@ google_ad_height = 60;
 <!-- End google adsense -->
 <br>

-</div>
 </body>
 </html>
--- a/build/doxygen/doxygen_header.html
+++ b/build/doxygen/doxygen_header.html
@@ -35,15 +35,15 @@ File added into doxygen generated documentation
 				<div class="bannergroupmybanner">

 				<div class="banneritemmybanner">
-<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 type="text/javascript"><!--
+google_ad_client = "pub-1071905880519467";
+/* PUBBANDEAUDOLIBARR */
+google_ad_slot = "1421205532";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
 </script>
+<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 				<div class="clr"></div>
 				</div>

--- a/build/doxygen/jenkins_doxygen.doxyfile
+++ b/build/doxygen/jenkins_doxygen.doxyfile
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@@ -1,7 +0,0 @@
-# DOLIWAMP, THE DOLIBARR INSTALLER FOR WINDOWS
-
-DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
-It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also and all prerequisites like the web server, and the database in one autoinstall process.
-
-If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
-
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/build/exe/doliwamp/UsedPort.cpp
@@ -10,8 +10,8 @@
 //---------------------------------------------------------------------------
 // 06/09/09	1.0		Laurent Destailleur	   Creation
 //---------------------------------------------------------------------------
-#define PROG	 "UsedPort"
-#define VERSION "1.0"
+#define PROG	"UsedPort"
+#define VERSION	"1.0"

 // If GNU GCC CYGWIN: _WIN32 to defined manually,  __GNUC__ is defined,     _MSC_VER not defined
 // If GNU GCC MINGW:  _WIN32 automaticaly defined, __GNUC__ is defined,     _MSC_VER not defined
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -16,23 +16,23 @@
 [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.7
+; 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.2.3
 ; 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.7
+OutputBaseFilename=DoliWamp-3.2.3
+; Define full path from wich all relative path are defined
+; You must modify this to put here your dolibarr root directory
+;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old
+SourceDir=Z:\home\ldestail\git\dolibarr_old
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
-; Define full path from which all relative path are defined
-; You must modify this to put here your dolibarr root directory
-;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
-SourceDir=..\..\..
 AppId=doliwamp
 AppPublisher=NLTechno
 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-2015 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2012 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -51,6 +51,7 @@ CreateUninstallRegKey=yes
 OutputDir=build
 ShowLanguageDialog=auto
 ShowUndisplayableLanguages=no
+;LanguageDetectionMethod=none
 LanguageDetectionMethod=uilanguage
 ;SignedUninstaller=yes

@@ -80,18 +81,18 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.2.11\logs"
+Name: "{app}\bin\apache\apache2.2.6\logs"

 [Files]
 ; Stop/start
 Source: "build\exe\doliwamp\stopdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion; AfterInstall: close()
 Source: "build\exe\doliwamp\startdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\removefiles.bat"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundoliwamp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundolihelp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundoliadmin.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\mysqlinitpassword.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
@@ -99,27 +100,26 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
-; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.11\*.*"; DestDir: "{app}\bin\apache\apache2.2.11"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.3.0\*.*"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; 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"
+Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.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: "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"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,telephonie\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\install.forced.php"
+Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*"
+Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.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: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
+Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 ; Config files
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.11\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.6\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -133,7 +133,6 @@ Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion;
 [Icons]
 Name: "{group}\Dolibarr ERP-CRM"; Filename: "{app}\rundoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
 Name: "{group}\Tools\Help center"; Filename: "{app}\rundolihelp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolihelp.ico
-Name: "{group}\Tools\Host your ERP-CRM in the Cloud"; Filename: "http://wiki.dolibarr.org/index.php/Cloud_Solutions"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolihelp.ico
 Name: "{group}\Tools\Start DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliwampon.ico
 Name: "{group}\Tools\Stop DoliWamp server"; Filename: "{app}\stopdoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliwampoff.ico
 Name: "{group}\Tools\Admin DoliWamp server"; Filename: "{app}\rundoliadmin.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliadmin.ico
@@ -195,8 +194,8 @@ end;
 procedure InitializeWizard();
 begin
  //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.2.11';
-  phpVersion := '5.3.0' ;
+  apacheVersion := '2.2.6';
+  phpVersion := '5.2.5' ;
  mysqlVersion := '5.0.45';
  phpmyadminVersion := '3.2.0.1';

@@ -384,6 +383,8 @@ begin

    phpDllCopy := 'php5activescript.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'php5isapi.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'php5nsapi.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'php5ts.dll';
@@ -531,14 +532,7 @@ begin
 	      end;
 	      if browser = 'iexplore.exe' then
 	      begin
-            if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
-            begin
-               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, pfPath+'/Internet Explorer','exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
-	        end
-	        else
-	        begin
-               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
-	        end;
+	        GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
 	      end;
 	
 	      LoadStringFromFile (srcFile, srcContents);
@@ -635,11 +629,10 @@ begin
 		    if not FileExists (destFile) and FileExists (srcFile) then
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
-
+		
 		      //installDir et version de php
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
-              StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		
@@ -878,7 +871,6 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
-              StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
 		
@@ -894,7 +886,6 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
-              StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
 		
@@ -1017,3 +1008,6 @@ Type: filesandordirs; Name: "{app}\www\dolibarr"

 [UninstallRun]
 Filename: "{app}\uninstall_services.bat"; Flags: runhidden
+
+
+
--- a/build/exe/doliwamp/doliwampsmall.bmp
+++ b/build/exe/doliwamp/doliwampsmall.bmp
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -326,7 +326,6 @@ else

 // Read PHP extensions
 $loaded_extensions = get_loaded_extensions();
-$phpExtContents='';
 foreach ($loaded_extensions as $extension)
 	$phpExtContents .= "<li>${extension}</li>";

@@ -335,7 +334,6 @@ foreach ($loaded_extensions as $extension)
 // Read alias directory
 $listoffile=array();
 $aliasarray=array();
-$aliasContents='';
 if (is_dir($aliasDir))
 {
    $handle=opendir($aliasDir);
@@ -532,6 +530,7 @@ a:hover {
 </td>
 <td align="right">
 	<ul class="utility">
+		<li>${wampserverVersion}</li>
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -375,7 +375,7 @@ display_errors = On
 ; Even when display_errors is on, errors that occur during PHP's startup
 ; sequence are not displayed.  It's strongly recommended to keep
 ; display_startup_errors off, except for when debugging.
-display_startup_errors = On
+display_startup_errors = Off

 ; Log errors into a log file (server-specific log, stderr, or error_log (below))
 ; As stated above, you're strongly advised to use error logging in place of
@@ -534,7 +534,7 @@ doc_root =
 user_dir =

 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "WAMPROOT/bin/php/phpWAMPPHPVERSION/ext/"
+extension_dir = "WAMPROOT/bin/php/php5.2.5/ext/"

 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -603,7 +603,7 @@ upload_max_filesize = 2M
 ;;;;;;;;;;;;;;;;;;

 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+allow_url_fopen = Off

 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 allow_url_include = Off
@@ -657,7 +657,7 @@ extension=php_bz2.dll
 extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
-;extension=php_exif.dll
+extension=php_exif.dll
 ;extension=php_fdf.dll
 extension=php_gd2.dll
 ;extension=php_gettext.dll
@@ -677,7 +677,7 @@ extension=php_mysql.dll
 extension=php_mysqli.dll
 ;extension=php_oci8.dll
 extension=php_openssl.dll
-;extension=php_pdo.dll              ; for php 5.2.11
+extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 extension=php_pdo_mysql.dll
@@ -685,19 +685,19 @@ extension=php_pdo_mysql.dll
 ;extension=php_pdo_oci8.dll
 ;extension=php_pdo_odbc.dll
 ;extension=php_pdo_pgsql.dll
-extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
+;extension=php_pdo_sqlite.dll
+extension=php_pgsql.dll
 ;extension=php_pspell.dll
-;extension=php_shmop.dll
+extension=php_shmop.dll
 ;extension=php_snmp.dll
 extension=php_soap.dll
 extension=php_sockets.dll
-;extension=php_sqlite.dll
+extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
+extension=php_zip.dll
 ;extension=php_xdebug-2.0.5-5.2.dll


@@ -710,8 +710,7 @@ extension=php_sockets.dll
 ; date.timezone = UTC          => You have local = greenwich.
 ; date.timzeone = Europe/Paris => To use TZ+1
 ; See http://php.net/date.timezone
-date.timezone = UTC
-;date.timezone = USERTIMEZONE
+;date.timezone =

 ;date.default_latitude = 31.7667
 ;date.default_longitude = 35.2333
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -12,10 +12,7 @@ a package onto LaunchPad
 # To install all packagers tools:
 # sudo apt-get install bzr-builder bzr dpatch pbuilder debootstrap devscripts

-
 # Init local working env
-#----------------------------------
-
 - Create account on launchpad.org
 - Create Project
 - Link project to official SCM server
@@ -24,136 +21,65 @@ a package onto LaunchPad
 - Run from command line: 
    bzr launchpad-login yourlogin
    bzr whoami "Your Name <email@email.com>"
-    bzr whoami
- Edit file ~/.bashrc to add
-DEBFULLNAME="<Your name>" 
-DEBEMAIL="<Your email address>" 
- Create a Bazaar directory
-    mkdir bzr
-
-If you want to build/test package locally:
- Create a file ~/.pbuilderrc with content
+- Create a file /.pbuilderrc with content
    COMPONENTS="main universe multiverse restricted"
 - Create chroot ubuntu env
    sudo pbuilder create [--distribution sid|squeeze]
+- Edit file ~/.bashrc ti add
+DEBFULLNAME="<Your name>" 
+DEBEMAIL="<Your email address>" 

-
-# Push/declare Dolibarr sources to Launchpad
-#----------------------------------
- From Launchpad project (https://launchpad.net/dolibarr), register a series: 
-    Call it 'trunk' or 'beta' or 'stable'
-    Use branch (dev):
-    ~eldy/dolibarr/develop
-    ~eldy/dolibarr/beta
-    ~eldy/dolibarr/stable
-    or 
-    Use URL pattern (beta or stable):
-    For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
-    For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
-    
- For Dev, you can also add link serie to GIT HEAD.
- For beta and stable, you can init from command line
-	cd bzr/dolibarr-[beta|stable]
-    bzr init
-    bzr add
-    bzr commit -m "Init"
-    bzr push lp:~yourlogin/dolibarr/[beta|stable]
-
- List of series are visible here: https://launchpad.net/dolibarr/+series
-
-# To update Dolibarr into launchpad (when repository for sources already exists)
-#----------------------------------
-	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
-    cd dolibarr-[dev|beta|stable]
-    bzr status
-	-- Update files here --
-    bzr commit -m "Description of change"
-    bzr push
-
-# Init debian dir repository into launchpad (when repository for sources does not exist)
-#----------------------------------
-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+# Init package tools for launchpad
+- Create a Bazaar directory
+    mkdir bzr
+- Create debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
    cd bzr
    mkdir debian
    cd debian
-    cp -pr dolibarr_root/debian bzr/debian
    bzr init
-    bzr add
-    bzr commit -m "Init control files"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
- or download it from launchpad bazaar:
+    cp -pr dolibarr_root/debian bzr/debian
+    bzr add debian
+    bzr commit -m "Init"
+    bzr push lp:~eldy/dolibarr/debian
+  or download it from launchpad bazaar:
    cd bzr
-    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-
-# Get debian dir repository from launchpad (when repository for sources already exists)
-#----------------------------------
-	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-
-# To update debian dir into launchpad (when repository for sources already exists)
-#----------------------------------
-	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-    cd debian-[dev|beta|stable]
-    bzr status
-	-- Update files here --
+    bzr branch lp:~eldy/dolibarr/debian
+- To update this debian directory, edit files into the bzr dir and run
    bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
-
-
-# Define a recipe into launchpad (a rule to build packages into a PPA)
-#----------------------------------
+    bzr push lp:~eldy/dolibarr/debian
 - Create a file dolibarr.recipe with content
    cd bzr
    vi dolibarr.recipe
-    	For dev:
-	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
-		lp:dolibarr
-		merge packaging lp:~yourlogin/+junk/debian-dev
-    	For beta:
-	    # bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
-		lp:dolibarr/beta
-		merge packaging lp:~yourlogin/+junk/debian-beta
-    	For stable:
-	    # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
-		lp:dolibarr/stable
-		merge packaging lp:~yourlogin/+junk/debian-stable
+        # bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
+        lp:dolibarr
+        merge packaging lp:~eldy/dolibarr/debian
 - Run command
    cd bzr
    bzr dailydeb dolibarr.recipe working-dir
-  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|beta|stable]
+  This will create a directory "working-dir" with dolibarr sources and will add sources from ~eldy/dolibarr/debian
 - Test package sources
    sudo pbuilder build <working-dir>/<project>_<version>.dsc

-List of recipes created
-https://code.launchpad.net/~eldy/+recipe/dolibarr-dev
-https://code.launchpad.net/~eldy/+recipe/dolibarr-beta
-https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
-
    
-# To get/download package from PPA:
-#----------------------------------
-
- Add signing key of the Launchpad repository:
+# To get/download package:
+Add signing key of the Launchpad repository:
 > gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
 > sudo apt-key add ~/.gnupg/pubring.gpg

- Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
+Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
 For the development snapshot version: 
-deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
-deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
-For the beta version: 
-deb http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
-deb-src http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main 
+deb http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
+deb-src http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
 For the stable version:
-deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
-deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
+deb http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 
+deb-src http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 

- Update your package cache:
+Update your package cache:
 > apt-get update

- Install Dolibarr: 
+Install Dolibarr: 
 > apt-get install dolibarr

-   
+
+    
+    
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,51 +2,49 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
-#
-# This is list of constant you can set to have generated packages moved into a specific dir: 
-#DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
-#DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'
-#DESTIMODULES='/media/HDDATA1_LD/Mes Sites/Web/Admin1/wwwroot/files/modules'
-#DESTIDOLIMEDBETARC='/media/HDDATA1_LD/Mes Sites/Web/DoliCloud/dolimed.com/htdocs/files/lastbuild'
-#DESTIDOLIMEDMODULES='/media/HDDATA1_LD/Mes Sites/Web/DoliCloud/dolimed.com/htdocs/files/modules'
-#DESTIDOLIMEDSTABLE='/media/HDDATA1_LD/Mes Sites/Web/DoliCloud/dolimed.com/htdocs/files/stable'
+# \author       (c)2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

 use Cwd;

 $PROJECT="dolibarr";
+$MAJOR="3";
+$MINOR="2";
+$BUILD="4";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD

@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
-%REQUIREMENTPUBLISH=(
-"SF"=>"git ssh rsync"
-);
 %REQUIREMENTTARGET=(                            # Tool requirement for each package
+"SNAPSHOT"=>"tar",
 "TGZ"=>"tar",
 "ZIP"=>"7z",
-"XZ"=>"xz",
 "RPM_GENERIC"=>"rpmbuild",
 "RPM_FEDORA"=>"rpmbuild",
 "RPM_MANDRIVA"=>"rpmbuild",
 "RPM_OPENSUSE"=>"rpmbuild",
 "DEB"=>"dpkg",
 "APS"=>"zip",
-"EXEDOLIWAMP"=>"ISCC.exe",
-"SNAPSHOT"=>"tar"
+"EXEDOLIWAMP"=>"ISCC.exe"
 );
 %ALTERNATEPATH=(
 "7z"=>"7-ZIP",
 "makensis.exe"=>"NSIS"
 );

-if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
-if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
-if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake
+$FILENAME="$PROJECT";
+$FILENAMESNAPSHOT="$PROJECT-snapshot";
+$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
+$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
+$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
+$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD";
+if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat
+if (-d "/usr/src/RPM")    { $RPMDIR="/usr/src/RPM"; } # mandrake


 use vars qw/ $REVISION $VERSION /;
-$VERSION="3.3";
+$VERSION="3.2";



@@ -58,24 +56,6 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;

 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-$PUBLISH="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
-{
-    print "Error: Missing environment variables.\n";
-	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
-	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
-	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
-	print "$PROG.$Extension aborted.\n";
-    sleep 2;
-	exit 1;
-}
-if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
-{
-    print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
-	print "$PROG.$Extension aborted.\n";
-    sleep 2;
-	exit 1;
-}

 # Detect OS type
 # --------------
@@ -83,7 +63,7 @@ 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 "Error: Can't detect your OS.\n";
+    print "$PROG.$Extension was not able to detect your OS.\n";
 	print "Can't continue.\n";
 	print "$PROG.$Extension aborted.\n";
    sleep 2;
@@ -112,57 +92,7 @@ if (! $TEMP || ! -d $TEMP) {
 $BUILDROOT="$TEMP/buildroot";


-# 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\.]+)'\)/ ) { $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"; }
-
-# Set vars for packaging
-$FILENAME            = "$PROJECT";
-$FILENAMESNAPSHOT    = "$PROJECT-snapshot";
-$FILENAMETGZ         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEZIP         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEXZ          = "$PROJECT-$MAJOR.$MINOR.$BUILD";
-$FILENAMEDEB         = "see later";
-$FILENAMEAPS         = "$PROJECT-$MAJOR.$MINOR.$BUILD.app";
-$FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
-# For RPM
-$ARCH='noarch';
-$newbuild = $BUILD;
-$newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev (fedora)
-$newbuild =~ s/beta/0.2.beta1/gi;				# beta (fedora)
-$newbuild =~ s/rc./0.3.rc1/gi;					# rc (fedora)
-if ($newbuild !~ /-/) { $newbuild.='-0.3'; }	# finale (fedora)
-#$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-#$newbuild =~ s/beta/1/gi;						# beta
-#$newbuild =~ s/rc./2/gi;						# rc
-#if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
-if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
-$FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";
-$FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
-# For Deb
-$newbuild = $BUILD;
-$newbuild =~ s/(dev|alpha)/1/gi;                # dev
-$newbuild =~ s/beta/2/gi;                       # beta
-$newbuild =~ s/rc./3/gi;                        # rc
-if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc. 
-# now newbuild is 0-1 or 0-3 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
-$build = $newbuild;
-$build =~ s/-.*$//g;
-# now build is 0 for example
-# $build .= '+nmu1';
-# now build is 0+nmu1 for example
-$FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
-$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
-
-
-my $copyalreadydone=0;
+my $copyalreadydone=0;      # Use "-" before number of choice to avoid copy
 my $batch=0;
 for (0..@ARGV-1) {
 	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
@@ -172,47 +102,41 @@ for (0..@ARGV-1) {
    	$FILENAMESNAPSHOT.="-".$PREFIX; 
    }
 }
-if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTIBETARC is defined
-if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTISTABLE is defined
-if ($ENV{"PUBLISHBETARC"} && $BUILD =~ /[a-z]/i)   { $PUBLISH = $ENV{"PUBLISHBETARC"}; }	# Force target site for publishing if env PUBLISHBETARC is defined
-if ($ENV{"PUBLISHSTABLE"} && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $ENV{"PUBLISHSTABLE"}; }	# Force target site for publishing if env PUBLISHSTABLE is defined
+if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)    { $DESTI = $ENV{"DESTIBETARC"}; }		# Force output dir if env DESTI is defined
+if ($ENV{"DESTISTABLE"}  && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTI is defined
+

 print "Makepack version $VERSION\n";
-print "Building/publishing package name: $PROJECT\n";
-print "Building/publishing package version: $MAJOR.$MINOR.$BUILD\n";
+print "Building package name: $PROJECT\n";
+print "Building package version: $MAJOR.$MINOR.$BUILD\n";
 print "Source directory (SOURCE): $SOURCE\n";
 print "Target directory (DESTI) : $DESTI\n";
-print "Publishing target (PUBLISH): $PUBLISH\n";


 # Choose package targets
 #-----------------------
 if ($target) {
-	if ($target eq "ALL") { 
-		foreach my $key (@LISTETARGET) {
-	    	if ($key ne 'SNAPSHOT' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
-		}
-	}
-	if ($target ne "ALL" && $target ne "SF") { $CHOOSEDTARGET{uc($target)}=1; }
-	if ($target eq "SF") { $CHOOSEDPUBLISH{"SF"}=1; }
+    $CHOOSEDTARGET{uc($target)}=1;
 }
 else {
    my $found=0;
    my $NUM_SCRIPT;
-   	my $cpt=0;
    while (! $found) {
-    	printf(" %2d - %-12s    (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+    	my $cpt=0;
+    	printf(" %2d - %-12s    (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET));
    	foreach my $target (@LISTETARGET) {
    		$cpt++;
    		printf(" %2d - %-12s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
    	}
-    	$cpt=99;
-    	printf(" %2d - %-12s    (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
    
-    	# Ask which target to build
+    	# On demande de choisir le fichier à passer
    	print "Choose one package number or several separated with space (0 - ".$cpt."): ";
    	$NUM_SCRIPT=<STDIN>; 
    	chomp($NUM_SCRIPT);
+    	if ($NUM_SCRIPT =~ s/-//g) {
+    		# Do not do copy	
+    		$copyalreadydone=1;
+    	}
    	if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
    	{
    		print "This is not a valid package number list.\n";
@@ -224,20 +148,15 @@ else {
    	}
    }
    print "\n";
-    if ($NUM_SCRIPT eq "99") {
-   		$CHOOSEDPUBLISH{"SF"}=1;
+    if ($NUM_SCRIPT) {
+    	foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+    		$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+    	}
    }
    else {
-	    if ($NUM_SCRIPT eq "0") {
-	    	foreach my $key (@LISTETARGET) {
-	    		if ($key ne 'SNAPSHOT' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
-	        }
-	    }
-	    else {
-	   		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-	   			$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-	   		}
-	    }
+    	foreach my $key (@LISTETARGET) {
+    		if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; }
+        }
    }
 }

@@ -254,13 +173,11 @@ foreach my $target (keys %CHOOSEDTARGET) {
 		}
 		$atleastonerpm=1;			
 	} 
-    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
-    {
+    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
        # Test    
        print "Test requirement for target $target: Search '$req'... ";
        $newreq=$req; $newparam='';
        if ($newreq eq 'zip') { $newparam.='-h'; }
-        if ($newreq eq 'xz') { $newparam.='-h'; }
        $cmd="\"$newreq\" $newparam 2>&1";
        print "Test command ".$cmd."... ";
        $ret=`$cmd`;
@@ -279,7 +196,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
            last;
        } else {
            # Pas erreur ou erreur autre que programme absent
-            print " Found ".$req."\n";
+            print " Found ".$REQUIREMENTTARGET{$target}."\n";
        }
    }
 }
@@ -290,20 +207,16 @@ print "\n";
 #----------------------------------------------
 $nboftargetok=0;
 $nboftargetneedbuildroot=0;
-$nbofpublishneedtag=0;
+$nboftargetneedcvs=0;
 foreach my $target (keys %CHOOSEDTARGET) {
    if ($CHOOSEDTARGET{$target} < 0) { next; }
 	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
 	{
 		$nboftargetneedbuildroot++;
 	}
-	$nboftargetok++;
-}
-foreach my $target (keys %CHOOSEDPUBLISH) {
-    if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-	if ($target eq 'SF')
+	if ($target eq 'SNAPSHOT')
 	{
-		$nbofpublishneedtag++;
+		$nboftargetneedcvs++;
 	}
 	$nboftargetok++;
 }
@@ -312,26 +225,13 @@ if ($nboftargetok) {

    # Update CVS if required
    #-----------------------
-    if ($nbofpublishneedtag)
+    if ($nboftargetneedcvs)
 	{
    	print "Go to directory $SOURCE\n";
   		$olddir=getcwd();
   		chdir("$SOURCE");
-    	print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-    	$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-    	if ($ret =~ /already exists/)
-    	{
-    		print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
-	    	$QUESTIONOVERWRITETAG=<STDIN>; 
-	    	chomp($QUESTIONOVERWRITETAG);
-	    	if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
-	    	{
-		    	print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-		    	$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
-	    	}
-    	}
-    	print 'Run git push --tags'."\n";
-    	$ret=`git push --tags`;
+    	print "Run cvs update -P -d\n";
+    	$ret=`cvs update -P -d 2>&1`;
    	chdir("$olddir");
 	}
 	
@@ -349,21 +249,15 @@ if ($nboftargetok) {
 	    	mkdir "$BUILDROOT/$PROJECT";
 	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
 	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
-
-	    	print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
-	    	$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
 	    }
 	    print "Clean $BUILDROOT\n";
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.git`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitmodules`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
@@ -379,7 +273,6 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
@@ -393,8 +286,6 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;

-        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
-
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
@@ -424,31 +315,16 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;

-	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
-   	    
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/lightbox`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
@@ -456,9 +332,8 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
-
+    
    # Build package for each target
    #------------------------------
    foreach my $target (keys %CHOOSEDTARGET) 
@@ -481,7 +356,8 @@ if ($nboftargetok) {
            $ret=`$cmd`;

    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
-   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+   		    #$cmd="tar --exclude \"$BUILDROOT/tgz/tar_exclude.txt\" --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
 			print $cmd."\n";
 			$ret=`$cmd`;

@@ -494,7 +370,6 @@ if ($nboftargetok) {
    	if ($target eq 'TGZ') 
    	{
    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 

    		print "Remove target $FILENAMETGZ.tgz...\n";
@@ -506,58 +381,21 @@ if ($nboftargetok) {
    		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
            $ret=`$cmd`;

-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-			
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/exe`;
+
    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-   		    print "$cmd\n";
+   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
   		    $ret=`$cmd`;

    		# Move to final dir
-       		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-       		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+       		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+       		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
    		next;
    	}

-    	if ($target eq 'XZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
-			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
-
-    		print "Remove target $FILENAMEXZ.xz...\n";
-    		unlink("$NEWDESTI/$FILENAMEXZ.xz");
-
-            #rmdir "$BUILDROOT/$FILENAMEXZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
-            $ret=`$cmd`;
-
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-			
-    		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
-			print $cmd."\n";
-			$ret= `$cmd`;
-            chdir("$olddir");
-
-    		# Move to final dir
-            print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
-    		next;
-    	}
-    	
    	if ($target eq 'ZIP') 
    	{
    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 

    		print "Remove target $FILENAMEZIP.zip...\n";
@@ -569,9 +407,6 @@ if ($nboftargetok) {
    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
            $ret=`$cmd`;

-		    $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-
    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 
            print "Go to directory $BUILDROOT\n";
@@ -595,18 +430,28 @@ if ($nboftargetok) {
    		if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
    		if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
    		if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
-    		mkdir($DESTI.'/'.$subdir);
 			if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } 

+    		$ARCH='noarch';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
-
+           	$newbuild = $BUILD;
+           	# For fedora
+            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
+            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
+            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            #$newbuild =~ s/beta/1/gi;						# beta
+            #$newbuild =~ s/rc./2/gi;						# rc
+            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";

-            #print "Create directory $RPMDIR\n";
-            #$ret=`mkdir -p "$RPMDIR"`;
+            $FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";

-    		print "Remove target ".$FILENAMERPM."...\n";
-    		unlink("$NEWDESTI/".$FILENAMERPM);
+    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n";
+    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm");
    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");

@@ -617,8 +462,8 @@ if ($nboftargetok) {
            $ret=`$cmd`;

 			# Set owners
-            #print "Set owners on files/dir\n";
-		    #$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
+            print "Set owners on files/dir\n";
+		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;

            print "Set permissions on files/dir\n";
 		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@@ -638,12 +483,7 @@ if ($nboftargetok) {
    		if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
    		if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
    		if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
-			
-			use Date::Language;
-			$lang=Date::Language->new('English');
-			$datestring = $lang->time2str("%a %b %e %Y", time);
-    		$changelogstring="* ".$datestring." Laurent Destailleur $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
-
+    		
 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
@@ -651,12 +491,11 @@ if ($nboftargetok) {
                $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                $_ =~ s/__CHANGELOGSTRING__/$changelogstring/;
                print SPECTO $_;
            }
            close SPECFROM;
            close SPECTO;
-
+    
    		print "Copy patch file to $RPMDIR/SOURCES\n";
    		$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
 		    $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
@@ -664,12 +503,14 @@ if ($nboftargetok) {
    		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
    		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
    		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
-
+    	
    		# Move to final dir
   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
+   		    #$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
   		    $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
    		$ret=`$cmd`;
   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
+   		    #$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
   		    $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
    		$ret=`$cmd`;
   		    print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
@@ -681,11 +522,23 @@ if ($nboftargetok) {
    	if ($target eq 'DEB') 
    	{
    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_debian-ubuntu');
 			if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } 

            $olddir=getcwd();

+            $newbuild = $BUILD;
+            $newbuild =~ s/(dev|alpha)/1/gi;                # dev
+            $newbuild =~ s/beta/2/gi;                       # beta
+            $newbuild =~ s/rc./3/gi;                        # rc
+            if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale
+            # now newbuild is 0-1 or 0-4 for example
+            print "Version is $MAJOR.$MINOR.$newbuild\n";
+            $build = $newbuild;
+            $build =~ s/-.*$//g;
+			# now build is 0 for example
+			$build .= '+nmu1';
+			# now build is 0+nmu1 for example
+			
    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
    		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
    		print "Remove target ${FILENAMEDEB}.dsc...\n";
@@ -694,8 +547,6 @@ if ($nboftargetok) {
    		unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
    		print "Remove target ${FILENAMEDEB}.changes...\n";
    		unlink("$NEWDESTI/${FILENAMEDEB}.changes");
-    		print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");

    		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
    		$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
@@ -703,8 +554,6 @@ if ($nboftargetok) {
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
-			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
-			$ret=`$cmd`;

 			print "Remove other files\n";
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
@@ -732,7 +581,7 @@ if ($nboftargetok) {
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/wash`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
@@ -741,9 +590,13 @@ if ($nboftargetok) {
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
-            # Rename upstream changelog to match debian rules
-			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
-			
+            # We remove embedded libraries or fonts (this is also inside rules file, target clean)
+	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/fonts`,
+	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/geoip`;
+	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/nusoap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/odtphp/zip/pclzip`;
+
            # Prepare source package (init debian dir)
            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -760,24 +613,18 @@ if ($nboftargetok) {
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/README.source"  "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
            # Add files also required to build binary package
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
            
 			# Set owners and permissions
-            #print "Set owners on files/dir\n";
-		    #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
-
+            print "Set owners on files/dir\n";
+		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
            print "Set permissions on files/dir\n";
 		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
 		    $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
@@ -798,43 +645,28 @@ if ($nboftargetok) {
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
            
          
            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
            $ret=`$cmd`;

-
-     		print "Go into directory $BUILDROOT\n";
-            chdir("$BUILDROOT");
-			
-			# We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native)
-    		print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
-   		    print $cmd."\n";
-   		    $ret=`$cmd`;
-
 			# Creation of source package          
     		print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
            $cmd="dpkg-buildpackage -us -uc";
            print "Launch DEB build ($cmd)\n";
-            $ret=`$cmd 2>&1 3>&1`;
+            $ret=`$cmd`;
            print $ret."\n";

            chdir("$olddir");
    		
-    		print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
-    		print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
-    		
    		# Move to final dir
-            print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
+            print "Move *_all.deb to $NEWDESTI\n";
            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
            $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
+            $ret=`mv $BUILDROOT/*.tar.gz "$NEWDESTI/"`;
            $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
        	next;
        }
@@ -842,7 +674,6 @@ if ($nboftargetok) {
    	if ($target eq 'APS') 
    	{
 			$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_aps');
 			if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } 
 			
            $newbuild = $BUILD;
@@ -927,7 +758,6 @@ if ($nboftargetok) {
    	if ($target eq 'EXEDOLIWAMP')
    	{
    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_windows');
 			if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } 
    		
     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
@@ -949,84 +779,6 @@ if ($nboftargetok) {
    		next;
    	}
    }
-
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDPUBLISH) 
-    {
-        if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-    
-		print "\nList of files to publish\n";
-    	%filestoscan=(
-    		"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
-    		"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-    		"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
-    		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
-    		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
-    	);
-    	use POSIX qw/strftime/;
-    	foreach my $file (sort keys %filestoscan)
-    	{
-    		$found=0;
-    		my $filesize = -s $file;
-    		my $filedate = (stat $file)[9];
-    		print $file." ".($filesize?"(found)":"(not found)");
-    		print ($filesize?" - ".$filesize:"");
-    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
-    		print "\n";
-    	}
-
-    	if ($target eq 'SF') 
-    	{
-    		print "\n";
-    		
-    		$NEWPUBLISH=$PUBLISH;
-    		print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
-
-	    	# Ask which target to build
-	    	$NUM_SCRIPT=<STDIN>; 
-	    	chomp($NUM_SCRIPT);
-
-			print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n";
-            $ret=`mkdir -p "/tmp/emptydir/"`;
-            
-	    	foreach my $file (sort keys %filestoscan)
-	    	{
-	    		$found=0;
-	    		my $filesize = -s $file;
-	    		if (! $filesize) { next; }
-
-				print "\n";
-	    		print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-	    		
-	    		$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-
-				# mkdir	   
-				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
-				#$ssh->login("$user","$pass"); 		
-	    		#use String::ShellQuote qw( shell_quote );
-				#$ssh->cmd('mkdir '.shell_quote($destFolder).' && exit');
-
-				#use Net::SFTP::Foreign;
-				#my $sftp = Net::SFTP::Foreign->new($ip, user => $user, password => $pass, autodie => 1);
-				#$sftp->mkdir($destFolder)
-
-				#$command="ssh eldy,dolibarr\@frs.sourceforge.net mkdir -p \"$destFolder\"";
-				#print "$command\n";	
-				#my $ret=`$command 2>&1`;
-				$command="rsync -s -e 'ssh' --recursive /tmp/emptydir/ \"".$destFolder."\"";
-				print "$command\n";	
-				my $ret=`$command 2>&1`;
-
-				$command="rsync -s $OPTIONUPDATEDIST -e 'ssh' \"$file\" \"".$destFolder."\"";
-				print "$command\n";	
-				my $ret=`$command 2>&1`;
-				print "$ret\n";
-	    		
-	    	}
-
-    	}
-    }    
 }

 print "\n----- Summary -----\n";
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -2,15 +2,13 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarrmodule.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

 use Cwd;
-$OWNER="ldestailleur";
-$GROUP="ldestailleur";


-@LISTETARGET=("ZIP");   # Possible packages
+@LISTETARGET=("TGZ");   # Possible packages
 %REQUIREMENTTARGET=(    # Tool requirement for each package
 "TGZ"=>"tar",
 "ZIP"=>"7z"
@@ -20,8 +18,8 @@ $GROUP="ldestailleur";


 use vars qw/ $REVISION $VERSION /;
-$REVISION='1.0';
-$VERSION="3.5 (build $REVISION)";
+$REVISION='1.20';
+$VERSION="1.0 (build $REVISION)";



@@ -37,9 +35,9 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "$PROG.$Extension was not able to detect your OS.\n";
+    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
    sleep 2;
 	exit 1;
 }
@@ -59,7 +57,7 @@ if ($OS =~ /windows/) {
 if (! $TEMP || ! -d $TEMP) {
    print "Error: A temporary directory can not be find.\n";
    print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
    sleep 2;
    exit 2;
 } 
@@ -79,15 +77,26 @@ for (0..@ARGV-1) {
 }
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
-$NEWDESTI=$DESTI;
+if ($ENV{"DESTI"}) { $DESTI = $ENV{"DESTI"}; }		# Force output dir if env DESTI is defined


 print "Makepack for modules version $VERSION\n";
 print "Source directory: $SOURCE\n";
-print "Target directory: $NEWDESTI\n";
+print "Target directory: $DESTI\n";


+# Ask and set version $MAJOR and $MINOR
+print "Enter value for version: ";
+$PROJVERSION=<STDIN>;
+chomp($PROJVERSION);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '')
+{
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
+}
+
 # Ask module
 print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
 $PROJECTINPUT=<STDIN>;
@@ -118,8 +127,6 @@ else
 # Loop on each projects
 foreach my $PROJECT (@PROJECTLIST) {
 	
-	$PROJECTLC=lc($PROJECT);
-	
 	if (! -f "makepack-".$PROJECT.".conf")
 	{
 	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
@@ -131,28 +138,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    exit 2;
 	}
 	
-	# Get version $MAJOR, $MINOR and $BUILD
-	print "Version detected for module ".$PROJECT.": ";
-	$result=open(IN,"<".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php");
-	if (! $result) { die "Error: Can't open descriptor file ".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; }
-    while(<IN>)
-    {
-    	if ($_ =~ /this->version\s*=\s*'([\d\.]+)'/) { $PROJVERSION=$1; break; }
-    }
-    close IN;
-	print $PROJVERSION."\n";
-
-	($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-	if ($MINOR eq '')
-	{
-	    print "Enter value for minor version for module ".$PROJECT.": ";
-	    $MINOR=<STDIN>;
-	    chomp($MINOR);
-	}
-		
-	$FILENAME="$PROJECTLC";
-	$FILENAMETGZ="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR";
 	if (-d "/usr/src/redhat") {
 	    # redhat
 	    $RPMDIR="/usr/src/redhat";
@@ -239,66 +227,54 @@ foreach my $PROJECT (@PROJECTLIST) {
 		    	$ret=`rm -fr "$BUILDROOT"`;
 	
 		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECTLC";
+		    	mkdir "$BUILDROOT/$PROJECT";
 		    	
 				$result=open(IN,"<makepack-".$PROJECT.".conf");
 				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
 			    while(<IN>)
 			    {
-			    	$entry=$_;
-			    	
-			    	if ($entry =~ /^#/) { next; }	# Do not process comments
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
 					
-					$entry =~ s/\n//;
-
-			    	if ($entry =~ /^!(.*)$/)		# Exclude so remove file/dir
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
 			    	{
-			    		print "Remove $BUILDROOT/$PROJECTLC/$1\n";
-			    		$ret=`rm -fr "$BUILDROOT/$PROJECTLC/"$1`;
-		    		    if ($? != 0) { die "Failed to delete a file to exclude declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; }
-		    		    next; 
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
 			    	}
-					
-					$entry =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECTLC/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/$1"`;
-			    	if ($entry !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$entry into $BUILDROOT/$PROJECTLC/$entry\n";
-		    		    $ret=`cp -pr "$SOURCE/$entry" "$BUILDROOT/$PROJECTLC/$entry"`;
-		    		    if ($? != 0) { die "Failed to make copy of a file declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } 
-			    	}
-			    	
 				}	
 				close IN;
 				
 				@timearray=localtime(time());
 				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-				open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt");
+				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
 		
-				print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n";
-				$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`;
-				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
+				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
+				print VF "Version: ".$MAJOR.".".$MINOR."\n";
 				print VF "Build  : ".$fulldate."\n";
 				close VF;
 		    }
 		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom2`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/Thumbs.db $BUILDROOT/$PROJECTLC/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/CVS* $BUILDROOT/$PROJECTLC/*/CVS* $BUILDROOT/$PROJECTLC/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/*/CVS*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
 		}    
 	    
 	    # Build package for each target
@@ -336,9 +312,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
 	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 	
-	            print "Go to directory $BUILDROOT/$PROJECTLC\n";
+	            print "Go to directory $BUILDROOT/$PROJECT\n";
 	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT/$PROJECTLC");
+	     		chdir("$BUILDROOT/$PROJECT");
 	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
 				print $cmd."\n";
 				$ret= `$cmd`;
@@ -346,7 +322,6 @@ foreach my $PROJECT (@PROJECTLIST) {
 	
 	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
 	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	            $ret=`chown $OWNER.$GROUP "$NEWDESTI/$FILENAMEZIP.zip"`;
 	    		next;
 	    	}
 	    
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -8,18 +8,22 @@ 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 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/info in /ChangeLog and /filefunc.inc.php
+- Update version number with x.x.x   in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.x.x   in build/perl/virtualmin/dolibarr.pl
+- Update version number with x.x.x-y in build/makepack-dolibarr.pl
+- Update version number with x.x.x-y in build/debian/changelog
+- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x-y in htdocs/filefunc.inc.php
+- Update version number with x.x.x-y in htdocs/install/inc.php
+- Update version number with x.x.x-y in htdocs/support/inc.php
+- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
 - Commit all changes.
- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
- Create a branch (x.y).
+- Add a Tag (DOLIBARR_x_y_BETA)
+- Create a branch (DOLIBARR_x_y_BRANCH).

 - Run makepack-dolibarr.pl to generate all packages.
- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/lastbuild).
+- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).

 - Post a news on dolibarr.org/dolibarr.fr
 - Send mail on mailings-list
@@ -30,22 +34,24 @@ 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 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 version/info in /ChangeLog
+- Update version number with x.x.x-y in build/makepack-dolibarr.pl
+- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x-y in htdocs/filefunc.inc.php
+- Update version number with x.x.x-y in htdocs/install/inc.php
+- Update version number with x.x.x-y in htdocs/support/inc.php
+- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
+- Update PAD files.
 - Commit all changes.
- Add a Tag (x.y.z)
+- Add a Tag (DOLIBARR_x_y)

 - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
 - Check content of built packages.
- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/stable).
- Run makepack-dolibarr.pl again with option to publish files on 
-  sourceforge.
- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
-  on server to point to new files (used by some web sites).
+- 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.

 - Send mail on mailings-list
 - Send news on OpenSource web sites (if major beta or release)
--- a/build/obs/README
+++ b/build/obs/README
@@ -1,45 +0,0 @@
-README (English)
-##################################################
-OBS Package tools
-##################################################
-
-This directory contains files to explain how to publish
-a package onto OBS
-
-
-# Create a project onto OBS
-#----------------------------------
-https://build.opensuse.org
-
-
-Add attributes:
-OBS:Screenshots         URL of screenshot
-OBS:QualityCategory     Development|Testing|Stable|Private
-OBS:Maintained          1
-
-
-To submit a snapshot for building, we should have a service file with content
-<services>
-  <service name="download_src_package">
-    <param name="host">www.dolibarr.org</param>
-    <param name="protocol">http</param>
-    <param name="path">/files/stable/package_rpm_generic/dolibarr-x.y.z-3.src.rpm</param>
-  </service>
-</services>
-
-How to have such a service file created automatically ?
-Click on "Add file", then select mode "Upload From: Remote URL"
-Enter the Remote URL that should looks like this: http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-3.src.rpm
-
-Then add into advanded - attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Testing
-
-
-# Move project into official directory
- Enter a bug to ask to be a maintener of a category or to add a new one.
-For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
-https://build.opensuse.org/project/show/Application:ERP
- Once done, go into project, category, subproject and enter a subproject for your application.
-Fo example: Dolibarr
- Then go onto project into your home and ask a publish to the category/you project your created. 
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.2.2</Program_Version>
+		<Program_Release_Month>09</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -43,6 +43,7 @@
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
 			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+


 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
@@ -81,6 +82,11 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 	</Web_Info>
 	<Permissions>
 		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
 		<ASP_Member_Number />
 	</ASP>
 	<Affiliates>
@@ -187,9 +193,4 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Affiliates_Yaskifo_Order_Page />
 		<Affiliates_Yaskifo_Vendor_ID />
 		<Affiliates_Yaskifo_Product_ID />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
 		<Affiliates_Yaskifo_Maximum_Commission_Rate />
--- a/build/pad/Dolibarr
+++ b/build/pad/Dolibarr
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-</PADGEN_CML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<Company_Info>
+		<Company_Name>Dolibarr team</Company_Name>
+		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>Dolibarr team</Author_First_Name>
+			<Author_Last_Name>Dolibarr team</Author_Last_Name>
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name>Dolibarr team</Contact_First_Name>
+			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
+			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
+			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
+			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.2.2</Program_Version>
+		<Program_Release_Month>09</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -43,11 +43,31 @@
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
 			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
 			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+

+
 Simple to install
+

+
 Simple to use

+
+
+Simple to develop 
+
+
+
+Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
+


 Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
@@ -56,18 +76,6 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt

 Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)

-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-


 Simple pour le développement (pas de frameworks lourds). 
@@ -88,6 +96,11 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 	<Web_Info>
 		<Application_URLs>
 			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
 		<Download_URLs>
 			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
@@ -194,9 +207,4 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 		<Affiliates_Shareasale_Product_ID />
 		<Affiliates_Shareasale_Maximum_Commission_Rate />
 		<Affiliates_SWReg_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
 		<Affiliates_SWReg_Vendor_ID />
--- a/build/pad/NLTechno.cml
+++ b/build/pad/NLTechno.cml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>11 Rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>dolibarr@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
-			<Support_Email>dolibarr@nltechno.com</Support_Email>
-			<General_Email>dolibarr@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-</PADGEN_CML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -6,26 +6,26 @@
 		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
 		<Address_2 />
 		<City_Town>Rueil Malmaison</City_Town>
 		<State_Province />
 		<Zip_Postal_Code>92500</Zip_Postal_Code>
 		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
 		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
 		</Contact_Info>
 		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
 			<Sales_Phone />
 			<Support_Phone />
 			<General_Phone />
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.2.3</Program_Version>
+		<Program_Release_Month>09</Program_Release_Month>
+		<Program_Release_Day>24</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -46,14 +46,14 @@
 		<Program_Install_Support>No Install Support</Program_Install_Support>
 		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
 		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
+		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
 		<Program_Specific_Category>Business</Program_Specific_Category>
 		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
 		<Program_System_Requirements>None</Program_System_Requirements>
 		<File_Info>
-			<File_Size_Bytes>18037439</File_Size_Bytes>
-			<File_Size_K>18037</File_Size_K>
-			<File_Size_MB>18.03</File_Size_MB>
+			<File_Size_Bytes>9359175</File_Size_Bytes>
+			<File_Size_K>9139</File_Size_K>
+			<File_Size_MB>8.93</File_Size_MB>
 		</File_Info>
 		<Expire_Info>
 			<Has_Expire_Info>N</Has_Expire_Info>
@@ -70,12 +70,16 @@
 			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
 			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
 			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+

+
 Simple to install
+

+
 Simple to use


@@ -83,11 +87,15 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt
 Simple to develop 


-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+
+Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
+		</English>
 		<French>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
 			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):


@@ -118,6 +126,11 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 	<Web_Info>
 		<Application_URLs>
 			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
 		<Download_URLs>
 			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
@@ -224,9 +237,4 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 		<Affiliates_Shareasale_Product_ID />
 		<Affiliates_Shareasale_Maximum_Commission_Rate />
 		<Affiliates_SWReg_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
 		<Affiliates_SWReg_Vendor_ID />
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -17,15 +17,15 @@
 		<Contact_Info>
 			<Author_First_Name>NLTechno</Author_First_Name>
 			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>contact@nltechno.com</Author_Email>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
 			<Contact_First_Name>NLTechno</Contact_First_Name>
 			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>contact@nltechno.com</Contact_Email>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
 		</Contact_Info>
 		<Support_Info>
-			<Sales_Email>support@nltechno.com</Sales_Email>
-			<Support_Email>support@nltechno.com</Support_Email>
-			<General_Email>support@nltechno.com</General_Email>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
 			<Sales_Phone />
 			<Support_Phone />
 			<General_Phone />
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.2.3</Program_Version>
+		<Program_Release_Month>09</Program_Release_Month>
+		<Program_Release_Day>24</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2012 Regis Houssin  <regis.houssin@capnetworks.com>
+# \author       (c)2009-2012 Regis Houssin  <regis@dolibarr.fr>
 #----------------------------------------------------------------------------


@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.5.3", "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.2.1", "3.1.1", "3.0.1", "2.9.0" );
 }

 sub script_dolibarr_category
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -11,24 +11,22 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
 # This is standard command to work on RPM packaging:
 #
 # To install all packagers tools:
-# Fedora: yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
-# OpenSuse: yast --install update-desktop-files
+# yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
 #
 # rpmlint file.rpm				    Test a package
 # mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
 #
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
-# yum -v install dolibarr-...rpm       To install package and dependencies   
-# yum -v erase dolibarr                To remove package
+# yum install dolibarr-...rpm       To install package and dependencies   
+# yum erase dolibarr                To remove package
 # chcon -R -h -t httpd_sys_script_rw_t /file					To add temporary context rw for httpd on /file    
 # semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	To add persistent context rw for httpd on /dir (this add file_contexts.local)
 # restorecon -R -v /file			Restore values into files (cancel chcon, validate semanage)    
 #
 # On OpenSuse
-# zypper install dolibarr-...rpm    To install package and dependencies
-# zypper remove  dolibarr           To remove package
-# zypper search  xxx                To search a package
+# yast --install dolibarr-...rpm    To install package and dependencies
+# yast --remove  dolibarr           To remove package
 #
 # On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -1,7 +1,7 @@
 diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 --- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
 +++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -63,8 +63,8 @@ 
+@@ -64,8 +64,8 @@ 
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -71,8 +71,8 @@
+@@ -84,8 +84,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -29,7 +29,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 --- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
 +++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -69,8 +69,8 @@
+@@ -79,8 +79,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -38,5 +38,5 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
- 
+ $charset="UTF-8";	// If not output format found in any conf file
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -21,7 +21,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;Finance;
+Categories=Office;
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPLv3+
+License: GPLv2+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -103,26 +103,22 @@ 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

 # Lang
-echo "%defattr(0644, root, root, 0755)" > %{name}.lang
-echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
-  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >>%{name}.lang
+done >%{name}.lang


 #---- clean
@@ -135,9 +131,6 @@ done >>%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
-
-%dir %_datadir/dolibarr
-
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -147,8 +140,6 @@ done >>%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

-%dir %_datadir/dolibarr/build
-
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -179,18 +170,13 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
-%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
-%_datadir/dolibarr/htdocs/mailmanspip
-%_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
@@ -204,9 +190,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%dir %{_sysconfdir}/dolibarr
-
-%defattr(0664, root, apache)
+%defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -217,8 +201,6 @@ done >>%{name}.lang
 #---- post (after unzip during install)
 %post

-echo Run post script of packager dolibarr_fedora.spec
-
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
@@ -239,23 +221,23 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-  # 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/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	# 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/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi

-# Create config for SE Linux
+# Create config for se $seconfig
 echo Add SE Linux permissions for dolibarr
 # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
 semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
@@ -265,13 +247,8 @@ restorecon -R -v /var/lib/dolibarr

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    echo Create dolibarr web server config link $apachelink
    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -280,11 +257,18 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr

 # Restart web server
 echo Restart web server
-/sbin/service httpd restart
+if [ -f %{_sysconfdir}/init.d/httpd ]; then
+    %{_sysconfdir}/init.d/httpd restart
+fi
+if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+    %{_sysconfdir}/init.d/apache2 restart
+fi

-# Restart mysql server
-echo Restart mysql server
-/sbin/service mysqld restart
+# Restart mysql
+echo Restart mysql
+if [ -f /etc/init.d/mysqld ]; then
+    /etc/init.d/mysqld restart
+fi

 # Show result
 echo
@@ -298,37 +282,35 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after upgrade or uninstall)
+#---- postun (after uninstall)
 %postun

-if [ "x$1" = "x0" ] ;
-then
-  # Remove
-  echo "Removed package"
+# Define vars
+export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"

-  # Define vars
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
+# Remove apache link
+if [ -L $apachelink ] ;
+then
    echo "Delete apache config link for Dolibarr ($apachelink)"
    %{__rm} -f $apachelink
    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    /sbin/service httpd restart
-  fi
-else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
 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
+# Restart web servers if required
+if [ "x$status" = "xpurge" ] ;
+then
+    # Restart web server
+    echo Restart web server
+    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+        %{_sysconfdir}/init.d/httpd restart
+    fi
+    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+        %{_sysconfdir}/init.d/apache2 restart
+    fi
+fi
+
+
+
 %changelog
-__CHANGELOGSTRING__
+* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3
+- Initial version (#723326)
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -8,67 +8,26 @@

 Name: dolibarr
 Version: __VERSION__
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Release: __RELEASE__%{?dist}
-%else
 Release: __RELEASE__
-%endif
 Summary: ERP and CRM software for small and medium companies or foundations 
 Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-License: GPLv3+
-%else
-License: GPL-3.0+
-%endif
+License: GPLv2+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

 URL: http://www.dolibarr.org
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
-%else
-%if 0%{?mdkversion}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
-%else
-%if 0%{?suse_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
-%else
 Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
-%endif
-%endif
-%endif
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build

-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
-Requires: mysql-server, mysql
-BuildRequires: desktop-file-utils
-%else
-%if 0%{?mdkversion}
-Group: Applications/Productivity
-Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
-Requires: mysql, mysql-client 
-%else
-%if 0%{?suse_version}
-# Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
-Group: Productivity/Office/Management
-Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
-Requires: mysql-community-server, mysql-community-server-client 
-BuildRequires: update-desktop-files fdupes
-%else
 Group: Applications/Productivity
 Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap 
 Requires: mysql-server, mysql 
 Requires: php-mysql >= 4.1.0 
-%endif
-%endif
-%endif

 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -89,7 +48,7 @@ de Recursos Empresariales (ERP) y Gestión de la Relación con los
 Clientes (CRM) así como para para otras diferentes actividades. 
 Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
 que necesita y haciendo hincapié en su facilidad de uso.
-
+    
 %description -l fr
 Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
 artisans ou associations. Il permet de gérer vos clients, prospect, 
@@ -121,42 +80,19 @@ cui hai bisogno ed essere facile da usare.

 #---- install
 %install
+%{__rm} -rf $RPM_BUILD_ROOT

-%if 0%{?sles_version}
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
-%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-%else
-%{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-%endif
-
 %{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
 %{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf
 %{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
-%else
-%if 0%{?mdkversion}
-%{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
-%else
-%if 0%{?suse_version}
-%{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
-%else
 %{__install} -m 644 build/rpm/install.forced.php.generic $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
-%endif
-%endif
-%endif

 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
+#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
-#Commented as it fails with error: /usr/bin/install: cannot stat build/rpm/dolibarr.desktop: No such file or directory
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop --vendor=""
-%endif

 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
@@ -166,43 +102,19 @@ 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
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
-%else
-%if 0%{?mdkversion}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
-%else
-%if 0%{?suse_version}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
-%endif
-%endif
-%endif

 # Lang
-echo "%defattr(0644, root, root, 0755)" > %{name}.lang
-echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
-  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >>%{name}.lang
-
-%if 0%{?suse_version} || 0%{?sles_version}
-# Enable this command to tag desktop file for suse
-%suse_update_desktop_file dolibarr Office Finance
-# Enable this command to allow suse detection of duplicate files and create hardlinks instead
-%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
-%endif
+done >%{name}.lang


 #---- clean
@@ -215,9 +127,6 @@ done >>%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
-
-%dir %_datadir/dolibarr
-
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -227,8 +136,6 @@ done >>%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

-%dir %_datadir/dolibarr/build
-
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -259,18 +166,13 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
-%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
-%_datadir/dolibarr/htdocs/mailmanspip
-%_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
@@ -284,17 +186,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%dir %{_sysconfdir}/dolibarr
-
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-%defattr(0664, root, apache)
-%else
-%if 0%{?suse_version}
-%defattr(0664, root, www)
-%else
-%defattr(0664, root, -)
-%endif
-%endif
+%defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -305,56 +197,37 @@ done >>%{name}.lang
 #---- post (after unzip during install)
 %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"
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-export apacheuser='apache';
-export apachegroup='apache';
-%else
-%if 0%{?suse_version}
-export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-export apacheuser='wwwrun';
-export apachegroup='www';
-%else
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"

 # Detect OS
 os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-  export os='fedora-redhat';
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  export apacheuser='apache';
-  export apachegroup='apache';
+    export os='fedora-redhat';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-  export os='opensuse';
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  export apacheuser='wwwrun';
-  export apachegroup='www';
+    export os='opensuse';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='wwwrun';
+    export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-  export os='mageia-mandriva';
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  export apacheuser='apache';
-  export apachegroup='apache';
+    export os='mageia-mandriva';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-  export os='ubuntu-debian';
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  export apacheuser='www-data';
-  export apachegroup='www-data';
+    export os='ubuntu-debian';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
 fi
 echo OS detected: $os
-%endif
-%endif

 # Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
@@ -363,24 +236,20 @@ echo OS detected: $os
 echo Create document directory $docdir
 %{__mkdir} -p $docdir

-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-
-%else
 # Create install.forced.php into Dolibarr install directory
 if [ "x$os" = "xubuntu-debian" ]
 then
-  superuserlogin=''
-  superuserpassword=''
-  if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
-    # Load superuser login and pass
-    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
-  fi
-  echo Mysql superuser found to use is $superuserlogin
-  %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
-  %{__chmod} -R 660 $installconfig
+	superuserlogin=''
+	superuserpassword=''
+	if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
+	    # Load superuser login and pass
+	    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+	    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+	fi
+	echo Mysql superuser found to use is $superuserlogin
+	%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+	%{__chmod} -R 660 $installconfig
 fi
-%endif

 # Set correct owner on config files
 %{__chown} -R root:$apachegroup /etc/dolibarr/*
@@ -388,63 +257,37 @@ fi
 # If a conf already exists and its content was already completed by installer
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
-then
-  # 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
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
-%else
-%if 0%{?mdkversion}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
-%else
-%if 0%{?suse_version}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
-%else
-  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
-%endif
-%endif
-%endif
+then 
+	# 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			
 fi

-# Create config for SE Linux
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
-%else
+# Create config for se $seconfig
 if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
-%endif
-%if 0%{?mdkversion} || 0%{?suse_version}
-%else
-  echo Add SE Linux permissions for dolibarr
-  # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
-  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
-  restorecon -R -v /etc/dolibarr
-  restorecon -R -v /var/lib/dolibarr
-%endif
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
-%else
+    echo Add SE Linux permissions for dolibarr
+    # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
+    semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+    semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
+    restorecon -R -v /etc/dolibarr
+    restorecon -R -v /var/lib/dolibarr
 fi
-%endif

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-      ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
+    echo Create dolibarr web server config link $apachelink
+    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -453,40 +296,18 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr

 # Restart web server
 echo Restart web server
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-/sbin/service httpd restart
-%else
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi
-%endif

-# Restart mysql server
-echo Restart mysql server
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-  /sbin/service mysqld restart
-%else
-%if 0%{?suse_version}
+# Restart mysql
+echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /sbin/service mysqld restart
-  #/etc/init.d/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
-  /etc/init.d/mysqld restart
-fi
-if [ -f /etc/init.d/mysql ]; then
-  /etc/init.d/mysql restart
-fi
-%endif
-%endif

 # Show result
 echo
@@ -501,70 +322,51 @@ echo



-#---- postun (after upgrade or uninstall)
+#---- postun (after uninstall)
 %postun

-if [ "x$1" = "x0" ] ;
-then
-  # Remove
-  echo "Removed package"
-
-  # Define vars
-  os='unknown';
-  %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  %else
-  %if 0%{?suse_version}
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  %else
-  if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+# Detect OS
+os='unknown';
+if [ -d %{_sysconfdir}/httpd/conf.d ]; then
    export os='fedora-redhat';
    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
    export os='opensuse';
    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+fi
+if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
    export os='mageia-mandriva';
    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
    export os='ubuntu-debian';
    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  fi
-  %endif
-  %endif
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
+fi
+
+# Remove apache link
+if [ -L $apachelink ] ;
+then
    echo "Delete apache config link for Dolibarr ($apachelink)"
    %{__rm} -f $apachelink
    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-      /sbin/service httpd restart
-    %else
-      if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-      fi
-      if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-      fi
-      %endif
-  fi
-else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
 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
+# Restart web servers if required
+if [ "x$status" = "xpurge" ] ;
+then
+    # Restart web server
+    echo Restart web server
+    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+        %{_sysconfdir}/init.d/httpd restart
+    fi
+    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+        %{_sysconfdir}/init.d/apache2 restart
+    fi
+fi
+
+
+
 %changelog
-__CHANGELOGSTRING__
+* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3
+- Initial version (#723326)
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-3.0+
+License: GPLv2+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -102,24 +102,20 @@ 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
-echo "%defattr(0644, root, root, 0755)" > %{name}.lang
-echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
-  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >>%{name}.lang
+done >%{name}.lang


 #---- clean
@@ -132,9 +128,6 @@ done >>%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
-
-%dir %_datadir/dolibarr
-
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -144,8 +137,6 @@ done >>%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

-%dir %_datadir/dolibarr/build
-
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -176,18 +167,13 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
-%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
-%_datadir/dolibarr/htdocs/mailmanspip
-%_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
@@ -201,9 +187,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%dir %{_sysconfdir}/dolibarr
-
-%defattr(0664, root, apache)
+%defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -214,8 +198,6 @@ done >>%{name}.lang
 #---- post (after unzip during install)
 %post

-echo Run post script of packager dolibarr_mandriva.spec
-
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
@@ -233,34 +215,29 @@ echo Create document directory $docdir
 %{__chown} -R root:$apachegroup /etc/dolibarr/*

 # If a conf already exists and its content was already completed by installer
-export config=%{_sysconfdir}/dolibarr/conf.php
-if [ -s $config ] && grep -q "File generated by" $config
+export confcomplete=`grep -c "File generated by" %{_sysconfdir}/dolibarr/conf.php 2>/dev/null`
+if [ -s %{_sysconfdir}/dolibarr/conf.php -a "x$confcomplete" != "x0" ]
 then 
-  # 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/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	# 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/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    echo Create dolibarr web server config link $apachelink
    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -270,19 +247,16 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi

 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /etc/init.d/mysqld restart
-fi
-if [ -f /etc/init.d/mysql ]; then
-  /etc/init.d/mysql restart
+    /etc/init.d/mysqld restart
 fi

 # Show result
@@ -297,43 +271,35 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after upgrade or uninstall)
+#---- postun (after uninstall)
 %postun

-if [ "x$1" = "x0" ] ;
-then
-  # Remove
-  echo "Removed package"
+# Define vars
+export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"

-  # Define vars
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
+# Remove apache link
+if [ -L $apachelink ] ;
+then
    echo "Delete apache config link for Dolibarr ($apachelink)"
    %{__rm} -f $apachelink
    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
+fi
+
+# Restart web servers if required
+if [ "x$status" = "xpurge" ] ;
+then
    # Restart web server
    echo Restart web server
    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-      %{_sysconfdir}/init.d/httpd restart
+        %{_sysconfdir}/init.d/httpd restart
    fi
    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-      %{_sysconfdir}/init.d/apache2 restart
+        %{_sysconfdir}/init.d/apache2 restart
    fi
-  fi
-else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
 fi


-# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
+
 %changelog
-__CHANGELOGSTRING__
+* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3
+- Initial version (#723326)
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-3.0+
+License: GPLv2+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -25,11 +25,9 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build

 Group: Productivity/Office/Management
-Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
+Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, fonts-ttf-dejavu
 Requires: mysql-community-server, mysql-community-server-client 
-%if 0%{?suse_version}
-BuildRequires: update-desktop-files fdupes
-%endif
+#BuildRequires: update-desktop-files fdupes

 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -103,34 +101,26 @@ 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
-echo "%defattr(0644, root, root, 0755)" > %{name}.lang
-echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
-  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >>%{name}.lang
-
-%if 0%{?suse_version}
+done >%{name}.lang

 # Enable this command to tag desktop file for suse
-%suse_update_desktop_file dolibarr
+#%suse_update_desktop_file dolibarr

 # Enable this command to allow suse detection of duplicate files and create hardlinks instead
-%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
-
-%endif
+#%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs


 #---- clean
@@ -143,9 +133,6 @@ done >>%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
-
-%dir %_datadir/dolibarr
-
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -155,8 +142,6 @@ done >>%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

-%dir %_datadir/dolibarr/build
-
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -187,18 +172,13 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
-%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
-%_datadir/dolibarr/htdocs/mailmanspip
-%_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
-%_datadir/dolibarr/htdocs/printipp
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
@@ -212,9 +192,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%dir %{_sysconfdir}/dolibarr
-
-%defattr(0664, root, www)
+%defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -225,8 +203,6 @@ done >>%{name}.lang
 #---- post (after unzip during install)
 %post

-echo Run post script of packager dolibarr_opensuse.spec
-
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
@@ -247,31 +223,26 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-  # 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/DejaVuSans-Bold.ttf'; ?>" >> $config      
+	# 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/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    echo Create dolibarr web server config link $apachelink
    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -281,19 +252,16 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi

 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /sbin/service mysqld restart
-fi
-if [ -f /etc/init.d/mysql ]; then
-  /sbin/service mysql restart
+    /etc/init.d/mysqld restart
 fi

 # Show result
@@ -308,43 +276,35 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after upgrade or uninstall)
+#---- postun (after uninstall)
 %postun

-if [ "x$1" = "x0" ] ;
+# Define vars
+export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+
+# Remove apache link
+if [ -L $apachelink ] ;
 then
-  # Remove
-  echo "Removed package"
-  
-  # Define vars
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
    echo "Delete apache config link for Dolibarr ($apachelink)"
    %{__rm} -f $apachelink
    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
+fi
+
+# Restart web servers if required
+if [ "x$status" = "xpurge" ] ;
+then
    # Restart web server
    echo Restart web server
    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-      %{_sysconfdir}/init.d/httpd restart
+        %{_sysconfdir}/init.d/httpd restart
    fi
    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-      %{_sysconfdir}/init.d/apache2 restart
+        %{_sysconfdir}/init.d/apache2 restart
    fi
-  fi
-else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
 fi


-# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
+
 %changelog
-__CHANGELOGSTRING__
+* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3
+- Initial version (#723326)
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -18,6 +18,4 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';

-// Value to overwrite path to use shared libraries/fonts instead of embedded one
-// We don't force any external lib with generic package
 ?>
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -19,10 +19,10 @@ $force_install_nophpinfo='1';
 $force_install_lockinstall='444';

 // Value to overwrite path to use shared libraries/fonts instead of embedded one
-//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 //$force_dolibarr_lib_GEOIP_PATH='';
-//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
+$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_lib_TCPDF_PATH='';
--- a/build/sitemap/README
+++ b/build/sitemap/README
@@ -1,6 +0,0 @@
-# Format of sitemap file is available at
-# http://www.sitemaps.org/protocol.html
-
-# To build a sitemap from urllist-bing.txt, run 
-# google-sitemapgen --config=config-bing.xml --testing
-
--- a/build/sitemap/config-bing.xml
+++ b/build/sitemap/config-bing.xml
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  sitemap_gen.py example configuration script
-
-  This file specifies a set of sample input parameters for the
-  sitemap_gen.py client.
-
-  You should copy this file into "config.xml" and modify it for
-  your server.
-
-
-  ********************************************************* -->
-
-
-<!-- ** MODIFY **
-  The "site" node describes your basic web site.
-
-  Required attributes:
-    base_url   - the top-level URL of the site being mapped
-    store_into - the webserver path to the desired output file.
-                 This should end in '.xml' or '.xml.gz'
-                 (the script will create this file)
-
-  Optional attributes:
-    verbose    - an integer from 0 (quiet) to 3 (noisy) for
-                 how much diagnostic output the script gives
-    suppress_search_engine_notify="1"
-               - disables notifying search engines about the new map
-                 (same as the "testing" command-line argument.)
-    default_encoding
-               - names a character encoding to use for URLs and
-                 file paths.  (Example: "UTF-8")
-->
-<site
-  base_url="http://wiki.dolibarr.org/"
-  store_into="sitemap-wiki-bing.xml.gz"
-  verbose="1"
-  >
-
-  <!-- ********************************************************
-          INPUTS
-
-  All the various nodes in this section control where the script
-  looks to find URLs.
-
-  MODIFY or DELETE these entries as appropriate for your server.
-  ********************************************************* -->
-
-  <!-- ** MODIFY or DELETE **
-    "url" nodes specify individual URLs to include in the map.
-
-    Required attributes:
-      href       - the URL
-
-    Optional attributes:
-      lastmod    - timestamp of last modification (ISO8601 format)
-      changefreq - how often content at this URL is usually updated
-      priority   - value 0.0 to 1.0 of relative importance in your site
-  -->
-  <!-- 
-  <url  href="http://www.example.com/stats?q=name"  />
-  <url
-     href="http://www.example.com/stats?q=age"
-     lastmod="2004-11-14T01:00:00-07:00"
-     changefreq="yearly"
-     priority="0.3"
-  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "urllist" nodes name text files with lists of URLs.
-    An example file "example_urllist.txt" is provided.
-
-    Required attributes:
-      path       - path to the file
-
-    Optional attributes:
-      encoding   - encoding of the file if not US-ASCII
-  -->
-  <urllist  path="urllist-wiki.txt"  encoding="UTF-8"  />
-
-  <!-- ** MODIFY or DELETE **
-    "directory" nodes tell the script to walk the file system
-    and include all files and directories in the Sitemap.
-
-    Required attributes:
-      path       - path to begin walking from
-      url        - URL equivalent of that path
-
-    Optional attributes:
-      default_file - name of the index or default file for directory URLs
-  -->
-  <!-- 
-  <directory  path="/var/www/icons"    url="http://www.example.com/images/" />
-  <directory
-     path="/var/www/docroot"
-     url="http://www.example.com/"
-     default_file="index.html"
-  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "accesslog" nodes tell the script to scan webserver log files to
-    extract URLs on your site.  Both Common Logfile Format (Apache's default
-    logfile) and Extended Logfile Format (IIS's default logfile) can be read.
-
-    Required attributes:
-      path       - path to the file
-
-    Optional attributes:
-      encoding   - encoding of the file if not US-ASCII
-  -->
-  <!-- 
-  <accesslog  path="/etc/httpd/logs/access.log"       encoding="UTF-8"  />
-  <accesslog  path="/etc/httpd/logs/access.log.0"     encoding="UTF-8"  />
-  <accesslog  path="/etc/httpd/logs/access.log.1.gz"  encoding="UTF-8"  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "sitemap" nodes tell the script to scan other Sitemap files.  This can
-    be useful to aggregate the results of multiple runs of this script into
-    a single Sitemap.
-
-    Required attributes:
-      path       - path to the file
-  -->
-  <!-- 
-  <sitemap    path="/var/www/docroot/subpath/sitemap.xml" />
-  -->
-
-  <!-- ********************************************************
-          FILTERS
-
-  Filters specify wild-card patterns that the script compares
-  against all URLs it finds.  Filters can be used to exclude
-  certain URLs from your Sitemap, for instance if you have
-  hidden content that you hope the search engines don't find.
-
-  Filters can be either type="wildcard", which means standard
-  path wildcards (* and ?) are used to compare against URLs,
-  or type="regexp", which means regular expressions are used
-  to compare.
-
-  Filters are applied in the order specified in this file.
-
-  An action="drop" filter causes exclusion of matching URLs.
-  An action="pass" filter causes inclusion of matching URLs,
-  shortcutting any other later filters that might also match.
-  If no filter at all matches a URL, the URL will be included.
-  Together you can build up fairly complex rules.
-
-  The default action is "drop".
-  The default type is "wildcard".
-
-  You can MODIFY or DELETE these entries as appropriate for
-  your site.  However, unlike above, the example entries in
-  this section are not contrived and may be useful to you as
-  they are.
-  ********************************************************* -->
-
-  <!-- Exclude URLs that end with a '~'   (IE: emacs backup files)      -->
-  <filter  action="drop"  type="wildcard"  pattern="*~"           />
-
-  <!-- Exclude URLs within UNIX-style hidden files or directories       -->
-  <filter  action="drop"  type="regexp"    pattern="/\.[^/]*"     />
-
-  <filter  action="drop"  type="regexp"  pattern="title="           />
-
-</site>
--- a/build/sitemap/urllist-wiki.txt
+++ b/build/sitemap/urllist-wiki.txt
@@ -1 +0,0 @@
-http://wiki.dolibarr.org/
--- a/build/tgz/tar_exclude.txt
+++ b/build/tgz/tar_exclude.txt
@@ -1,6 +1,3 @@
-*~
-.#*
-Thumbs.db
 build/exe
 build/html
 dev/dbmodel
@@ -10,10 +7,76 @@ 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/jpgraph2
+htdocs/includes/fckeditor/_samples
+htdocs/includes/fckeditor/_testcases
+htdocs/includes/nusoap/samples
+htdocs/includes/phplot5
+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
+htdocs/lolix
+htdocs/oscommerce_ws/ws_client_demo
+htdocs/postnuke
+htdocs/public/bplc
+htdocs/rapport
+htdocs/theme/rodolphe
+htdocs/telephonie
+htdocs/voyage
+mssql
+scripts/addons
+scripts/books
+scripts/courrier
+scripts/lolix
+scripts/product/import-product.php
+scripts/product/materiel.net.php
+test
+CVS
+*~
+.#*
+.cache
+.cvsignore
+.externalToolBuilders
+.htaccess
+.settings
+.project
+Thumbs.db
+data_dev.sql
 doli*.tar.gz
 doli*.tgz
 doli*.exe
@@ -21,4 +84,18 @@ doli*.rpm
 doli*.deb
 doli*.zip
 cvschangelogbuilder_dolibarr*
-dolibarr_install.log
+deneb
+janus
+jupiter
+lune
+mars
+pluton
+saturne
+venus
+bigorneau
+tourteau
+bulot
+huitre
+pdf_huitre.modules.php
+doxygen_warnings.log
+dolibarr_install.log
--- a/build/zip/zip_exclude.txt
+++ b/build/zip/zip_exclude.txt
@@ -1,19 +1,70 @@
-*~
-*.#*
-Thumbs.db
-*/build/exe
-*/build/html
+*/build
 */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/lolix/*
+*/htdocs/postnuke/*
+*/htdocs/telephonie/*
+*/htdocs/voyage/*
+*/htdocs/includes/jpgraph2/*
+*/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
+*/htdocs/oscommerce_ws/ws_client_demo/*
+*/htdocs/theme/rodolphe/*
+*/scripts/addons/*
+*/scripts/courrier/*
+*/scripts/lolix/*
+*/test
+*/CVS/*
+*~
+*.#*
+*.cache*
+*.cvsignore*
+*.htaccess*
+*.settings*
+*.project*
+Thumbs.db
+data_dev.sql
 dolibarr*.tar.gz
 dolibarr*.tgz
 dolibarr*.exe
@@ -21,4 +72,19 @@ dolibarr*.rpm
 dolibarr*.deb
 dolibarr*.zip
 cvschangelogbuilder_dolibarr*
-dolibarr_install.log
+*/deneb/*
+*/janus/*
+*/jupiter/*
+*/lune/*
+*/mars/*
+*/mercure/*
+*/pluton/*
+*/saturne/*
+*/venus/*
+*/bigorneau/*
+*/tourteau/*
+*/bulot/*
+*/huitre/*
+*/pdf_huitre.modules.php
+doxygen_warnings.log
+dolibarr_install.log
--- a/dev/README
+++ b/dev/README
@@ -2,7 +2,7 @@ README (English)
 --------------------------------
 This directory contains sub-directories to provide tools or
 documentation for developers.
-Note: All files in this directory are in VCS only and are not
+Note: All files in this directory are in CVS only and are not
 provided with a standard release.


--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0"?>
+<!DOCTYPE ruleset SYSTEM "ruleset.dtd">
+<ruleset name="Dolibarr">
+	<description>Dolibarr coding standard.</description>
+
+	<!-- List of all tests -->
+
+    <rule ref="Generic.CodeAnalysis.EmptyStatement" />
+ 
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning">
+		<severity>0</severity>
+	</rule>
+
+    <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
+
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
+
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
+
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />
+
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier" />
+
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.Found">
+		<severity>0</severity>
+    </rule>
+
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
+    
+    <!--
+    <rule ref="Generic.Commenting.Todo" />
+    -->
+
+	<!-- Warning if action on same line than if -->
+	<!--
+		<rule ref="Generic.ControlStructures.InlineControlStructure">
+		<properties> <property name="error" value="false"/> </properties>
+		</rule>
+	-->
+
+	<!-- Lines can be 85 chars long, but never show errors -->
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="1000" />
+			<property name="absoluteLineLimit" value="0" />
+		</properties>
+	</rule>
+
+	<!-- Use Unix newlines -->
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n" />
+		</properties>
+	</rule>
+
+    <!-- To disallow several statements on same line -->
+	<!-- <rule ref="Generic.Formatting.DisallowMultipleStatements" /> -->
+
+	<!-- Have 2 chars padding maximum and always show as errors -->
+	<!--
+		<rule ref="Generic.Formatting.MultipleStatementAlignment">
+		<properties> <property name="maxPadding" value="2"/> <property
+		name="ignoreMultiLine" value="true"/> </properties> </rule>
+	-->
+
+	<rule ref="Generic.Formatting.SpaceAfterCast" />
+
+    <rule ref="Generic.Functions.CallTimePassByReference" />
+
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+	<rule
+		ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+
+    <!-- Tweaks to metrics -->
+    <rule ref="Generic.Metrics.CyclomaticComplexity">
+        <properties>
+            <property name="complexity" value="40" />
+            <property name="absoluteComplexity" value="100" />
+        </properties>
+    </rule>
+    <rule ref="Generic.Metrics.NestingLevel">
+        <properties>
+            <property name="nestingLevel" value="10" />
+            <property name="absoluteNestingLevel" value="50" />
+        </properties>
+    </rule>
+
+	<rule ref="Generic.NamingConventions.ConstructorName" />
+	<!-- Check if we use PHP4 constructor instead of __construct() -->
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
+
+    <rule ref="Generic.PHP.DeprecatedFunctions" />
+
+	<rule ref="Generic.PHP.DisallowShortOpenTag" />
+
+    <rule ref="Generic.PHP.ForbiddenFunctions" />
+
+    <!-- Warning when using @ before functions -->
+    <!-- <rule ref="Generic.PHP.NoSilencedErrors" /> -->
+
+	<!-- Say if null, true, false must be uppercase -->
+	<!-- <rule ref="Generic.PHP.UpperCaseConstant" /> -->
+
+	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
+
+    <rule ref="Generic.VersionControl.SubversionProperties" />
+
+	<!-- Disallow usage of tab -->
+	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
+
+	<!-- Check indent are done with spaces and wiht correct number -->
+	<!-- Disabled as this does not support tab -->
+	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
+
+	<rule ref="PEAR.Classes.ClassDeclaration" />
+
+    <!-- Check for duplicate class names -->
+    <!-- <rule ref="Generic.Classes.DuplicateClassName" /> -->
+
+    <rule ref="PEAR.Commenting.ClassComment" />
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    
+    <!-- 
+    <rule ref="PEAR.Commenting.FileComment" />
+    <rule ref="PEAR.Commenting.FileComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingVersion">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    -->
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.Empty">
+        <severity>5</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment" />
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongName">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParams">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterNamesNotAligned">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.InlineComment" />
+
+	<!-- <rule ref="PEAR.ControlStructures.ControlSignature" /> -->
+
+	<!-- <rule ref="PEAR.ControlStructures.MultiLineCondition" /> -->
+
+	<!-- Test if () are removed for includes -->
+	<!-- <rule ref="PEAR.Files.IncludingFile"/> -->
+
+	<rule ref="PEAR.Formatting.MultiLineAssignment" />
+
+	<rule ref="PEAR.Functions.FunctionCallSignature" />
+
+	<rule ref="PEAR.Functions.ValidDefaultValue" />
+
+	<rule ref="PEAR.NamingConventions.ValidClassName" />
+	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<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" />
+
+	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
+	
+	<!--
+	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
+        <severity>0</severity>
+    </rule>
+	
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
+        <severity>0</severity>
+    </rule>
+    
+    -->
+    
+    <!-- Already found as a Generic rule -->
+	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
+
+</ruleset>
--- a/dev/codesniffer/ruleset.dtd
+++ b/dev/codesniffer/ruleset.dtd
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT ruleset (description,exclude-pattern*,rule+)>
+<!ELEMENT ruleset (description,rule+)>
 <!ATTLIST ruleset name CDATA "">
 <!ELEMENT description (#PCDATA)>
-<!ELEMENT exclude-pattern (#PCDATA)>
 <!ELEMENT rule (properties*,severity*)>
 <!ATTLIST rule ref CDATA "">
 <!ELEMENT properties (property+)>
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -3,34 +3,10 @@
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>

-	<exclude-pattern>*/conf.php</exclude-pattern>
-	<exclude-pattern>*/includes/*</exclude-pattern>
-	<exclude-pattern>*/documents/*</exclude-pattern>
-	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
-	<exclude-pattern>*/custom/*</exclude-pattern>
-	<exclude-pattern>*/nltechno*</exclude-pattern>
-
 	<!-- List of all tests -->

-	<rule ref="Internal.NoCodeFound">
-		<severity>0</severity>
-	</rule>
-
-	<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" />
+ 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>
@@ -66,9 +42,6 @@
 		</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>
@@ -102,21 +75,16 @@
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
 		<severity>0</severity>
 	</rule>
-	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+	<rule
+		ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
 		<severity>0</severity>
 	</rule>

    <!-- Tweaks to metrics -->
    <rule ref="Generic.Metrics.CyclomaticComplexity">
        <properties>
-            <property name="complexity" value="80" />
-            <property name="absoluteComplexity" value="250" />
+            <property name="complexity" value="40" />
+            <property name="absoluteComplexity" value="100" />
        </properties>
    </rule>
    <rule ref="Generic.Metrics.NestingLevel">
@@ -135,10 +103,7 @@
 	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />

    <rule ref="Generic.PHP.DeprecatedFunctions" />
-    <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
-        <severity>0</severity>
-    </rule>
-	
+
 	<rule ref="Generic.PHP.DisallowShortOpenTag" />

    <rule ref="Generic.PHP.ForbiddenFunctions" />
@@ -151,10 +116,6 @@

 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />

-	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
-        <severity>0</severity>
-	</rule>
-    
    <rule ref="Generic.VersionControl.SubversionProperties" />

 	<!-- Disallow usage of tab -->
@@ -173,75 +134,7 @@
    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
        <severity>0</severity>
    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-        
+    
    <!-- 
    <rule ref="PEAR.Commenting.FileComment" />
    <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -295,55 +188,17 @@

 	<rule ref="PEAR.Functions.FunctionCallSignature" />

-	<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.FunctionCallSignature.CloseBracketLine">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
-        <severity>0</severity>
-    </rule>
-	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />

 	<rule ref="PEAR.NamingConventions.ValidClassName" />
 	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
        <severity>0</severity>
 	</rule>
-	
-	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
-        <severity>0</severity>
-	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
        <severity>0</severity>
 	</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>
-	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCapital">
-        <severity>0</severity>
-	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
+	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
        <severity>0</severity>
 	</rule>
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,10 +17,10 @@
 -- ===================================================================

 CREATE TABLE llx_osc_categories (
-  rowid integer unsigned NOT NULL auto_increment,
-  dolicatid integer NOT NULL default '0',
-  osccatid integer NOT NULL default '0',
+  rowid int(11) unsigned NOT NULL auto_increment,
+  dolicatid int(11) NOT NULL default '0',
+  osccatid int(11) NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY dolicatid (dolicatid),
  UNIQUE KEY osccatid (osccatid)
-) ENGINE=InnoDB;
+) TYPE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 -- ===================================================================

 CREATE TABLE llx_osc_customer (
-  rowid integer NOT NULL default '0',
+  rowid int(11) NOT NULL default '0',
  datem datetime default NULL,
-  fk_soc integer NOT NULL default '0',
+  fk_soc int(11) NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_soc (fk_soc)
-) ENGINE=InnoDB;
+) TYPE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 -- ===================================================================

 CREATE TABLE llx_osc_order (
-  rowid integer NOT NULL default '0',
+  rowid int(11) NOT NULL default '0',
  datem datetime default NULL,
-  fk_commande integer NOT NULL default '0',
+  fk_commande int(11) NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_commande (fk_commande)
-) ENGINE=InnoDB;
+) TYPE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,11 +17,11 @@
 -- ===================================================================

 CREATE TABLE llx_osc_product (
-  rowid integer NOT NULL default '0',
+  rowid int(11) NOT NULL default '0',
  datem datetime default NULL,
-  fk_product integer NOT NULL default '0',
+  fk_product int(11) NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_product (fk_product)
-) ENGINE=InnoDB;
+) TYPE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';


--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -25,19 +25,18 @@ Replace call to serialize_val with no bugged value

 TCPDF:
 ------
-* Removed all fonts except 
-    dejavusans* (used by greek, arab, persan, romanian, turkish), 
-    freemono* (russian), 
-    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
-    helvetica* (all other languages),
-    zapfdingbats.php (for special chars like form checkboxes)
-* Removed useless directories (examples, tools)
-* Fix
- 	// initialize subsetchars
-	$subsetchars = array();
-into
-	// initialize subsetchars
-	$subsetchars = array_fill(0, 256, true);
+* To be compatible with FPDF, replace line
+public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
+by
+public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=false, $maxh=0, $valign='T', $fitcell=false) {
+
+* Removed all fonts except dejavu* (greek, arab, persan, romanian, turkish), freemono* (russian), stsongstdlight* (chinese), helvetica* (all other) and useless directories (fonts/utils, docs, cache, images)
+
+* Replace in tcpdf_config.php
+define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
+with
+define ('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+dol_mkdir(K_PATH_CACHE);


 JSGANTT:
@@ -49,14 +48,3 @@ with
 //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 window.location.href=pRef
 * Replace hard coded string with i18n["String"];
-
-
-JCROP:
------
-* Remove analytics tag into file index.html
-
-
-JQUERYFILETREE:
---------------
-* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
-
--- a/dev/examples/README
+++ b/dev/examples/README
@@ -4,5 +4,5 @@ README (English)
 This directory contains samples of code to use Dolibarr business classes to build
 external interfaces that need to read/update data from/into Dolibarr.

-You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
+You can also have a look at the Dolibarr doxygen doc that describe all files and classes:
 http://www.dolibarr.org/html_doxygen/index.html
--- a/dev/examples/create_invoice.php
+++ b/dev/examples/create_invoice.php
@@ -4,7 +4,7 @@
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/create_invoice.php
+ *      \file       dev/examples/manage_order.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author's name here
+ *		\author		Put author name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/examples/create_order.php
+++ b/dev/examples/create_order.php
@@ -4,7 +4,7 @@
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/create_order.php
+ *      \file       dev/examples/manage_order.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author's name here
+ *		\author		Put author name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/examples/create_product.php
+++ b/dev/examples/create_product.php
@@ -4,7 +4,7 @@
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -19,7 +19,7 @@
 /**
 *      \file       dev/examples/create_product.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author's name here
+ *		\author		Put author name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

@@ -64,7 +64,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 // Create instance of object
 $myproduct=new Product($db);

-// Definition of product instance properties
+// Définition des propriétés de l'instance product
 $myproduct->ref                = '1234';
 $myproduct->libelle            = 'libelle';
 $myproduct->price              = '10';
--- a/dev/examples/create_user.php
+++ b/dev/examples/create_user.php
@@ -1,110 +0,0 @@
-#!/usr/bin/php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/examples/create_user.php
- *      \brief      This file is an example for a command line script
- *		\author		Put author's name here
- *		\remarks	Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Global variables
-$version='1.7';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-@set_time_limit(0);
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") *****\n";
-
-// Start of transaction
-$db->begin();
-
-require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
-
-// Create invoice object
-$obj = new User($db);
-//$obj->initAsSpecimen();
-
-$obj->login = 'ABCDEF';
-$obj->nom   = 'ABCDEF';
-
-// Create invoice
-$idobject=$obj->create($user);
-if ($idobject > 0)
-{
-	// Change status to validated
-	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$obj->error);
-	}
-}
-else if ($obj->error == 'ErrorLoginAlreadyExists')
-{
-     print "User with login ".$obj->login." already exists\n";
-}
-else
-{
-	$error++;
-	dol_print_error($db,$obj->error);
-}
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();
-
-return $error;
-?>
--- a/dev/examples/get_contracts.php
+++ b/dev/examples/get_contracts.php
@@ -4,7 +4,7 @@
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/get_contracts.php
+ *      \file       dev/examples/manage_order.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author's name here
+ *		\author		Put author name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/Show More
+++ b/Show More