Minor enhancement with link feature

Update demo file
Merge pull request #1286 from GPCsolutions/fr-fix
2026-01-20 07:43:18 +01:00 · 2013-11-07 02:56:56 +01:00 · 2013-11-07 02:28:32 +01:00 · 2013-11-06 17:18:18 -08:00 · 2013-11-06 17:15:49 -08:00 · 2013-11-06 17:08:53 -08:00
3261 changed files with 299530 additions and 239202 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,28 @@
+# 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
@@ -13,3 +13,5 @@ dolibarr_install.log
 doxygen_warnings.log
 /.project
 .DS_Store
+.idea
+*.iml
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,10 @@ services:
 # 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
@@ -25,8 +27,14 @@ before_script:
 - echo Start travis
 - echo Current dir is `pwd`
 - echo Home dir is `echo ~`
- - echo Update composer
+ - export PHPV=`phpenv version-name`
+ - echo PHP version $PHPV 
+# - echo Update composer
 # - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update 
+ - echo Install phpcs then show installed rules
+ - pyrus install pear/PHP_CodeSniffer
+ - phpenv rehash
+ - phpcs -i
 - echo Create dir $(pwd)/htdocs/documents
 - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
 - sudo touch $(pwd)/htdocs/documents/dolibarr.log;
@@ -36,17 +44,19 @@ 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
- - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
+ - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
+ - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
+ - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
 - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 - echo Init database
 - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"
 - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
 - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
 - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.4.0.sql; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
 - echo Create config file htdocs/conf/conf.php
 - echo '<?php ' > htdocs/conf/conf.php
 - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
@@ -62,7 +72,7 @@ before_script:
 - echo Show conf.php content
 - cat htdocs/conf/conf.php
 - echo Install apache server
- - sudo apt-get update > /dev/null
+ - sudo apt-get update
 - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
 - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
 - echo Show default virtual host
@@ -73,13 +83,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: 
-# - 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 --coverage-text test/phpunit/AllTests.php
+# - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+# - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php
+# - phpcs --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php
+ - phpcs --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ . 
+# - phpcs --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ .
 - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php

 after_script:
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,303 @@
+[main]
+host = https://www.transifex.com
+
+[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/2
+++ b/2
@@ -38,7 +38,7 @@ jQuery jqueryFileTree 1.0.1	    GPL and MIT	Licence			Yes				JS library for colo
 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.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+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)
--- a/137
+++ b/137
@@ -1,9 +1,136 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
 --------------------------------------------------------------
+
+***** 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: [ task #926 ] Add extrafield feature on order lines.
+- New: [ task #927 ] Add extrafield feature on Proposal lines.
+- New: [ task #928 ] Add extrafield feature on invoice lines.
+- New: 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
+- 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).
+
+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
+
+ 
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
 Fix: Bad rounding on margin calculations and display.
-Fix: Option drpo table into backup was broken.
+Fix: Option drop table into backup was broken.

 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined
@@ -12,18 +139,18 @@ Fix: Reordering supplier products in list by supplier or supplier ref was crashi
 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: update extrafield do not display immediately 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: Link "Show all supplier invoice" on supplier 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: Compatibility 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
@@ -200,7 +327,7 @@ For users:
 - 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, files, contacts. 
+- 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.
--- a/2
+++ b/2
@@ -123,6 +123,6 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
 - Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Dolibarr ne contient pas de module de Gestion de la paie.
- Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@

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

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


 ## LICENSE
@@ -12,7 +13,7 @@ Dolibarr is released under the terms of the GNU General Public License as publis

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

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

@@ -77,15 +78,16 @@ See ChangeLog file found into package.

 - Customers, Prospects or Suppliers directory
 - Products and services catalog
- Stock management
 - Bank accounts management
- Orders management with PDF export
+- 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
@@ -99,10 +101,10 @@ See ChangeLog file found into package.
 - Bookmarks management
 - Donations management
 - Reporting
- Data export/import tools
+- Data export/import
 - LDAP connectivity
 - Third parties or products categories 
- ClickToDial phone numbers
+- ClickToDial integration
 - RSS integration

 ### Miscellaneous:
--- 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/*" />
+ <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
 
 <target name="clean">
  <!-- Clean up -->
@@ -46,7 +46,7 @@
   				--exclude '${basedir}/htdocs/conf'
   				--exclude '${basedir}/htdocs/core/filemanagerdol'
   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
   				--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/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
   				htdocs
   				" />
  </exec>
@@ -78,18 +78,11 @@
                "/>
  </exec>
 </target>
-
- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <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
+   <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/
@@ -98,5 +91,12 @@
  </exec>
 </target>

+ <!-- Generate Doxygen documentation -->
+ <target name="doxygen" description="Dolibarr documentation" >
+  <exec executable="doxygen" dir="${basedir}" failonerror="false">
+   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
+  </exec>
+ </target>
+
 <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
 </project>
--- 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,21 +7,56 @@ 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
-# apt-get -i debhelper dpkg-source gpg lintian
+# 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


-# This is standard command to work on Debian packaging:
-#
-# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.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 a login
+* 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
 # 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 
-#
+# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX
+ 
+# To check package integrity
 # 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
@@ -30,13 +65,16 @@ with format .DEB (for Debian, Ubuntu, ...).
 # 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

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

 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
@@ -55,3 +93,156 @@ 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
+> mkdir gitdebian
+> cd gitdebian
+> 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
@@ -1,75 +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
-<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 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
@@ -0,0 +1,7 @@
+<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
@@ -0,0 +1,42 @@
+# 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,4 +1,18 @@
-dolibarr (3.4.2) unstable; urgency=low
+dolibarr (3.5.0-1) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 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, 22 Apr 2013 12:00:00 +0100     
+
+dolibarr (3.4.0-3) unstable; urgency=low

  [ Laurent Destailleur (eldy) ]
  * New upstream release.
--- 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
-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
+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/
--- a/build/debian/dolibarr.lintian-overrides
+++ b/build/debian/dolibarr.lintian-overrides
@@ -1 +1,7 @@
-# No overrided lintian rules is this version.
+# 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
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -13,27 +13,44 @@ set -e
 #          <conflicting-package> <version>
 # for details, see /usr/share/doc/packaging-manual/

+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"
+}

-
-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
+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 [ -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
+		ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
+	fi
+}
+
+lighttpd_install() {
+	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
+		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"
+		fi
 	fi
 }

@@ -49,24 +66,34 @@ echo Run the dolibarr postinst script

 # Define vars
 docdir='/var/lib/dolibarr/documents'
-installfileorig="/usr/share/dolibarr/build/debian/install.forced.php.install"
+installfileorig="/etc/dolibarr/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_install
+		lighttpd_install
+		
 		# Remove lock file
-		rm -f $docdir/install.lock
-
+		if is_new_upstream_version "$2"; then
+		    enable_install_upgrade_wizard
+		fi
+				
        # 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
@@ -87,10 +114,7 @@ case "$1" in
 		if [ ! -s $config ] || ! grep -q "File generated by" $config
 		then
 			# Create an empty conf.php with permission to web server
-			echo Create empty file $config		
-			touch $config
-	    	chmod -R 660 $config
-			chown -R root:www-data $config
+			setup_empty_conf
 		else
 			# File already exist. We add params not found.
 			echo Add new params to overwrite path to use shared libraries/fonts
--- a/build/debian/lighttpd/50-dolibarr.conf
+++ b/build/debian/lighttpd/50-dolibarr.conf
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -17,8 +17,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
 "POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
-"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
-"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Last-Translator: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
+"Language-Team: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
--- 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 = 3.4.1
+PROJECT_NUMBER = 3.5.0

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
--- a/build/doxygen/jenkins_doxygen.doxyfile
+++ b/build/doxygen/jenkins_doxygen.doxyfile
--- 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
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -9,8 +9,8 @@ use Cwd;

 $PROJECT="dolibarr";
 $MAJOR="3";
-$MINOR="4";
-$BUILD="2";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$MINOR="5";
+$BUILD="0-beta";		# 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
@@ -253,6 +253,8 @@ 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`;
@@ -262,6 +264,7 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+	    $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`;
@@ -337,6 +340,7 @@ if ($nboftargetok) {
        $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 -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
@@ -601,6 +605,8 @@ 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`;
@@ -663,11 +669,15 @@ if ($nboftargetok) {
            $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";
--- a/build/obs/README
+++ b/build/obs/README
@@ -23,13 +23,14 @@ To submit a snapshot for building, we should have a service file with content
  <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-3.3.2-3.src.rpm</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 ?
-Try to make "Add file" and select Remote URL and enter http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm
+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/phocagallery/dolibarr_screenshot1.png
-OBS:QualityCategory Testing
+OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:QualityCategory Testing
--- 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/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/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "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.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }

 sub script_dolibarr_category
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -19,8 +19,8 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
 #
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
-# yum install dolibarr-...rpm       To install package and dependencies   
-# yum erase dolibarr                To remove package
+# yum -v install dolibarr-...rpm       To install package and dependencies   
+# yum -v 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)    
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -325,10 +325,10 @@ then
 	fi
 else
 	# Upgrade
-	echo "No remove ation done (this is an 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
 - Initial version (#723326)
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -553,10 +553,10 @@ then
 	fi
 else
 	# Upgrade
-	echo "No remove ation done (this is an 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
 - Initial version (#723326)
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -329,11 +329,11 @@ then
 	fi
 else
 	# Upgrade
-	echo "No remove ation done (this is an 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
 - Initial version (#723326)
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -339,11 +339,11 @@ then
 	fi
 else
 	# Upgrade
-	echo "No remove ation done (this is an 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
+* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b
 - Initial version (#723326)
--- a/build/sitemap/README
+++ b/build/sitemap/README
@@ -0,0 +1,6 @@
+# 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
@@ -0,0 +1,169 @@
+<?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
@@ -0,0 +1 @@
+http://wiki.dolibarr.org/
--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -1,247 +0,0 @@
-<?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.NoSpaceBeforeEquals">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
-		<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="80" />
-            <property name="absoluteComplexity" value="200" />
-        </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" />
-
-	<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" />
-
-    <!-- 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.Strings.UnnecessaryStringConcat.Found">
-        <severity>0</severity>
-	</rule>
-    
-    <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.FunctionCallSignature.Indent">
-	    <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.StartWithCaptial">
-        <severity>0</severity>
-	</rule>
-
-	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
-	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
-        <severity>0</severity>
-	</rule>
-	<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" />
-
-	<!-- Need to be commented to be disabled
-	<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.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -5,7 +5,11 @@

 	<!-- List of all tests -->

-    <rule ref="Generic.CodeAnalysis.EmptyStatement" />
+	<rule ref="Internal.NoCodeFound">
+		<severity>0</severity>
+	</rule>
+
+	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
@@ -211,10 +215,14 @@
        <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.FunctionNameInvalid">
        <severity>0</severity>
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -25,18 +25,19 @@ Replace call to serialize_val with no bugged value

 TCPDF:
 ------
-* 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* (used by 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);
+* 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);


 JSGANTT:
--- a/dev/findutf8bomincludes.sh
+++ b/dev/findutf8bomincludes.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Checks if files contains UTF-8 BOM
-# in dolibarr includes tree excluding
-# git repository
-#
-# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
-grep -rlI \
--exclude-dir='.git' \
-$'\xEF\xBB\xBF' htdocs/includes
--- a/dev/fixdosfiles.sh
+++ b/dev/fixdosfiles.sh
@@ -16,13 +16,13 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.pl" -o -iname "*.lang" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
 fi

 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.pl" -o -iname "*.lang" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix $fic
--- a/dev/fixperms.sh
+++ b/dev/fixperms.sh
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -186,7 +186,7 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
                $prodid = rand(1, $num_prods);
                $product=new Product($db);
                $result=$product->fetch($prodids[$prodid]);
-                $result=$com->addline($com->id, $product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                $result=$com->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
                if ($result < 0)
                {
                    dol_print_error($db,$propal->error);
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -112,8 +112,12 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 				$prodid = rand(1, $num_prods);
 				$product=new Product($db);
 				$result=$product->fetch($prodids[$prodid]);
-				$result=$facture->addline($facture->id,$product->description,$product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
-				$xnbp++;
+				$result=$facture->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+			    if ($result < 0)
+                {
+                    dol_print_error($db,$propal->error);
+                }
+                $xnbp++;
 			}

 			print " OK with ref ".$facture->ref."\n";;
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -143,7 +143,9 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		while ($xnbp < $nbp)
 		{
 			$prodid = rand(1, $num_prods);
-			$result=$propal->addline($propal->id, 'Description '.$xnbp, '100', rand(1,5), '19.6', 0, 0, $prodids[$prodid], 0);
+			$product=new Product($db);
+			$result=$product->fetch($prodids[$prodid]);
+			$result=$propal->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
 				dol_print_error($db,$propal->error);
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -99,8 +99,8 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
    $soc->country_id=1;
    $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_client=5;
-	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_client."\n";
+    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
 	$soc->note='Company created by the script generate-societe.php';
    $socid = $soc->create();

--- a/dev/initdata/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.5.0.sql
--- a/dev/initdata/savedemo.sh
+++ b/dev/initdata/savedemo.sh
@@ -177,6 +177,7 @@ export list="
 	--ignore-table=$base.llx_bt_timestamps
 	--ignore-table=$base.llx_bt_webseedfiles
 	--ignore-table=$base.llx_dolicloud_customers
+	--ignore-table=$base.llx_dolicloud_stats
 	--ignore-table=$base.llx_c_dolicloud_plans
 	--ignore-table=$base.llx_cabinetmed_c_banques
 	--ignore-table=$base.llx_cabinetmed_c_ccam
@@ -189,9 +190,15 @@ export list="
 	--ignore-table=$base.llx_cabinetmed_motifcons
 	--ignore-table=$base.llx_cabinetmed_patient
 	--ignore-table=$base.llx_cabinetmed_societe
+	--ignore-table=$base.llx_fournisseur_ca
+	--ignore-table=$base.llx_google_maps
+	--ignore-table=$base.llx_pos_paiement_ticket
+	--ignore-table=$base.llx_pos_places
+	--ignore-table=$base.llx_pos_ticket
 	--ignore-table=$base.llx_publi_c_contact_list 
 	--ignore-table=$base.llx_publi_c_dnd_list
-	--ignore-table=$base.llx_publi_c_method_list 
+	--ignore-table=$base.llx_publi_c_method_list
+	--ignore-table=$base.llx_ultimatepdf 
 	" 
 echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
 mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile
--- a/dev/iso-normes/countries_iso-3166_en.txt
+++ b/dev/iso-normes/countries_iso-3166_en.txt
@@ -10,7 +10,7 @@
 # ISO-3166 alpha 3: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3

 AFGHANISTAN;AF
-<EFBFBD>LAND ISLANDS;AX
+ÅLAND ISLANDS;AX
 ALBANIA;AL
 ALGERIA;DZ
 AMERICAN SAMOA;AS
@@ -62,7 +62,7 @@ CONGO;CG
 CONGO, THE DEMOCRATIC REPUBLIC OF THE;CD
 COOK ISLANDS;CK
 COSTA RICA;CR
-C<EFBFBD>TE D'IVOIRE;CI
+CÔTE D'IVOIRE;CI
 CROATIA;HR
 CUBA;CU
 CYPRUS;CY
@@ -192,7 +192,7 @@ REUNION;RE
 ROMANIA;RO
 RUSSIAN FEDERATION;RU
 RWANDA;RW
-SAINT BARTH<EFBFBD>LEMY;BL
+SAINT BARTHÉLEMY;BL
 SAINT HELENA;SH
 SAINT KITTS AND NEVIS;KN
 SAINT LUCIA;LC
--- a/dev/iso-normes/countries_iso-3166_fr.txt
+++ b/dev/iso-normes/countries_iso-3166_fr.txt
@@ -11,118 +11,118 @@

 AFGHANISTAN;AF
 AFRIQUE DU SUD;ZA
-<EFBFBD>LAND, <EFBFBD>LES;AX
+ÅLAND, ÎLES;AX
 ALBANIE;AL
-ALG<EFBFBD>RIE;DZ
+ALGÉRIE;DZ
 ALLEMAGNE;DE
 ANDORRE;AD
 ANGOLA;AO
 ANGUILLA;AI
 ANTARCTIQUE;AQ
 ANTIGUA-ET-BARBUDA;AG
-ANTILLES N<EFBFBD>ERLANDAISES;AN
+ANTILLES NÉERLANDAISES;AN
 ARABIE SAOUDITE;SA
 ARGENTINE;AR
-ARM<EFBFBD>NIE;AM
+ARMÉNIE;AM
 ARUBA;AW
 AUSTRALIE;AU
 AUTRICHE;AT
-AZERBA<EFBFBD>DJAN;AZ
+AZERBAÏDJAN;AZ
 BAHAMAS;BS
-BAHRE<EFBFBD>N;BH
+BAHREÏN;BH
 BANGLADESH;BD
 BARBADE;BB
-B<EFBFBD>LARUS;BY
+BÉLARUS;BY
 BELGIQUE;BE
 BELIZE;BZ
-B<EFBFBD>NIN;BJ
+BÉNIN;BJ
 BERMUDES;BM
 BHOUTAN;BT
 BOLIVIE;BO
-BOSNIE-HERZ<EFBFBD>GOVINE;BA
+BOSNIE-HERZÉGOVINE;BA
 BOTSWANA;BW
-BOUVET, <EFBFBD>LE;BV
-BR<EFBFBD>SIL;BR
-BRUN<EFBFBD>I DARUSSALAM;BN
+BOUVET, ÎLE;BV
+BRÉSIL;BR
+BRUNÉI DARUSSALAM;BN
 BULGARIE;BG
 BURKINA FASO;BF
 BURUNDI;BI
-CA<EFBFBD>MANES, <EFBFBD>LES;KY
+CAÏMANES, ÎLES;KY
 CAMBODGE;KH
 CAMEROUN;CM
 CANADA;CA
 CAP-VERT;CV
-CENTRAFRICAINE, R<EFBFBD>PUBLIQUE;CF
+CENTRAFRICAINE, RÉPUBLIQUE;CF
 CHILI;CL
 CHINE;CN
-CHRISTMAS, <EFBFBD>LE;CX
+CHRISTMAS, ÎLE;CX
 CHYPRE;CY
-COCOS (KEELING), <EFBFBD>LES;CC
+COCOS (KEELING), ÎLES;CC
 COLOMBIE;CO
 COMORES;KM
 CONGO;CG
-CONGO, LA R<EFBFBD>PUBLIQUE D<EFBFBD>MOCRATIQUE DU;CD
-COOK, <EFBFBD>LES;CK
-COR<EFBFBD>E, R<EFBFBD>PUBLIQUE DE;KR
-COR<EFBFBD>E, R<EFBFBD>PUBLIQUE POPULAIRE D<EFBFBD>MOCRATIQUE DE;KP
+CONGO, LA RÉPUBLIQUE DÉMOCRATIQUE DU;CD
+COOK, ÎLES;CK
+CORÉE, RÉPUBLIQUE DE;KR
+CORÉE, RÉPUBLIQUE POPULAIRE DÉMOCRATIQUE DE;KP
 COSTA RICA;CR
-C<EFBFBD>TE D'IVOIRE;CI
+CÔTE D'IVOIRE;CI
 CROATIE;HR
 CUBA;CU
 DANEMARK;DK
 DJIBOUTI;DJ
-DOMINICAINE, R<EFBFBD>PUBLIQUE;DO
+DOMINICAINE, RÉPUBLIQUE;DO
 DOMINIQUE;DM
-<EFBFBD>GYPTE;EG
+ÉGYPTE;EG
 EL SALVADOR;SV
-<EFBFBD>MIRATS ARABES UNIS;AE
-<EFBFBD>QUATEUR;EC
-<EFBFBD>RYTHR<EFBFBD>E;ER
+ÉMIRATS ARABES UNIS;AE
+ÉQUATEUR;EC
+ÉRYTHRÉE;ER
 ESPAGNE;ES
 ESTONIE;EE
-<EFBFBD>TATS-UNIS;US
-<EFBFBD>THIOPIE;ET
-FALKLAND, <EFBFBD>LES (MALVINAS);FK
-F<EFBFBD>RO<EFBFBD>, <EFBFBD>LES;FO
+ÉTATS-UNIS;US
+ÉTHIOPIE;ET
+FALKLAND, ÎLES (MALVINAS);FK
+FÉROÉ, ÎLES;FO
 FIDJI;FJ
 FINLANDE;FI
 FRANCE;FR
 GABON;GA
 GAMBIE;GM
-G<EFBFBD>ORGIE;GE
-G<EFBFBD>ORGIE DU SUD ET LES <EFBFBD>LES SANDWICH DU SUD;GS
+GÉORGIE;GE
+GÉORGIE DU SUD ET LES ÎLES SANDWICH DU SUD;GS
 GHANA;GH
 GIBRALTAR;GI
-GR<EFBFBD>CE;GR
+GRÈCE;GR
 GRENADE;GD
 GROENLAND;GL
 GUADELOUPE;GP
 GUAM;GU
 GUATEMALA;GT
 GUERNESEY;GG
-GUIN<EFBFBD>E;GN
-GUIN<EFBFBD>E-BISSAU;GW
-GUIN<EFBFBD>E <EFBFBD>QUATORIALE;GQ
+GUINÉE;GN
+GUINÉE-BISSAU;GW
+GUINÉE ÉQUATORIALE;GQ
 GUYANA;GY
-GUYANE FRAN<EFBFBD>AISE;GF
-HA<EFBFBD>TI;HT
-HEARD, <EFBFBD>LE ET MCDONALD, <EFBFBD>LES;HM
+GUYANE FRANÇAISE;GF
+HAÏTI;HT
+HEARD, ÎLE ET MCDONALD, ÎLES;HM
 HONDURAS;HN
 HONG-KONG;HK
 HONGRIE;HU
-<EFBFBD>LE DE MAN;IM
-<EFBFBD>LES MINEURES <EFBFBD>LOIGN<EFBFBD>ES DES <EFBFBD>TATS-UNIS;UM
-<EFBFBD>LES VIERGES BRITANNIQUES;VG
-<EFBFBD>LES VIERGES DES <EFBFBD>TATS-UNIS;VI
+ÎLE DE MAN;IM
+ÎLES MINEURES ÉLOIGNÉES DES ÉTATS-UNIS;UM
+ÎLES VIERGES BRITANNIQUES;VG
+ÎLES VIERGES DES ÉTATS-UNIS;VI
 INDE;IN
-INDON<EFBFBD>SIE;ID
-IRAN, R<EFBFBD>PUBLIQUE ISLAMIQUE D';IR
+INDONÉSIE;ID
+IRAN, RÉPUBLIQUE ISLAMIQUE D';IR
 IRAQ;IQ
 IRLANDE;IE
 ISLANDE;IS
-ISRA<EFBFBD>L;IL
+ISRAËL;IL
 ITALIE;IT
-JAMA<EFBFBD>QUE;JM
+JAMAÏQUE;JM
 JAPON;JP
 JERSEY;JE
 JORDANIE;JO
@@ -130,120 +130,120 @@ KAZAKHSTAN;KZ
 KENYA;KE
 KIRGHIZISTAN;KG
 KIRIBATI;KI
-KOWE<EFBFBD>T;KW
-LAO, R<EFBFBD>PUBLIQUE D<EFBFBD>MOCRATIQUE POPULAIRE;LA
+KOWEÏT;KW
+LAO, RÉPUBLIQUE DÉMOCRATIQUE POPULAIRE;LA
 LESOTHO;LS
 LETTONIE;LV
 LIBAN;LB
-LIB<EFBFBD>RIA;LR
+LIBÉRIA;LR
 LIBYENNE, JAMAHIRIYA ARABE;LY
 LIECHTENSTEIN;LI
 LITUANIE;LT
 LUXEMBOURG;LU
 MACAO;MO
-MAC<EFBFBD>DOINE, L'EX-R<EFBFBD>PUBLIQUE YOUGOSLAVE DE;MK
+MACÉDOINE, L'EX-RÉPUBLIQUE YOUGOSLAVE DE;MK
 MADAGASCAR;MG
 MALAISIE;MY
 MALAWI;MW
 MALDIVES;MV
 MALI;ML
 MALTE;MT
-MARIANNES DU NORD, <EFBFBD>LES;MP
+MARIANNES DU NORD, ÎLES;MP
 MAROC;MA
-MARSHALL, <EFBFBD>LES;MH
+MARSHALL, ÎLES;MH
 MARTINIQUE;MQ
 MAURICE;MU
 MAURITANIE;MR
 MAYOTTE;YT
 MEXIQUE;MX
-MICRON<EFBFBD>SIE, <EFBFBD>TATS F<EFBFBD>D<EFBFBD>R<EFBFBD>S DE;FM
-MOLDOVA, R<EFBFBD>PUBLIQUE DE;MD
+MICRONÉSIE, ÉTATS FÉDÉRÉS DE;FM
+MOLDOVA, RÉPUBLIQUE DE;MD
 MONACO;MC
 MONGOLIE;MN
-MONT<EFBFBD>N<EFBFBD>GRO;ME
+MONTÉNÉGRO;ME
 MONTSERRAT;MS
 MOZAMBIQUE;MZ
 MYANMAR;MM
 NAMIBIE;NA
 NAURU;NR
-N<EFBFBD>PAL;NP
+NÉPAL;NP
 NICARAGUA;NI
 NIGER;NE
-NIG<EFBFBD>RIA;NG
-NIU<EFBFBD>;NU
-NORFOLK, <EFBFBD>LE;NF
-NORV<EFBFBD>GE;NO
-NOUVELLE-CAL<EFBFBD>DONIE;NC
-NOUVELLE-Z<EFBFBD>LANDE;NZ
-OC<EFBFBD>AN INDIEN, TERRITOIRE BRITANNIQUE DE L';IO
+NIGÉRIA;NG
+NIUÉ;NU
+NORFOLK, ÎLE;NF
+NORVÈGE;NO
+NOUVELLE-CALÉDONIE;NC
+NOUVELLE-ZÉLANDE;NZ
+OCÉAN INDIEN, TERRITOIRE BRITANNIQUE DE L';IO
 OMAN;OM
 OUGANDA;UG
-OUZB<EFBFBD>KISTAN;UZ
+OUZBÉKISTAN;UZ
 PAKISTAN;PK
 PALAOS;PW
-PALESTINIEN OCCUP<EFBFBD>, TERRITOIRE;PS
+PALESTINIEN OCCUPÉ, TERRITOIRE;PS
 PANAMA;PA
-PAPOUASIE-NOUVELLE-GUIN<EFBFBD>E;PG
+PAPOUASIE-NOUVELLE-GUINÉE;PG
 PARAGUAY;PY
 PAYS-BAS;NL
-P<EFBFBD>ROU;PE
+PÉROU;PE
 PHILIPPINES;PH
 PITCAIRN;PN
 POLOGNE;PL
-POLYN<EFBFBD>SIE FRAN<EFBFBD>AISE;PF
+POLYNÉSIE FRANÇAISE;PF
 PORTO RICO;PR
 PORTUGAL;PT
 QATAR;QA
-R<EFBFBD>UNION;RE
+RÉUNION;RE
 ROUMANIE;RO
 ROYAUME-UNI;GB
-RUSSIE, F<EFBFBD>D<EFBFBD>RATION DE;RU
+RUSSIE, FÉDÉRATION DE;RU
 RWANDA;RW
 SAHARA OCCIDENTAL;EH
-SAINT-BARTH<EFBFBD>LEMY;BL
-SAINTE-H<EFBFBD>L<EFBFBD>NE;SH
+SAINT-BARTHÉLEMY;BL
+SAINTE-HÉLÈNE;SH
 SAINTE-LUCIE;LC
 SAINT-KITTS-ET-NEVIS;KN
 SAINT-MARIN;SM
 SAINT-MARTIN;MF
 SAINT-PIERRE-ET-MIQUELON;PM
-SAINT-SI<EFBFBD>GE (<EFBFBD>TAT DE LA CIT<EFBFBD> DU VATICAN);VA
+SAINT-SIÈGE (ÉTAT DE LA CITÉ DU VATICAN);VA
 SAINT-VINCENT-ET-LES GRENADINES;VC
-SALOMON, <EFBFBD>LES;SB
+SALOMON, ÎLES;SB
 SAMOA;WS
-SAMOA AM<EFBFBD>RICAINES;AS
-SAO TOM<EFBFBD>-ET-PRINCIPE;ST
-S<EFBFBD>N<EFBFBD>GAL;SN
+SAMOA AMÉRICAINES;AS
+SAO TOMÉ-ET-PRINCIPE;ST
+SÉNÉGAL;SN
 SERBIE;RS
 SEYCHELLES;SC
 SIERRA LEONE;SL
 SINGAPOUR;SG
 SLOVAQUIE;SK
-SLOV<EFBFBD>NIE;SI
+SLOVÉNIE;SI
 SOMALIE;SO
 SOUDAN;SD
 SRI LANKA;LK
-SU<EFBFBD>DE;SE
+SUÈDE;SE
 SUISSE;CH
 SURINAME;SR
-SVALBARD ET <EFBFBD>LE JAN MAYEN;SJ
+SVALBARD ET ÎLE JAN MAYEN;SJ
 SWAZILAND;SZ
-SYRIENNE, R<EFBFBD>PUBLIQUE ARABE;SY
+SYRIENNE, RÉPUBLIQUE ARABE;SY
 TADJIKISTAN;TJ
-TA<EFBFBD>WAN, PROVINCE DE CHINE;TW
-TANZANIE, R<EFBFBD>PUBLIQUE-UNIE DE;TZ
+TAÏWAN, PROVINCE DE CHINE;TW
+TANZANIE, RÉPUBLIQUE-UNIE DE;TZ
 TCHAD;TD
-TCH<EFBFBD>QUE, R<EFBFBD>PUBLIQUE;CZ
-TERRES AUSTRALES FRAN<EFBFBD>AISES;TF
-THA<EFBFBD>LANDE;TH
+TCHÈQUE, RÉPUBLIQUE;CZ
+TERRES AUSTRALES FRANÇAISES;TF
+THAÏLANDE;TH
 TIMOR-LESTE;TL
 TOGO;TG
 TOKELAU;TK
 TONGA;TO
-TRINIT<EFBFBD>-ET-TOBAGO;TT
+TRINITÉ-ET-TOBAGO;TT
 TUNISIE;TN
-TURKM<EFBFBD>NISTAN;TM
-TURKS ET CA<EFBFBD>QUES, <EFBFBD>LES;TC
+TURKMÉNISTAN;TM
+TURKS ET CAÏQUES, ÎLES;TC
 TURQUIE;TR
 TUVALU;TV
 UKRAINE;UA
@@ -252,6 +252,6 @@ VANUATU;VU
 VENEZUELA;VE
 VIET NAM;VN
 WALLIS ET FUTUNA;WF
-Y<EFBFBD>MEN;YE
+YÉMEN;YE
 ZAMBIE;ZM
 ZIMBABWE;ZW
--- a/dev/iso-normes/currencies_iso-4217.txt
+++ b/dev/iso-normes/currencies_iso-4217.txt
@@ -135,7 +135,7 @@ SKK,Slovak Koruna,2
 SLL,Sierra Leone Leone,2
 SOS,Somali Shilling,2
 SRD,Surinam Dollar,2
-STD,S<EFBFBD>o Tome and Principe Dobra,2
+STD,São Tome and Principe Dobra,2
 SVC,El Salvador Colon,2
 SYP,Syrian Pound,2
 SZL,Swaziland Lilangeni,2
--- a/dev/iso-normes/locales.txt
+++ b/dev/iso-normes/locales.txt
@@ -1,2 +1,9 @@

-See page http://demo.icu-project.org/icu-bin/locexp?d_=fr
+For languages:
+http://demo.icu-project.org/icu-bin/locexp?d_=fr
+
+For format number:
+http://en.wikipedia.org/wiki/Decimal_mark
+
+For date format:
+http://en.wikipedia.org/wiki/Date_format_by_country
--- a/dev/iso-normes/vat_number_names.txt
+++ b/dev/iso-normes/vat_number_names.txt
@@ -0,0 +1 @@
+http://en.wikipedia.org/wiki/VAT_identification_number
--- a/dev/resize_window.sh
+++ b/dev/resize_window.sh
@@ -8,7 +8,7 @@
 # Syntax
 if [ "x$1" = "x" ]
 then
-	echo "resize_windows.sh (list|0x99999999)"
+	echo "resize_windows.sh (list|0x99999999) [1280 1024]"
 fi

 # To list all windows
@@ -20,7 +20,19 @@ fi
 # To resize a specific window
 if [ "x$1" != "xlist" -a "x$1" != "x" ]
 then
-	wmctrl -i -r $1 -e 0,0,0,1280,1024
-	echo Size of windows $1 modified
+	if [ "x$2" = "x" ]
+	then
+		width=1280
+	else
+		width=$2
+	fi
+	if [ "x$3" = "x" ]
+	then
+		height=1024
+	else
+		height=$3
+	fi
+	wmctrl -i -r $1 -e 0,0,0,$width,$height
+	echo Size of windows $1 modified to $width x $height
 fi

--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -77,7 +77,7 @@ class modMyModule extends DolibarrModules
 		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
 		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
 		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (core/theme)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
 		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
 		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
 		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
@@ -97,8 +97,10 @@ class modMyModule extends DolibarrModules
 		$this->config_page_url = array("mysetuppage.php@mymodule");

 		// Dependencies
+		$this->hidden = false;			// A condition to hide module
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("mylangfile@mymodule");
@@ -242,7 +244,7 @@ class modMyModule extends DolibarrModules
 	{
 		$sql = array();

-		$result=$this->load_tables();
+		$result=$this->_load_tables('/mymodule/sql/');

 		return $this->_init($sql, $options);
 	}
@@ -262,19 +264,6 @@ class modMyModule extends DolibarrModules
 		return $this->_remove($sql, $options);
 	}

-
-	/**
-	 *		Create tables, keys and data required by module
-	 * 		Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-	 * 		and create data commands must be stored in directory /mymodule/sql/
-	 *		This function is called by this->init
-	 *
-	 * 		@return		int		<=0 if KO, >0 if OK
-	 */
-	function load_tables()
-	{
-		return $this->_load_tables('/mymodule/sql/');
-	}
 }

-?>
+?>
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -37,12 +37,10 @@

 // Change this following line to use the correct relative path (../, ../../, etc)
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
-if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php';
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
 if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
 dol_include_once('/module/class/skeleton_class.class.php');
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -31,10 +31,10 @@ $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;
+	exit(-1);
 }

-// Init global variables
+// Global variables
 $version='1.0';
 $error=0;

@@ -57,10 +57,10 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();


-print "***** ".$script_file." (".$version.") *****\n";
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! isset($argv[1])) {	// Check parameters
    print "Usage: ".$script_file." param1 param2 ...\n";
-    exit;
+	exit(-1);
 }
 print '--- start'."\n";
 print 'Argument 1='.$argv[1]."\n";
@@ -163,5 +163,5 @@ else

 $db->close();	// Close $db database opened handler

-return $error;
-?>
+exit($error);
+?>
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#------------------------------------------------------
+# Script to pull language files to Transifex
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]
+#------------------------------------------------------
+
+# Syntax
+if [ "x$1" = "x" ]
+then
+	echo "This pull remote transifex files to local dir."
+	echo "Note:  If you pull a language file (not source), file will be skipped if local file is newer."
+	echo "       Using -f will overwrite local file (does not work with 'all')."
+	echo "Usage: txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]"
+	exit
+fi
+
+
+if [ "x$1" = "xall" ]
+then
+	for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR vi_VN zh_CN zh_TW
+	do
+		echo "tx pull -l $fic $2 $3"
+		tx pull -l $fic $2 $3
+	done
+else
+	echo "tx pull -l $1 $2 $3 $4"
+	tx pull -l $1 $2 $3 $4
+fi
+
--- a/dev/translation/txpush.sh
+++ b/dev/translation/txpush.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------
+# Script to push language files to Transifex
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f]
+#------------------------------------------------------
+
+# Syntax
+if [ "x$1" = "x" ]
+then
+	echo "This push local files to transifex."
+	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
+	echo "       Using -f will overwrite translation but not memory."
+	echo "Usage: txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f] [--skip] [--no-interactive]"
+	exit
+fi
+
+
+if [ "x$1" = "xall" ]
+then
+	for fic in ar_SA bg_BG ca_ES da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sl_SI sv_SE tr_TR vi_VN zh_CN zh_TW
+	do
+		echo "tx push -t -l $fic $2 $3"
+		tx push -t -l $fic $2 $3
+	done
+else
+if [ "x$1" = "xsource" ]
+then
+	echo "tx push -s $2 $3"
+	tx push -s $2 $3 
+else
+	echo "tx push -t -l $1 $2 $3 $4"
+	tx push -t -l $1 $2 $3 $4
+fi
+fi
--- a/doc/images/dolibarr_screenshot1_300x188.png
+++ b/doc/images/dolibarr_screenshot1_300x188.png
--- a/doc/images/dolibarr_screenshot1_640x400.png
+++ b/doc/images/dolibarr_screenshot1_640x400.png
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -1,9 +1,11 @@
 /test.php
 /custom*
 /bootstrap
-/multicompany
-/ovh
-/numberingpack
+/extensions
 /google
-/skincoloreditor
+/multicompany
+/numberingpack
+/ovh
 /pos
+/skincoloreditor
+/ultimatepdf
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -102,6 +102,8 @@ if ($action == 'unset')
 * View
 */

+$form = new Form($db);
+
 $help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';

 llxHeader('',$langs->trans("MembersSetup"),$help_url);
@@ -127,23 +129,19 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 $var=true;
-$form = new Form($db);

 // Login/Pass required for members
-if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-{
-    $var=!$var;
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
-    print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
-    print '</td><td align="center" width="80">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-    print "</td></tr>\n";
-    print '</form>';
-}
+$var=!$var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print "</td></tr>\n";
+print '</form>';

 // Mail required for members
 $var=!$var;
@@ -265,7 +263,7 @@ print '<br>';


 /*
- * Edition des variables globales non rattache a un theme specifique
+ * Edition des variables globales non rattachées à un theme specifique
 */
 $constantes=array(
 		'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT',
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -50,7 +50,7 @@ if (!$user->admin) accessforbidden();
 * Actions
 */

-require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';



--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -51,7 +51,7 @@ if (!$user->admin) accessforbidden();
 * Actions
 */

-require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';



--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -17,14 +17,13 @@
 */

 /**
- *	\file       htdocs/contact/canvas/actions_adherentcard_common.class.php
- *	\ingroup    thirdparty
+ *	\file       htdocs/adherents/canvas/actions_adherentcard_common.class.php
+ *	\ingroup    adherent
 *	\brief      Fichier de la classe Adherent card controller (common)
 */

 /**
- *	\class      ActionsAdherentCardCommon
- *	\brief      Classe permettant la gestion des adherents par defaut
+ *	Class to maage members using default canvas
 */
 abstract class ActionsAdherentCardCommon
 {
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -368,7 +368,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                	$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
                }
                //print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
-                $result=$invoice->addline($invoice->id,$label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
+                $result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
                if ($result <= 0)
                {
                    $errmsg=$invoice->error;
@@ -528,7 +528,7 @@ if ($rowid)
    print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
    print '</tr>';

-    // Name
+    // Lastname
    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
    print '</tr>';

@@ -536,6 +536,9 @@ if ($rowid)
    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
    print '</tr>';

+    // EMail
+    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+
    // Status
    print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';

@@ -697,7 +700,7 @@ if ($rowid)
            {
                $objp = $db->fetch_object($result);
                $var=!$var;
-                print "<tr $bc[$var]>";
+                print "<tr ".$bc[$var].">";
                $cotisationstatic->ref=$objp->crowid;
                $cotisationstatic->id=$objp->crowid;
                print '<td>'.$cotisationstatic->getNomUrl(1).'</td>';
@@ -820,8 +823,7 @@ if ($rowid)
 			// Create a form array
 			$formquestion=array(array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));

-			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
 		}


--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -107,8 +107,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
            '%MONTH%'=>$month,
            '%DAY%'=>$day,
            '%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
-            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/",	
-            '%SOCIETE%'=>$objp->company
+            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/"
            );
            complete_substitutions_array($substitutionarray, $langs);

@@ -204,7 +203,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
    	dol_print_error($db);
    }

-    if (! $mesg) 
+    if (! $mesg)
    {
    	$db->close();
    	exit;
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -27,8 +27,6 @@
 */

 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';


@@ -67,6 +65,7 @@ class Adherent extends CommonObject
    var $country;

    var $email;
+    var $skype;
    var $phone;
    var $phone_perso;
    var $phone_mobile;
@@ -268,6 +267,9 @@ class Adherent extends CommonObject

        $now=dol_now();

+        // Clean parameters
+        $this->import_key = trim($this->import_key);
+
        // Check parameters
        if (! empty($conf->global->ADHERENT_MAIL_REQUIRED) && ! isValidEMail($this->email))
        {
@@ -289,7 +291,7 @@ class Adherent extends CommonObject

        // Insert member
        $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent";
-        $sql.= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity)";
+        $sql.= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
        $sql.= " VALUES (";
        $sql.= " '".$this->db->idate($this->datec)."'";
        $sql.= ", ".($this->login?"'".$this->db->escape($this->login)."'":"null");
@@ -297,6 +299,7 @@ class Adherent extends CommonObject
        $sql.= ", null, null, '".$this->morphy."'";
        $sql.= ", '".$this->typeid."'";
        $sql.= ", ".$conf->entity;
+        $sql.= ", ".(! empty($this->import_key) ? "'".$this->import_key."'":"null");
        $sql.= ")";

        dol_syslog(get_class($this)."::create sql=".$sql);
@@ -428,6 +431,7 @@ class Adherent extends CommonObject
        $sql.= ", country=".($this->country_id>0?"'".$this->country_id."'":"null");
        $sql.= ", state_id=".($this->state_id>0?"'".$this->state_id."'":"null");
        $sql.= ", email='".$this->email."'";
+        $sql.= ", skype='".$this->skype."'";
        $sql.= ", phone="   .($this->phone?"'".$this->db->escape($this->phone)."'":"null");
        $sql.= ", phone_perso="  .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
        $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
@@ -524,6 +528,7 @@ class Adherent extends CommonObject
                        $luser->societe_id=$this->societe;

                        $luser->email=$this->email;
+                        $luser->skype=$this->skype;
                        $luser->office_phone=$this->phone;
                        $luser->user_mobile=$this->phone_mobile;

@@ -562,7 +567,8 @@ class Adherent extends CommonObject
                        $lthirdparty->zip=$this->zip;
                        $lthirdparty->town=$this->town;
                        $lthirdparty->email=$this->email;
-                        $lthirdparty->tel=$this->phone;
+                        $lthirdparty->skype=$this->skype;
+                        $lthirdparty->phone=$this->phone;
                        $lthirdparty->state_id=$this->state_id;
                        $lthirdparty->country_id=$this->country_id;
                        $lthirdparty->country_id=$this->country_id;
@@ -1000,6 +1006,36 @@ class Adherent extends CommonObject
        }
    }

+    /**
+     *	Method to load member from its name
+     *
+     *	@param	string	$firstname	Firstname
+     *	@param	string	$lastname	Lastname
+     *	@return	void
+     */
+    function fetch_name($firstname,$lastname)
+    {
+    	global $conf;
+
+    	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+    	$sql.= " WHERE firstname='".$this->db->escape($firstname)."'";
+    	$sql.= " AND lastname='".$this->db->escape($lastname)."'";
+    	$sql.= " AND entity = ".$conf->entity;
+
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		if ($this->db->num_rows($resql))
+    		{
+    			$obj = $this->db->fetch_object($resql);
+    			$this->fetch($obj->rowid);
+    		}
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    	}
+    }

    /**
     *	Load member from database
@@ -1007,14 +1043,15 @@ class Adherent extends CommonObject
     *	@param	int		$rowid      Id of object to load
     * 	@param	string	$ref		To load member from its ref
     * 	@param	int		$fk_soc		To load member from its link to third party
+     * 	@param	int		$ref_ext	External reference
     *	@return int         		>0 if OK, 0 if not found, <0 if KO
     */
-    function fetch($rowid,$ref='',$fk_soc='')
+    function fetch($rowid,$ref='',$fk_soc='',$ref_ext='')
    {
        global $langs;

        $sql = "SELECT d.rowid, d.ref_ext, d.civilite, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,";
-        $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
+        $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
        $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
        $sql.= " d.datec as datec,";
        $sql.= " d.tms as datem,";
@@ -1038,6 +1075,10 @@ class Adherent extends CommonObject
        	if ($ref) $sql.= " AND d.rowid='".$ref."'";
        	elseif ($fk_soc) $sql.= " AND d.fk_soc='".$fk_soc."'";
        }
+        elseif ($ref_ext)
+        {
+        	$sql.= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
+        }

        dol_syslog(get_class($this)."::fetch sql=".$sql);
        $resql=$this->db->query($sql);
@@ -1078,6 +1119,7 @@ class Adherent extends CommonObject
                $this->phone_perso		= $obj->phone_perso;
                $this->phone_mobile		= $obj->phone_mobile;
                $this->email			= $obj->email;
+                $this->skype			= $obj->skype;

                $this->photo			= $obj->photo;
                $this->statut			= $obj->statut;
@@ -1101,12 +1143,10 @@ class Adherent extends CommonObject

                // Retreive all extrafield for thirdparty
                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
                $extrafields=new ExtraFields($this->db);
                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                if (count($extralabels)>0) {
-                	$this->fetch_optionals($this->id,$extralabels);
-                }
+                $this->fetch_optionals($this->id,$extralabels);

                // Load other properties
                $result=$this->fetch_subscriptions();
@@ -1140,6 +1180,8 @@ class Adherent extends CommonObject
    {
        global $langs;

+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+
        $sql = "SELECT c.rowid, c.fk_adherent, c.cotisation, c.note, c.fk_bank,";
        $sql.= " c.tms as datem,";
        $sql.= " c.datec as datec,";
@@ -1209,6 +1251,8 @@ class Adherent extends CommonObject
    {
        global $conf,$langs,$user;

+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+
 		$error=0;

        // Clean parameters
@@ -1380,8 +1424,7 @@ class Adherent extends CommonObject


    /**
-     *  Fonction qui ajoute l'adherent aux abonnements automatiques mailing-list, spip, etc.
-     *  TODO Move this into member creation trigger (trigger of mailmanspip module)
+     *  Function to add member into external tools mailing-list, spip, etc.
     *
     *  @return		int		<0 if KO, >0 if OK
     */
@@ -1400,7 +1443,7 @@ class Adherent extends CommonObject
            $result=$mailmanspip->add_to_mailman($this);
            if ($result < 0)
            {
-            	$this->error=$mailmanspip->error;
+            	if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
                $err+=1;
            }
            foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail)
@@ -1421,7 +1464,7 @@ class Adherent extends CommonObject
            $result=$mailmanspip->add_to_spip($this);
            if ($result < 0)
            {
-            	$this->error=$mailmanspip->error;
+            	$this->errors[]=$mailmanspip->error;
            	$err+=1;
            }
        }
@@ -1437,8 +1480,7 @@ class Adherent extends CommonObject


    /**
-     *  Fonction qui supprime l'adherent des abonnements automatiques mailing-list, spip, etc.
-     *  TODO Move this into member deletion trigger (trigger of mailmanspip module)
+     *  Function to delete a member from external tools like mailing-list, spip, etc.
     *
     *  @return     int     <0 if KO, >0 if OK
     */
@@ -1457,7 +1499,7 @@ class Adherent extends CommonObject
            $result=$mailmanspip->del_to_mailman($this);
            if ($result < 0)
            {
-                $this->error=$mailmanspip->error;
+                if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
                $err+=1;
            }

@@ -1478,6 +1520,7 @@ class Adherent extends CommonObject
            $result=$mailmanspip->del_to_spip($this);
            if ($result < 0)
            {
+            	$this->errors[]=$mailmanspip->error;
                $err+=1;
            }
        }
@@ -1502,7 +1545,7 @@ class Adherent extends CommonObject
    {
    	global $langs;
    	$langs->load("dict");
-    	
+
    	$code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:''));
    	if (empty($code)) return '';
    	return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
@@ -1663,6 +1706,7 @@ class Adherent extends CommonObject
            {
                $this->nb["members"]=$obj->nb;
            }
+            $this->db->free($resql);
            return 1;
        }
        else
@@ -1743,6 +1787,7 @@ class Adherent extends CommonObject
        $this->country = 'France';
        $this->morphy = 1;
        $this->email = 'specimen@specimen.com';
+        $this->skype = 'tom.hanson';
        $this->phone        = '0999999999';
        $this->phone_perso  = '0999999998';
        $this->phone_mobile = '0999999997';
@@ -1814,6 +1859,7 @@ class Adherent extends CommonObject
        if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN))        $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
        if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))     $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
        if ($this->email && ! empty($conf->global->LDAP_MEMBER_FIELD_MAIL))       $info[$conf->global->LDAP_MEMBER_FIELD_MAIL] = $this->email;
+        if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))       $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
        if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE))      $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
        if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
        if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -96,9 +96,9 @@ class Cotisation extends CommonObject


 	/**
-	 *  Fonction qui permet de recuperer une cotisation
+	 *  Method to load a subscription
 	 *
-	 *  @param	int		$rowid		Id cotisation
+	 *  @param	int		$rowid		Id subscription
 	 *  @return	int					<0 if KO, =0 if not found, >0 if OK
 	 */
 	function fetch($rowid)
@@ -111,7 +111,7 @@ class Cotisation extends CommonObject
 		$sql.=" FROM ".MAIN_DB_PREFIX."cotisation";
 		$sql.="	WHERE rowid=".$rowid;

-		dol_syslog("Cotisation::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch sql=".$sql);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -166,7 +166,7 @@ class Cotisation extends CommonObject
 		$sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
 		$sql .= " WHERE rowid = ".$this->id;

-		dol_syslog("Cotisation::update sql=".$sql);
+		dol_syslog(get_class($this)."::update sql=".$sql);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -181,7 +181,7 @@ class Cotisation extends CommonObject
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error();
-			dol_syslog("Cotisation::update ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -205,7 +205,7 @@ class Cotisation extends CommonObject
 		$this->db->begin();

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE rowid = ".$this->id;
-		dol_syslog("Cotisation::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete sql=".$sql);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -138,7 +138,7 @@ if ($result)
            print "<form method=\"post\" action=\"cotisations.php\">";
            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
        }
-        print "<tr $bc[$var]>";
+        print "<tr ".$bc[$var].">";

        // Ref
        print '<td>'.$cotisation->getNomUrl(1).'</td>';
@@ -171,7 +171,6 @@ if ($result)
                {
                    print '<input type="hidden" name="action" value="2bank">';
                    print '<input type="hidden" name="rowid" value="'.$objp->crowid.'">';
-                    $form = new Form($db);
                    $form->select_comptes('','accountid',0,'',1);
                    print '<br>';
                    $form->select_types_paiements('','paymenttypeid');
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -3,6 +3,7 @@
 * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
 *
 * 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
@@ -60,47 +61,31 @@ if (! $sortfield) $sortfield="name";


 $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $id;
-
-
-
+$form = new Form($db);
+$object=new Adherent($db);
+$membert=new AdherentType($db);
+$result=$object->fetch($id);
+if ($result < 0)
+{
+	dol_print_error($db);
+	exit;
+}
 /*
 * Actions
 */

-// Envoie fichier
-if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	dol_add_file_process($upload_dir,0,1,'userfile');
-}
-
-// Suppression fichier
-if ($action == 'confirm_deletefile' && $confirm == 'yes')
-{
-    $langs->load("other");
-	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-	$ret=dol_delete_file($file);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-    exit;
-}
+include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';


 /*
 * View
 */

-$form = new Form($db);
-$object=new Adherent($db);
-$membert=new AdherentType($db);

 llxHeader();

 if ($id > 0)
 {
-    $result=$object->fetch($id);
    $result=$membert->fetch($object->typeid);
 	if ($result > 0)
 	{
@@ -180,24 +165,10 @@ if ($id > 0)

 		print '</div>';

-		/*
-		 * Confirmation suppression fichier
-		 */
-		if ($action == 'delete')
-		{
-			$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
-			if ($ret == 'html') print '<br>';
-		}
-
-
-		// Affiche formulaire upload
-		$formfile=new FormFile($db);
-		$formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$object->id,'',0,0,$user->rights->adherent->creer,50,$object);
-
-
-		// List of document
-		$formfile->list_of_documents($filearray,$object,'member','', 0, get_exdir($object->id,2,0,1).'/'.$object->id.'/');
-
+		$modulepart = 'member';
+		$permission = $user->rights->adherent->creer;
+		$param = '&id=' . $object->id;
+		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 		print "<br><br>";
 	}
 	else
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -285,6 +285,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 		$object->phone_perso = trim($_POST["phone_perso"]);
 		$object->phone_mobile= trim($_POST["phone_mobile"]);
 		$object->email       = trim($_POST["email"]);
+    $object->skype       = trim($_POST["skype"]);
 		$object->birth       = $birthdate;

 		$object->typeid      = $_POST["typeid"];
@@ -361,33 +362,6 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 				}
 			}

-			// Rajoute l'utilisateur dans les divers abonnements (mailman, spip, etc...)
-			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))
-			{
-				if ($object->oldcopy->email != $object->email)    // If email has changed we delete mailman subscription for old email
-				{
-					if ($object->oldcopy->del_to_abo() < 0)
-					{
-						if (! empty($object->oldcopy->error)) setEventMessage($langs->trans("ErrorFailedToRemoveToMailmanList").': '.$object->oldcopy->error, 'errors');
-						setEventMessage($object->oldcopy->errors, 'errors');
-					}
-					else
-					{
-						setEventMessage($object->oldcopy->mesgs,'mesgs');
-					}
-				}
-    			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
-    			if ($object->add_to_abo() < 0)
-    			{
-    				 if (! empty($object->error)) setEventMessage($langs->trans("ErrorFailedToAddToMailmanList").': '.$object->error, 'errors');
-    				 setEventMessage($object->errors, 'errors');
-    			}
-				else
-				{
-					setEventMessage($object->mesgs, 'mesgs');
-				}
-			}
-
 			$rowid=$object->id;
 			$action='';

@@ -440,6 +414,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
 	$phone=$_POST["phone"];
 	$phone_perso=$_POST["phone_perso"];
 	$phone_mobile=$_POST["phone_mobile"];
+  $skype=$_POST["member_skype"];
 	$email=$_POST["member_email"];
 	$login=$_POST["member_login"];
 	$pass=$_POST["password"];
@@ -464,6 +439,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
 	$object->phone       = $phone;
 	$object->phone_perso = $phone_perso;
 	$object->phone_mobile= $phone_mobile;
+  $object->skype       = $skype;
 	$object->email       = $email;
 	$object->login       = $login;
 	$object->pass        = $pass;
@@ -602,15 +578,6 @@ if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm ==
 				$errmsg.=$object->error;
 			}
 		}
-
-		// Add user to other systems (mailman, spip, etc...)
-		// TODO Move this into trigger on validate action
-		if (! $error && $object->add_to_abo() < 0)
-		{
-			$langs->load("errors");
-			$error++;
-			$errmsg.= $langs->trans("ErrorFailedToAddToMailmanList").': '.$object->error." ".join(',',$object->errors)."<br>\n";
-		}
 	}
 	else
 	{
@@ -649,13 +616,6 @@ if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
 			{
 				$errmsg.=$object->error;
 			}
-
-			// supprime l'utilisateur des divers abonnements ..
-			if ($object->del_to_abo() < 0)
-			{
-				// error
-				$errmsg.=$langs->trans("FaildToRemoveFromMailmanList").': '.$object->error."<br>\n";
-			}
 		}
 		else
 		{
@@ -698,7 +658,7 @@ if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm

 /*
 * View
-*/
+ */

 $form = new Form($db);
 $formcompany = new FormCompany($db);
@@ -736,7 +696,7 @@ else
 		/*                                                                            */
 		/* ************************************************************************** */
 		$object->canvas=$canvas;
-		$object->state_id = GETPOST('departement_id', 'int');
+		$object->state_id = GETPOST('state_id', 'int');

 		// We set country_id, country_code and country for the selected country
 		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
@@ -831,6 +791,9 @@ else
 		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
 		print '</tr>';

+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
+
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -884,9 +847,12 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';

-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
+    // Skype
+    if (! empty($conf->skype->enabled)) 
+    {
+		    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
+    }
+    
 		// Birthday
 		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
 		$form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
@@ -1078,6 +1044,9 @@ else
 		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td>';
 		print '</tr>';

+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
+
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -1120,9 +1089,11 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td></tr>';

-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
-
+    // Skype
+    if (! empty($conf->skype->enabled)) {
+		    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
+    }
+    
 		// Birthday
 		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
 		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
@@ -1237,8 +1208,7 @@ else
 				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
 				else $text.=$langs->trans("UserWillBeInternalUser");
 			}
-			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
 		}

 		// Confirm create third party
@@ -1257,8 +1227,7 @@ else
 			// Create a form array
 			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));

-			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
 		}

 		// Confirm validate member
@@ -1331,8 +1300,7 @@ else
 			$formquestion=array();
 			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
 			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			$ret=$form->form_confirm("fiche.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
 		}

 		// Confirm remove member
@@ -1340,8 +1308,7 @@ else
 		{
 			$formquestion=array();
 			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			$ret=$form->form_confirm("fiche.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
 		}

 		/*
@@ -1349,8 +1316,7 @@ else
 		*/
 		if ($action == 'add_spip')
 		{
-			$ret=$form->form_confirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
 		}

 		/*
@@ -1358,8 +1324,7 @@ else
 		*/
 		if ($action == 'del_spip')
 		{
-			$ret=$form->form_confirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
-			if ($ret == 'html') print '<br>';
+			print $form->formconfirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
 		}

 		$rowspan=17;
@@ -1404,13 +1369,16 @@ else
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
 		print '</tr>';

-		// Name
+		// Lastname
 		print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
 		print '</tr>';

 		// Firstname
 		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td></tr>';

+		// EMail
+		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -1444,8 +1412,8 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td class="valeur">'.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'</td></tr>';

-		// EMail
-		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+    // Skype
+		print '<tr><td>'.$langs->trans("Skype").'</td><td class="valeur">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';

 		// Birthday
 		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -291,8 +291,7 @@ if ($rowid && $action != 'edit')
        //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text=$langs->trans("ConfirmDeleteSubscription");
 		if (! empty($conf->banque->enabled) && ! empty($conf->global->ADHERENT_BANK_USE)) $text.='<br>'.img_warning().' '.$langs->trans("ThisWillAlsoDeleteBankRecord");
-		$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$subscription->id,$langs->trans("DeleteSubscription"),$text,"confirm_delete",$formquestion,0,1);
-        if ($ret == 'html') print '<br>';
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$subscription->id,$langs->trans("DeleteSubscription"),$text,"confirm_delete",$formquestion,0,1);
    }

    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -135,15 +135,15 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("SearchAMember").'</td>';
 print "</tr>\n";
 $var=false;
-print "<tr $bc[$var]>";
+print "<tr ".$bc[$var].">";
 print '<td>';
 print $langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="16">';
 print '</td><td rowspan="3"><input class="button" type="submit" value="'.$langs->trans("Search").'"></td></tr>';
-print "<tr $bc[$var]>";
+print "<tr ".$bc[$var].">";
 print '<td>';
 print $langs->trans("Name").':</td><td><input type="text" name="search_lastname" class="flat" size="16">';
 print '</td></tr>';
-print "<tr $bc[$var]>";
+print "<tr ".$bc[$var].">";
 print '<td>';
 print $langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="16">';
 print '</td></tr>';
@@ -338,7 +338,7 @@ print "</tr>\n";
 foreach ($AdherentType as $key => $adhtype)
 {
 	$var=!$var;
-	print "<tr $bc[$var]>";
+	print "<tr ".$bc[$var].">";
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
 	print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
@@ -402,7 +402,7 @@ krsort($Total);
 foreach ($Total as $key=>$value)
 {
 	$var=!$var;
-	print "<tr $bc[$var]>";
+	print "<tr ".$bc[$var].">";
 	print "<td><a href=\"cotisations.php?date_select=$key\">$key</a></td>";
 	print "<td align=\"right\">".$Number[$key]."</td>";
 	print "<td align=\"right\">".price($value)."</td>";
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -149,7 +149,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 // Show filter box
 /*print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<table class="border" width="100%">';
-print '<tr><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 print '<tr><td>'.$langs->trans("Member").'</td><td>';
 $filter='s.client in (1,2,3)';
 print $form->select_company($id,'memberid',$filter,1);
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -233,7 +233,6 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 /* ************************************************************************** */
 if ($action == 'create')
 {
-	$form = new Form($db);
 	$adht = new AdherentType($db);

 	print_fiche_titre($langs->trans("NewMemberType"));
@@ -620,8 +619,6 @@ if ($rowid > 0)

 	if ($action == 'edit')
 	{
-		$form = new Form($db);
-
 		$adht = new AdherentType($db);
 		$adht->id = $rowid;
 		$adht->fetch($rowid);
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent	      <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent	      <jmenent@2byte.es>
 * Copyright (C) 2011-2012 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -48,11 +48,11 @@ if ($action == 'setcomptamode')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }

 }
@@ -67,11 +67,11 @@ if ($action == 'setchart')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -88,11 +88,11 @@ if ($action == 'update' || $action == 'add')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -255,8 +255,6 @@ if ($num)
 	print "</table>\n";
 }

-dol_htmloutput_mesg($mesg);
-
 $db->close();

 llxFooter();
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -84,13 +84,13 @@ if ($action == "save" && empty($cancel))

 	if (! $error)
    {
-    	$db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
+        $db->commit();
    }
    else
    {
-    	$db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
+        $db->rollback();
    }
 }

@@ -161,8 +161,9 @@ if (! empty($triggers))
 		if ($module == 'order_supplier' || $module == 'invoice_supplier') $module = 'fournisseur';
 		if ($module == 'shipping') $module = 'expedition_bon';
 		if ($module == 'member') $module = 'adherent';
+		if ($module == 'project') $module = 'projet';
 		//print 'module='.$module.'<br>';
-		if ($conf->$module->enabled)
+		if (! empty($conf->$module->enabled))
 		{
 			$var=!$var;
 			print '<tr '.$bc[$var].'>';
@@ -188,8 +189,6 @@ dol_fiche_end();

 print "<br>";

-dol_htmloutput_mesg($mesg);
-
 llxFooter();

 $db->close();
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -56,7 +56,7 @@ if (!$user->admin) accessforbidden();
 * Actions
 */

-require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';



--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2012 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
 *
 * 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
@@ -97,12 +97,12 @@ if ($actionsave)
    if (! $error)
    {
        $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
        $db->rollback();
-        if (empty($errorsaved)) $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        if (empty($errorsaved))	setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -225,9 +225,6 @@ print "</form>\n";

 dol_fiche_end();

-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();

 $db->close();
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2008-2010	Laurent Destailleur <eldy@users.sourceforge.net>
 * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2013  Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
@@ -127,8 +127,6 @@ dol_fiche_end();

 print "<br>";

-dol_htmloutput_mesg($mesg);
-
 llxFooter();

 $db->close();
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012-2013	Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
 *
 * This program is free software; you can redistribute it and/or modify
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2009 		Laurent Destailleur            <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012  Juanjo Menent			       <jmenent@2byte.es>
+ * Copyright (C) 2010-2013  Juanjo Menent			       <jmenent@2byte.es>
 * Copyright (C) 2013       Philippe Grand                 <philippe.grand@atoo-net.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -54,11 +54,11 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -177,13 +177,13 @@ while ($i < $nbofbank)
 	if ($conf->global->BANK_SHOW_ORDER_OPTION == $i)
 	{
 		print '<td align="center">';
-		print img_picto($langs->trans("Activated"),'on');
+		print img_picto($langs->trans("Activated"),'switch_on');
 		print '</td>';
 	}
 	else
 	{
 		print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">';
-		print img_picto($langs->trans("Disabled"),'off');
+		print img_picto($langs->trans("Disabled"),'switch_off');
 		print '</a></td>';
 	}
 	print '<td>&nbsp;</td>';
@@ -193,8 +193,6 @@ while ($i < $nbofbank)

 print '</table>'."\n";

-dol_htmloutput_mesg($mesg);
-
 $db->close();

 llxFooter();
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011-2013	Juanjo Menent			<jmenent@2byte.es>
 *
 * 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
@@ -79,14 +79,14 @@ if($action && $action!='setcoder')
 {
 	if (! $res > 0) $error++;

-	if (! $error)
+ 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
-	}
+        setEventMessage($langs->trans("Error"),'errors');
+    }
 }

 /*
@@ -329,8 +329,6 @@ print '</table>';

 print "<br>";

-dol_htmloutput_mesg($mesg);
-
 $db->close();

 llxFooter();
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.org>
- * Copyright (C) 2011 	    Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
@@ -41,11 +41,11 @@ if ($action == 'setvalue' && $user->admin)
    $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("url"), 'chaine', 0, '', $conf->entity);
    if ($result >= 0)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -128,9 +128,6 @@ if (! empty($conf->global->CLICKTODIAL_URL))
 	}
 }

-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();

 $db->close();
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -6,7 +6,7 @@
 * Copyright (C) 2004      Andre Cianfarani             <acianfa@free.fr>
 * Copyright (C) 2005-2012 Regis Houssin                <regis.houssin@capnetworks.com>
 * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
- * Copyright (C) 2011-2012 Juanjo Menent			    <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
 * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
 * Copyright (C) 2013 	   Florian Henry			    <florian.henry@open-concept.pro>
 *
@@ -64,11 +64,11 @@ if ($action == 'updateMask')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -106,19 +106,19 @@ else if ($action == 'specimen')
 		}
 		else
 		{
-			$mesg='<font class="error">'.$module->error.'</font>';
+			setEventMessage($module->error,'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		$mesg='<font class="error">'.$langs->trans("ErrorModuleNotFound").'</font>';
+		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }

 // Activate a model
-else if ($action == 'set')
+if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
@@ -167,11 +167,11 @@ else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -185,11 +185,11 @@ else if ($action == 'set_COMMANDE_FREE_TEXT')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }
 else if ($action=='setModuleOptions') {
@@ -200,14 +200,6 @@ else if ($action=='setModuleOptions') {
 		$conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1');
 	}
 }
-else if ($action=='setModuleOptions') {
-	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity))
-	{
-		// La constante qui a ete lue en avant du nouveau set
-		// on passe donc par une variable pour avoir un affichage coherent
-		$conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1');
-	}
-}


 /*
@@ -240,7 +232,7 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td class="nowrap">'.$langs->trans("Example").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
 print '</tr>'."\n";

 clearstatcache();
@@ -264,14 +256,14 @@ foreach ($dirmodels as $reldir)

 					require_once $dir.$file.'.php';

-					$module = new $file;
+					$module = new $file($db);
+
+					// Show modules according to features level
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;

 					if ($module->isEnabled())
 					{
-						// Show modules according to features level
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
 						$var=!$var;
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
@@ -323,7 +315,7 @@ foreach ($dirmodels as $reldir)
 						print $form->textwithpicto('',$htmltooltip,1,0);
 						print '</td>';

-						print '</tr>';
+						print "</tr>\n";
 					}
 				}
 			}
@@ -331,17 +323,16 @@ foreach ($dirmodels as $reldir)
 		}
 	}
 }
-
-print '</table><br>';
+print "</table><br>\n";


 /*
 * Document templates generators
 */
+
 print_titre($langs->trans("OrdersModelModule"));

 // Load array def with activated templates
-$type='order';
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
@@ -371,7 +362,8 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="38" colspan="2">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="38">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";

 clearstatcache();
@@ -539,8 +531,6 @@ print '</table>';

 print '<br>';

-dol_htmloutput_mesg($mesg);
-
 llxFooter();

 $db->close();
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -41,8 +41,7 @@ $langs->load("companies");

 if (! $user->admin) accessforbidden();

-$message='';
-
+$error=0;

 /*
 * Actions
@@ -122,18 +121,21 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
                }
                else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
                {
+                	$error++;
                    $langs->load("errors");
                    $tmparray=explode(':',$result);
-                    $message .= '<div class="error">'.$langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]).'</div>';
+                    setEventMessage($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]),'errors');
                }
                else
                {
-                    $message .= '<div class="error">'.$langs->trans("ErrorFailedToSaveFile").'</div>';
+                	$error++;
+                    setEventMessage($langs->trans("ErrorFailedToSaveFile"),'errors');
                }
            }
            else
            {
-                $message .= '<div class="error">'.$langs->trans("ErrorOnlyPngJpgSupported").'</div>';
+            	$error++;
+                setEventMessage($langs->trans("ErrorOnlyPngJpgSupported"),'errors');
            }
        }
    }
@@ -157,7 +159,7 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
    dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION",$_POST["optionlocaltax1"],'chaine',0,'',$conf->entity);
    dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION",$_POST["optionlocaltax2"],'chaine',0,'',$conf->entity);

-    if ($action != 'updateedit' && ! $message)
+    if ($action != 'updateedit' && ! $error)
    {
        header("Location: ".$_SERVER["PHP_SELF"]);
        exit;
@@ -198,13 +200,15 @@ if ($action == 'addthumb')
        }
        else
        {
-            $message .= '<div class="error">'.$langs->trans("ErrorImageFormatNotSupported").'</div>';
+        	$error++;
+            setEventMessage($langs->trans("ErrorImageFormatNotSupported"),'errors');
            dol_syslog($langs->transnoentities("ErrorImageFormatNotSupported"),LOG_WARNING);
        }
    }
    else
    {
-        $message .= '<div class="error">'.$langs->trans("ErrorFileDoesNotExists",$_GET["file"]).'</div>';
+    	$error++;
+        setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
        dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
    }
 }
@@ -628,8 +632,6 @@ else
     * Show parameters
     */

-    dol_htmloutput_mesg($message);
-
    // Actions buttons
    //print '<div class="tabsAction">';
    //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
 * Copyright (C) 2013      Philippe Grand	    <philippe.grand@atoo-net.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -52,11 +52,11 @@ if ($action == 'setcomptamode')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }

 }
@@ -74,11 +74,11 @@ if ($action == 'update' || $action == 'add')

 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

@@ -148,7 +148,7 @@ print "<br>\n";

 // Cas des autres parametres COMPTA_*
 $list=array('COMPTA_PRODUCT_BUY_ACCOUNT','COMPTA_PRODUCT_SOLD_ACCOUNT','COMPTA_SERVICE_BUY_ACCOUNT','COMPTA_SERVICE_SOLD_ACCOUNT',
-'COMPTA_VAT_ACCOUNT','COMPTA_ACCOUNT_CUSTOMER','COMPTA_ACCOUNT_SUPPLIER'
+'COMPTA_VAT_ACCOUNT','COMPTA_VAT_BUY_ACCOUNT','COMPTA_ACCOUNT_CUSTOMER','COMPTA_ACCOUNT_SUPPLIER'
 );

 /*$sql = "SELECT rowid, name, value, type, note";
@@ -214,8 +214,6 @@ if ($num)
 	print "</table>\n";
 }

-dol_htmloutput_mesg($mesg);
-
 $db->close();

 llxFooter();
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -87,7 +87,7 @@ $h++;
 if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-	$head[$h][1] = $langs->trans("Sending");
+	$head[$h][1] = $langs->trans("Shipment");
 	$h++;
 }

--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
 *
 * 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
@@ -44,7 +45,6 @@ $constnote=GETPOST('constnote','alpha');
 $consttype=(GETPOST('consttype','alpha')?GETPOST('consttype','alpha'):'chaine');

 $typeconst=array('yesno' => 'yesno', 'texte' => 'texte', 'chaine' => 'chaine');
-$mesg='';



@@ -58,12 +58,12 @@ if ($action == 'add')

 	if (empty($constname))
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")),'errors');
 		$error++;
 	}
 	if ($constvalue == '')
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")),'errors');
 		$error++;
 	}

@@ -143,6 +143,8 @@ if ($action == 'delete')
 * View
 */

+$form = new Form($db);
+
 llxHeader('',$langs->trans("OtherSetup"));

 // Add logic to show/hide buttons
@@ -174,8 +176,6 @@ print_fiche_titre($langs->trans("OtherSetup"),'','setup');
 print $langs->trans("ConstDesc")."<br>\n";
 print "<br>\n";

-dol_htmloutput_mesg($mesg);
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -186,9 +186,6 @@ print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";


-$form = new Form($db);
-
-
 // Line to add new record
 $var=false;
 print "\n";
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2012      Juanjo Menent	    <jmenent@2byte.es>
+/* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
 * Copyright (C) 2011-2013      Philippe Grand	    <philippe.grand@atoo-net.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';

 $langs->load("admin");
 $langs->load("errors");
@@ -34,6 +35,8 @@ if (!$user->admin) accessforbidden();

 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
+$scandir = GETPOST('scandir','alpha');
+$type='contrat';

 if (empty($conf->global->CONTRACT_ADDON))
 {
@@ -53,36 +56,145 @@ if ($action == 'updateMask')

    if (! $res > 0) $error++;

-    if (! $error)
+ 	if (! $error)
    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+        setEventMessage($langs->trans("SetupSaved"));
    }
    else
    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        setEventMessage($langs->trans("Error"),'errors');
    }
 }

-if ($action == 'setmod')
+else if ($action == 'specimen') // For contract
 {
-    dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity);
+	$modele= GETPOST('module','alpha');
+
+	$contract = new Contrat($db);
+	$contract->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/contract/doc/pdf_".$modele.".modules.php",0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($contract,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=contract&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessage($obj->error,'errors');
+			dol_syslog($obj->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }

-/*
- // constants of magre model
- if ($action == 'updateMatrice') dolibarr_set_const($db, "CONTRACT_NUM_MATRICE",$_POST["matrice"],'chaine',0,'',$conf->entity);
- if ($action == 'updatePrefix') dolibarr_set_const($db, "CONTRACT_NUM_PREFIX",$_POST["prefix"],'chaine',0,'',$conf->entity);
- if ($action == 'setOffset') dolibarr_set_const($db, "CONTRACT_NUM_DELTA",$_POST["offset"],'chaine',0,'',$conf->entity);
- if ($action == 'setNumRestart') dolibarr_set_const($db, "CONTRACT_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity);
- */
+// Activate a model
+else if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+else if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->CONTRACT_ADDON_PDF == "$value") dolibarr_del_const($db, 'CONTRACT_ADDON_PDF',$conf->entity);
+	}
+}
+
+// Set default model
+else if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "CONTRACT_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->CONTRACT_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+else if ($action == 'setmod')
+{
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
+
+	dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity);
+}
+
+else if ($action == 'set_CONTRACT_FREE_TEXT')
+{
+	$freetext= GETPOST('CONTRACT_FREE_TEXT','alpha');
+	$res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
+{
+	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
+
+	$res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}

 /*
 * View
 */

+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+ 
 llxHeader();

-$dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -90,15 +202,9 @@ print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');

 print "<br>";

-$h = 0;
+$head=contract_admin_prepare_head();

-$head[$h][0] = DOL_URL_ROOT."/admin/contract.php";
-$head[$h][1] = $langs->trans("Contracts");
-$head[$h][2] = 'Contract';
-$hselected=$h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
+dol_fiche_head($head, 'contract', $langs->trans("ModuleSetup"));

 /*
 * Contracts Numbering model
@@ -112,94 +218,302 @@ print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";

 clearstatcache();

-$dir = "../core/modules/contract/";
-$handle = opendir($dir);
-if (is_resource($handle))
+foreach ($dirmodels as $reldir)
 {
-    $var=true;
+	$dir = dol_buildpath($reldir."core/modules/contract/");

-    while (($file = readdir($handle))!==false)
-    {
-        if (substr($file, 0, 13) == 'mod_contract_' && substr($file, dol_strlen($file)-3, 3) == 'php')
-        {
-            $file = substr($file, 0, dol_strlen($file)-4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			$var=true;

-            require_once DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.'.php';
+			while (($file = readdir($handle))!==false)
+			{
+				if (substr($file, 0, 13) == 'mod_contract_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file)-4);

-            $module = new $file;
+					require_once $dir.$file.'.php';

-            // Show modules according to features level
-            if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-            if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					$module = new $file($db);

-            if ($module->isEnabled())
-            {
-                $var=!$var;
-                print '<tr '.$bc[$var].'><td>'.$module->nom."</td>\n";
-                print '<td>';
-                print $module->info();
-                print '</td>';
+					// Show modules according to features level
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;

-                // Show example of numbering model
-                print '<td class="nowrap">';
-                $tmp=$module->getExample();
-                if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-                elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-                else print $tmp;
-                print '</td>'."\n";
+					if ($module->isEnabled())
+					{
+						$var=!$var;
+						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';

-                print '<td align="center">';
-                if ($conf->global->CONTRACT_ADDON == "$file")
-                {
-                    print img_picto($langs->trans("Activated"),'switch_on');
-                }
-                else
-                {
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-                    print img_picto($langs->trans("Disabled"),'switch_off');
-                    print '</a>';
-                }
-                print '</td>';
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp=$module->getExample();
+						if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+						elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";

-                $contract=new Contrat($db);
-                $contract->initAsSpecimen();
+						print '<td align="center">';
+						if ($conf->global->CONTRACT_ADDON == "$file")
+						{
+							print img_picto($langs->trans("Activated"),'switch_on');
+						}
+						else
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print img_picto($langs->trans("Disabled"),'switch_off');
+							print '</a>';
+						}
+						print '</td>';

-                // Info
-                $htmltooltip='';
-                $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                $nextval=$module->getNextValue($mysoc,$contract);
-                if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                {
-                    $htmltooltip.=''.$langs->trans("NextValue").': ';
-                    if ($nextval)
-                    {
-                        $htmltooltip.=$nextval.'<br>';
-                    }
-                    else
-                    {
-                        $htmltooltip.=$langs->trans($module->error).'<br>';
-                    }
-                }
+						$contract=new Contrat($db);
+						$contract->initAsSpecimen();

-                print '<td align="center">';
-                print $form->textwithpicto('',$htmltooltip,1,0);
-                print '</td>';
+						// Info
+						$htmltooltip='';
+						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval=$module->getNextValue($mysoc,$contract);
+						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
+						{
+							$htmltooltip.=''.$langs->trans("NextValue").': ';
+							if ($nextval)
+							{
+								$htmltooltip.=$nextval.'<br>';
+							}
+							else
+							{
+								$htmltooltip.=$langs->trans($module->error).'<br>';
+							}
+						}

-                print '</tr>';
-            }
-        }
-    }
-    closedir($handle);
+						print '<td align="center">';
+						print $form->textwithpicto('',$htmltooltip,1,0);
+						print '</td>';
+
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }

 print '</table><br>';

-dol_htmloutput_mesg($mesg);
+/*
+ *  Documents models for Contracts
+ */
+
+print_titre($langs->trans("TemplatePDFContracts"));
+
+// Defini tableau def des modeles
+$type='contrat';
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/contract".$valdir);
+
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->CONTRACT_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'contract').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
+
+/*
+ * Other options
+ *
+ */
+
+print_titre($langs->trans("OtherOptions"));
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print "<td>&nbsp;</td>\n";
+print "</tr>\n";
+$var=true;
+
+$var=! $var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_CONTRACT_FREE_TEXT">';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+//Use draft Watermark
+$var=!$var;
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"set_CONTRACT_DRAFT_WATERMARK\">";
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("WatermarkOnDraftContractCards").'<br>';
+print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+print '</table>';
+
+print '<br>';

 $db->close();

--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -123,15 +123,16 @@ if ($action == 'update')
 * View
 */

+$form = new Form($db);
+
 llxHeader();

 print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','setup');

 print $langs->transnoentities("DelaysOfToleranceDesc",img_warning());
-print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print " ".$langs->trans("OnlyActiveElementsAreShown",DOL_URL_ROOT.'/admin/modules.php')."<br>\n";
 print "<br>\n";

-$form = new Form($db);
 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';

 if ($action == 'edit')
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
 * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
 * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
@@ -404,7 +404,6 @@ if ($id == 10)
 	);
 	if (! empty($conf->global->MAIN_USE_LOCALTAX_TYPE_7)) $localtax_typeList["7"]= $langs->trans("Yes").' ('.$langs->trans("Type")." 7)";	//$langs->trans("AmountOnOrder")	// We will enable this later. For the moment, work only of invoice localtype
 }
-$msg='';


 // Actions ajout ou modification d'une entree dans un dictionnaire de donnee
@@ -442,20 +441,20 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';

-            $msg.=$langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)).'<br>';
+            setEventMessage($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)),'errors');
        }
    }
    // Other checks
    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
-        $ok=0;
-        $msg.= $langs->transnoentities('ErrorReservedTypeSystemSystemAuto').'<br>';
+        $ok=0;        
+        setEventMessage($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'),'errors');
    }
    if (isset($_POST["code"]))
    {
    	if ($_POST["code"]=='0')
    	{
        	$ok=0;
-        	$msg.= $langs->transnoentities('ErrorCodeCantContainZero').'<br>';
+    		setEventMessage($langs->transnoentities('ErrorCodeCantContainZero'),'errors');
        }
        // FIXME regresion if code with not in numeric base
        /*if (!is_numeric($_POST['code']))
@@ -466,7 +465,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
    }
    if (isset($_POST["country"]) && $_POST["country"]=='0') {
        $ok=0;
-        $msg.=$langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")).'<br>';
+        setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
    }

 	// Clean some parameters
@@ -530,7 +529,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        else
        {
            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                $msg=$langs->transnoentities("ErrorRecordAlreadyExists").'<br>';
+                setEventMessage($langs->transnoentities("ErrorRecordAlreadyExists"),'errors');
            }
            else {
                dol_print_error($db);
@@ -574,11 +573,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        $resql = $db->query($sql);
        if (! $resql)
        {
-            $msg=$db->error();
+            setEventMessage($db->error(),'errors');
        }
    }
-
-    if ($msg) $msg='<div class="error">'.$msg.'</div>';
    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }

@@ -600,7 +597,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
    {
        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
        {
-            $msg='<div class="error">'.$langs->transnoentities("ErrorRecordIsUsedByChild").'</div>';
+            setEventMessage($langs->transnoentities("ErrorRecordIsUsedByChild"),'errors');
        }
        else
        {
@@ -679,8 +676,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
-    if ($ret == 'html') print '<br>';
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }

 /*
@@ -688,7 +684,6 @@ if ($action == 'delete')
 */
 if ($id)
 {
-    dol_htmloutput_mesg($msg);

    // Complete requete recherche valeurs avec critere de tri
    $sql=$tabsql[$id];
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012-2013	Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2013       Philippe Grand			<philippe.grand@atoo-net.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -65,13 +65,13 @@ if ($action == 'specimen')
        }
        else
        {
-            $mesg='<div class="error">'.$obj->error.'</div>';
+            setEventMessage($obj->error,'errors');
            dol_syslog($obj->error, LOG_ERR);
        }
    }
    else
    {
-        $mesg='<div class="error">'.$langs->trans("ErrorModuleNotFound").'</div>';
+        setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
        dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
    }
 }
@@ -160,13 +160,13 @@ else
    dol_print_error($db);
 }

-print '<table class="noborder" width=\"100%\">';
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";

 clearstatcache();
@@ -206,20 +206,20 @@ if (is_resource($handle))
                    print "<td align=\"center\">\n";
                    if ($conf->global->DON_ADDON_MODEL == $name)
                    {
-                        print img_picto($langs->trans("Enabled"),'on');
+                        print img_picto($langs->trans("Enabled"),'switch_on');
                    }
                    else
                    {
                        print '&nbsp;';
                        print '</td><td align="center">';
-                        print '<a href="dons.php?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+                        print '<a href="dons.php?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
                    }
                    print '</td>';
                }
                else
                {
                    print "<td align=\"center\">\n";
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
                    print "</td>";
                }

--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013	   Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
@@ -60,7 +61,7 @@ if ($action == "save")
 	}

 	$db->commit();
-	$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	setEventMessage($langs->trans("SetupSaved"));
 }


@@ -116,10 +117,6 @@ print "</form>\n";

 print '</div>';

-
-dol_htmloutput_mesg($mesg);
-
-
 $db->close();

 llxFooter();
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`http://en.wikipedia.org/wiki/VAT_identification_number`